diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index e2100b6d71..6eba588b9b 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -4,81 +4,86 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ln") +@ObfuscatedName("lp") @Implements("AbstractArchive") public abstract class AbstractArchive { - @ObfuscatedName("h") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lqg;" + descriptor = "Lqj;" ) @Export("gzipDecompressor") static GZipDecompressor gzipDecompressor; - @ObfuscatedName("am") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -464059087 + intValue = 293139291 ) - static int field3981; - @ObfuscatedName("k") + static int field4026; + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Lkt;" + ) + static GameBuild field4038; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1291007483 + intValue = -1312413643 ) @Export("groupCount") int groupCount; - @ObfuscatedName("d") + @ObfuscatedName("t") @Export("groupIds") int[] groupIds; - @ObfuscatedName("m") + @ObfuscatedName("g") @Export("groupNameHashes") int[] groupNameHashes; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lqc;" + descriptor = "Lqz;" ) @Export("groupNameHashTable") IntHashTable groupNameHashTable; - @ObfuscatedName("t") + @ObfuscatedName("n") @Export("groupCrcs") int[] groupCrcs; - @ObfuscatedName("g") + @ObfuscatedName("e") @Export("groupVersions") int[] groupVersions; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("fileCounts") int[] fileCounts; - @ObfuscatedName("a") + @ObfuscatedName("f") @Export("fileIds") int[][] fileIds; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("fileNameHashes") int[][] fileNameHashes; @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "[Lqc;" + descriptor = "[Lqz;" ) @Export("fileNameHashTables") IntHashTable[] fileNameHashTables; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("groups") Object[] groups; - @ObfuscatedName("z") + @ObfuscatedName("i") @Export("files") Object[][] files; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1671437871 + intValue = 1395137629 ) @Export("hash") public int hash; - @ObfuscatedName("aq") + @ObfuscatedName("ar") @Export("releaseGroups") boolean releaseGroups; - @ObfuscatedName("aw") + @ObfuscatedName("am") @Export("shallowFiles") boolean shallowFiles; static { gzipDecompressor = new GZipDecompressor(); // L: 23 - field3981 = 0; // L: 27 + field4026 = 0; // L: 27 } AbstractArchive(boolean var1, boolean var2) { @@ -86,614 +91,612 @@ public abstract class AbstractArchive { this.shallowFiles = var2; // L: 33 } // L: 34 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "2136943756" + garbageValue = "738299214" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { - } // L: 123 + } // L: 118 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" + descriptor = "(II)V", + garbageValue = "-250456045" ) @Export("loadGroup") void loadGroup(int var1) { - } // L: 209 + } // L: 204 - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1034622346" + descriptor = "(IB)I", + garbageValue = "-41" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { - return this.groups[var1] != null ? 100 : 0; // L: 179 180 + return this.groups[var1] != null ? 100 : 0; // L: 174 175 } - @ObfuscatedName("af") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "-258163791" + garbageValue = "-1642448854" ) @Export("decodeIndex") void decodeIndex(byte[] var1) { - int var3 = var1.length; // L: 38 - int var2 = class144.method3082(var1, 0, var3); // L: 40 - this.hash = var2; // L: 42 - Buffer var4 = new Buffer(Actor.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 + this.hash = WorldMapArchiveLoader.method7020(var1, var1.length); // L: 37 + Buffer var2 = new Buffer(Skills.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 var6 = var4.readUnsignedByte(); // L: 50 - if (var5 >= 7) { // L: 51 - this.groupCount = var4.method7758(); + int var4 = var2.readUnsignedByte(); // L: 45 + if (var3 >= 7) { // L: 46 + this.groupCount = var2.method7627(); } else { - this.groupCount = var4.readUnsignedShort(); // L: 52 + this.groupCount = var2.readUnsignedShort(); // L: 47 } - int var7 = 0; // L: 53 - int var8 = -1; // L: 54 - this.groupIds = new int[this.groupCount]; // L: 55 + 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.method7627(); // 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 var9; - if (var5 >= 7) { // L: 56 - for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 57 - this.groupIds[var9] = var7 += var4.method7758(); // L: 58 - if (this.groupIds[var9] > var8) { // L: 59 - 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; - 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 + 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 - for (var13 = 0; var13 < var11; ++var13) { // L: 89 - var14 = this.fileIds[var10][var13] = var7 += var4.method7758(); // L: 90 - if (var14 > var12) { // L: 91 - var12 = var14; + for (var11 = 0; var11 < var9; ++var11) { // L: 84 + var12 = this.fileIds[var8][var11] = var5 += var2.method7627(); // L: 85 + if (var12 > var10) { // L: 86 + var10 = var12; } } - this.files[var10] = new Object[var12 + 1]; // L: 93 + this.files[var8] = new Object[var10 + 1]; // L: 88 } } else { - 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 (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 (var13 = 0; var13 < var11; ++var13) { // L: 103 - var14 = this.fileIds[var10][var13] = var7 += var4.readUnsignedShort(); // L: 104 - if (var14 > var12) { // L: 105 - var12 = var14; + 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; } } - this.files[var10] = new Object[var12 + 1]; // L: 107 + this.files[var8] = new Object[var10 + 1]; // L: 102 } } - if (var6 != 0) { // L: 110 - this.fileNameHashes = new int[var8 + 1][]; // L: 111 - this.fileNameHashTables = new IntHashTable[var8 + 1]; // L: 112 + if (var4 != 0) { // L: 105 + this.fileNameHashes = new int[var6 + 1][]; // L: 106 + this.fileNameHashTables = new IntHashTable[var6 + 1]; // L: 107 - 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 (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 (var12 = 0; var12 < var11; ++var12) { // L: 117 - this.fileNameHashes[var10][this.fileIds[var10][var12]] = var4.readInt(); + for (var10 = 0; var10 < var9; ++var10) { // L: 112 + this.fileNameHashes[var8][this.fileIds[var8][var10]] = var2.readInt(); } - this.fileNameHashTables[var10] = new IntHashTable(this.fileNameHashes[var10]); // L: 118 + this.fileNameHashTables[var8] = new IntHashTable(this.fileNameHashes[var8]); // L: 113 } } } else { throw new RuntimeException(""); } - } // L: 121 + } // L: 116 - @ObfuscatedName("ad") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(III)[B", - garbageValue = "1032103913" + garbageValue = "9206278" ) @Export("takeFile") public byte[] takeFile(int var1, int var2) { - return this.takeFileEncrypted(var1, var2, (int[])null); // L: 126 + return this.takeFileEncrypted(var1, var2, (int[])null); // L: 121 } - @ObfuscatedName("ai") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(II[II)[B", - garbageValue = "125484375" + garbageValue = "1321797482" ) @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: 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 + 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 return null; } } } - byte[] var5 = BuddyRankComparator.method2633(this.files[var1][var2], false); // L: 139 + byte[] var5 = class125.method2791(this.files[var1][var2], false); // L: 134 if (this.shallowFiles) { - this.files[var1][var2] = null; // L: 140 + this.files[var1][var2] = null; // L: 135 } - return var5; // L: 141 + return var5; // L: 136 } else { return null; } } - @ObfuscatedName("ax") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-104" + descriptor = "(III)Z", + garbageValue = "1947570801" ) @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: 145 - if (this.files[var1][var2] != null) { - return true; // L: 146 - } else if (this.groups[var1] != null) { // L: 147 + 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 + return true; + } else if (this.groups[var1] != null) { // L: 142 return true; } else { - this.loadGroup(var1); // L: 148 - return this.groups[var1] != null; // L: 149 + this.loadGroup(var1); // L: 143 + return this.groups[var1] != null; // L: 144 } } else { - return false; // L: 150 + return false; // L: 145 } } - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-966653450" - ) - public boolean method5864(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 { - throw new RuntimeException(); // L: 156 - } - } - - @ObfuscatedName("ap") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(IB)Z", - garbageValue = "1" + garbageValue = "39" + ) + public boolean method5668(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("an") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1465759290" ) @Export("tryLoadGroup") public boolean tryLoadGroup(int var1) { - if (this.groups[var1] != null) { // L: 160 + if (this.groups[var1] != null) { // L: 155 return true; } else { - this.loadGroup(var1); // L: 161 - return this.groups[var1] != null; // L: 162 + this.loadGroup(var1); // L: 156 + return this.groups[var1] != null; // L: 157 } } - @ObfuscatedName("az") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "106" + descriptor = "(I)Z", + garbageValue = "903768645" ) @Export("isFullyLoaded") public boolean isFullyLoaded() { - boolean var1 = true; // L: 167 + boolean var1 = true; // L: 162 - 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 + 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 var1 = false; } } } - return var1; // L: 175 + return var1; // L: 170 } - @ObfuscatedName("as") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IB)[B", - garbageValue = "-79" + descriptor = "(II)[B", + garbageValue = "-1699435814" ) @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { - if (this.files.length == 1) { // L: 184 + if (this.files.length == 1) { // L: 179 return this.takeFile(0, var1); } else if (this.files[var1].length == 1) { - return this.takeFile(var1, 0); // L: 185 + return this.takeFile(var1, 0); // L: 180 } else { - throw new RuntimeException(); // L: 186 + throw new RuntimeException(); // L: 181 } } - @ObfuscatedName("aa") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IIB)[B", - garbageValue = "1" + descriptor = "(III)[B", + garbageValue = "1081005917" ) @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: 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 + 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 return null; } } } - byte[] var4 = BuddyRankComparator.method2633(this.files[var1][var2], false); // L: 199 - return var4; // L: 200 + byte[] var4 = class125.method2791(this.files[var1][var2], false); // L: 194 + return var4; // L: 195 } else { return null; } } - @ObfuscatedName("bj") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(IB)[B", - garbageValue = "20" + descriptor = "(II)[B", + garbageValue = "515956954" ) @Export("getFileFlat") public byte[] getFileFlat(int var1) { - if (this.files.length == 1) { // L: 204 + if (this.files.length == 1) { // L: 199 return this.getFile(0, var1); } else if (this.files[var1].length == 1) { - return this.getFile(var1, 0); // L: 205 + return this.getFile(var1, 0); // L: 200 } else { - throw new RuntimeException(); // L: 206 + throw new RuntimeException(); // L: 201 } } - @ObfuscatedName("bm") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "1143817023" + garbageValue = "100488775" ) @Export("getGroupFileIds") public int[] getGroupFileIds(int var1) { - return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; // L: 212 213 215 + return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; // L: 207 208 210 } - @ObfuscatedName("br") + @ObfuscatedName("ay") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1945641857" + garbageValue = "-373253911" ) @Export("getGroupFileCount") public int getGroupFileCount(int var1) { - return this.files[var1].length; // L: 219 + return this.files[var1].length; // L: 214 } - @ObfuscatedName("bo") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1218623244" + garbageValue = "1109930040" ) @Export("getGroupCount") public int getGroupCount() { - return this.files.length; // L: 223 + return this.files.length; // L: 218 } - @ObfuscatedName("bl") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "2607" + descriptor = "(I)V", + garbageValue = "-2116699017" ) @Export("clearGroups") public void clearGroups() { - for (int var1 = 0; var1 < this.groups.length; ++var1) { // L: 227 + for (int var1 = 0; var1 < this.groups.length; ++var1) { // L: 222 this.groups[var1] = null; } - } // L: 228 + } // L: 223 - @ObfuscatedName("be") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1966992271" + descriptor = "(IB)V", + garbageValue = "7" ) @Export("clearFilesGroup") public void clearFilesGroup(int var1) { - for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 231 + for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 226 this.files[var1][var2] = null; } - } // L: 232 + } // L: 227 - @ObfuscatedName("bb") + @ObfuscatedName("br") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-756494060" + garbageValue = "1417383387" ) @Export("clearFiles") public void clearFiles() { - 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 + 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 this.files[var1][var2] = null; } } } - } // L: 240 + } // L: 235 - @ObfuscatedName("bw") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(I[II)Z", - garbageValue = "-559816234" + descriptor = "(I[IB)Z", + garbageValue = "53" ) @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { - if (this.groups[var1] == null) { // L: 243 + if (this.groups[var1] == null) { // L: 238 return false; } else { - 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 + 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 - for (int var7 = 0; var7 < var3; ++var7) { // L: 248 - if (var5[var4[var7]] == null) { // L: 249 - var6 = false; // L: 250 + for (int var7 = 0; var7 < var3; ++var7) { // L: 243 + if (var5[var4[var7]] == null) { // L: 244 + var6 = false; // L: 245 break; } } - if (var6) { // L: 254 + if (var6) { // L: 249 return true; } else { byte[] var18; - if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { // L: 256 - var18 = BuddyRankComparator.method2633(this.groups[var1], false); // L: 261 + if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { // L: 251 + var18 = class125.method2791(this.groups[var1], false); // L: 256 } else { - var18 = BuddyRankComparator.method2633(this.groups[var1], true); // L: 257 - Buffer var8 = new Buffer(var18); // L: 258 - var8.xteaDecrypt(var2, 5, var8.array.length); // L: 259 + var18 = class125.method2791(this.groups[var1], true); // L: 252 + Buffer var8 = new Buffer(var18); // L: 253 + var8.xteaDecrypt(var2, 5, var8.array.length); // L: 254 } - byte[] var20 = Actor.decompressBytes(var18); // L: 264 - if (this.releaseGroups) { // L: 282 + byte[] var20 = Skills.decompressBytes(var18); // L: 259 + if (this.releaseGroups) { // L: 271 this.groups[var1] = null; } - if (var3 > 1) { // L: 283 - int var9 = var20.length; // L: 284 - --var9; - int var10 = var20[var9] & 255; // L: 285 - var9 -= var3 * var10 * 4; // L: 286 - Buffer var11 = new Buffer(var20); // L: 287 - int[] var12 = new int[var3]; // L: 288 - var11.offset = var9; // L: 289 + if (var3 > 1) { // L: 272 + int var9 = var20.length; // L: 273 + --var9; // L: 274 + int var10 = var20[var9] & 255; + var9 -= var3 * var10 * 4; // L: 275 + Buffer var11 = new Buffer(var20); // L: 276 + int[] var12 = new int[var3]; // L: 277 + var11.offset = var9; // L: 278 int var14; int var15; - for (int var13 = 0; var13 < var10; ++var13) { // L: 290 - var14 = 0; // L: 291 + for (int var13 = 0; var13 < var10; ++var13) { // L: 279 + var14 = 0; // L: 280 - for (var15 = 0; var15 < var3; ++var15) { // L: 292 - var14 += var11.readInt(); // L: 293 - var12[var15] += var14; // L: 294 + for (var15 = 0; var15 < var3; ++var15) { // L: 281 + var14 += var11.readInt(); // L: 282 + var12[var15] += var14; // L: 283 } } - byte[][] var19 = new byte[var3][]; // L: 297 + byte[][] var19 = new byte[var3][]; // L: 286 - for (var14 = 0; var14 < var3; ++var14) { // L: 298 - var19[var14] = new byte[var12[var14]]; // L: 299 - var12[var14] = 0; // L: 300 + for (var14 = 0; var14 < var3; ++var14) { // L: 287 + var19[var14] = new byte[var12[var14]]; // L: 288 + var12[var14] = 0; // L: 289 } - var11.offset = var9; // L: 302 - var14 = 0; // L: 303 + var11.offset = var9; // L: 291 + var14 = 0; // L: 292 - for (var15 = 0; var15 < var10; ++var15) { // L: 304 - int var16 = 0; // L: 305 + for (var15 = 0; var15 < var10; ++var15) { // L: 293 + int var16 = 0; // L: 294 - 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 (int var17 = 0; var17 < var3; ++var17) { // L: 295 + var16 += var11.readInt(); // L: 296 + System.arraycopy(var20, var14, var19[var17], var12[var17], var16); // L: 297 + var12[var17] += var16; // L: 298 + var14 += var16; // L: 299 } } - for (var15 = 0; var15 < var3; ++var15) { // L: 313 - if (!this.shallowFiles) { // L: 314 - var5[var4[var15]] = InterfaceParent.method2084(var19[var15], false); + for (var15 = 0; var15 < var3; ++var15) { // L: 302 + if (!this.shallowFiles) { // L: 303 + var5[var4[var15]] = WorldMapEvent.method4929(var19[var15], false); } else { - var5[var4[var15]] = var19[var15]; // L: 315 + var5[var4[var15]] = var19[var15]; // L: 304 } } - } else if (!this.shallowFiles) { // L: 319 - var5[var4[0]] = InterfaceParent.method2084(var20, false); + } else if (!this.shallowFiles) { // L: 308 + var5[var4[0]] = WorldMapEvent.method4929(var20, false); } else { - var5[var4[0]] = var20; // L: 320 + var5[var4[0]] = var20; // L: 309 } - return true; // L: 322 + return true; // L: 311 } } } + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-459533989" + ) + @Export("getGroupId") + public int getGroupId(String var1) { + var1 = var1.toLowerCase(); // L: 315 + return this.groupNameHashTable.get(class101.hashString(var1)); // L: 316 + } + + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;I)I", + garbageValue = "-99961512" + ) + @Export("getFileId") + public int getFileId(int var1, String var2) { + var2 = var2.toLowerCase(); // L: 320 + return this.fileNameHashTables[var1].get(class101.hashString(var2)); // L: 321 + } + + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", + garbageValue = "-1697073381" + ) + @Export("isValidFileName") + public boolean isValidFileName(String var1, String var2) { + var1 = var1.toLowerCase(); // L: 325 + var2 = var2.toLowerCase(); // L: 326 + int var3 = this.groupNameHashTable.get(class101.hashString(var1)); // L: 327 + if (var3 < 0) { // L: 328 + return false; + } else { + int var4 = this.fileNameHashTables[var3].get(class101.hashString(var2)); // L: 329 + return var4 >= 0; // L: 330 + } + } + @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "1282220718" - ) - @Export("getGroupId") - public int getGroupId(String var1) { - var1 = var1.toLowerCase(); // L: 326 - return this.groupNameHashTable.get(WorldMapLabelSize.hashString(var1)); // L: 327 - } - - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)I", - garbageValue = "48" - ) - @Export("getFileId") - public int getFileId(int var1, String var2) { - var2 = var2.toLowerCase(); // L: 331 - return this.fileNameHashTables[var1].get(WorldMapLabelSize.hashString(var2)); // L: 332 - } - - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "1601831829" - ) - @Export("isValidFileName") - public boolean isValidFileName(String var1, String var2) { - var1 = var1.toLowerCase(); // L: 336 - var2 = var2.toLowerCase(); // L: 337 - int var3 = this.groupNameHashTable.get(WorldMapLabelSize.hashString(var1)); // L: 338 - if (var3 < 0) { // L: 339 - return false; - } else { - int var4 = this.fileNameHashTables[var3].get(WorldMapLabelSize.hashString(var2)); // L: 340 - return var4 >= 0; // L: 341 - } - } - - @ObfuscatedName("bq") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B", - garbageValue = "-1167091944" + garbageValue = "-1285301345" ) @Export("takeFileByNames") public byte[] takeFileByNames(String var1, String var2) { - var1 = var1.toLowerCase(); // L: 346 - var2 = var2.toLowerCase(); // L: 347 - int var3 = this.groupNameHashTable.get(WorldMapLabelSize.hashString(var1)); // L: 348 - int var4 = this.fileNameHashTables[var3].get(WorldMapLabelSize.hashString(var2)); // L: 349 - return this.takeFile(var3, var4); // L: 350 + var1 = var1.toLowerCase(); // L: 335 + var2 = var2.toLowerCase(); // L: 336 + int var3 = this.groupNameHashTable.get(class101.hashString(var1)); // L: 337 + int var4 = this.fileNameHashTables[var3].get(class101.hashString(var2)); // L: 338 + return this.takeFile(var3, var4); // L: 339 } - @ObfuscatedName("ba") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;B)Z", - garbageValue = "-108" + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", + garbageValue = "569165055" ) @Export("tryLoadFileByNames") public boolean tryLoadFileByNames(String var1, String var2) { - var1 = var1.toLowerCase(); // L: 354 - var2 = var2.toLowerCase(); // L: 355 - int var3 = this.groupNameHashTable.get(WorldMapLabelSize.hashString(var1)); // L: 356 - int var4 = this.fileNameHashTables[var3].get(WorldMapLabelSize.hashString(var2)); // L: 357 - return this.tryLoadFile(var3, var4); // L: 358 + var1 = var1.toLowerCase(); // L: 343 + var2 = var2.toLowerCase(); // L: 344 + int var3 = this.groupNameHashTable.get(class101.hashString(var1)); // L: 345 + int var4 = this.fileNameHashTables[var3].get(class101.hashString(var2)); // L: 346 + return this.tryLoadFile(var3, var4); // L: 347 } - @ObfuscatedName("bk") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Z", - garbageValue = "84" + descriptor = "(Ljava/lang/String;I)Z", + garbageValue = "31747175" ) @Export("tryLoadGroupByName") public boolean tryLoadGroupByName(String var1) { - var1 = var1.toLowerCase(); // L: 362 - int var2 = this.groupNameHashTable.get(WorldMapLabelSize.hashString(var1)); // L: 363 - return this.tryLoadGroup(var2); // L: 364 + var1 = var1.toLowerCase(); // L: 351 + int var2 = this.groupNameHashTable.get(class101.hashString(var1)); // L: 352 + return this.tryLoadGroup(var2); // L: 353 } - @ObfuscatedName("bs") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "22" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "286297343" ) @Export("loadRegionFromName") public void loadRegionFromName(String var1) { - var1 = var1.toLowerCase(); // L: 368 - int var2 = this.groupNameHashTable.get(WorldMapLabelSize.hashString(var1)); // L: 369 - if (var2 >= 0) { // L: 370 - this.loadRegionFromGroup(var2); // L: 371 + var1 = var1.toLowerCase(); // L: 357 + int var2 = this.groupNameHashTable.get(class101.hashString(var1)); // L: 358 + if (var2 >= 0) { // L: 359 + this.loadRegionFromGroup(var2); // L: 360 } - } // L: 372 + } // L: 361 - @ObfuscatedName("by") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)I", - garbageValue = "9" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-586809240" ) @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { - var1 = var1.toLowerCase(); // L: 375 - int var2 = this.groupNameHashTable.get(WorldMapLabelSize.hashString(var1)); // L: 376 - return this.groupLoadPercent(var2); // L: 377 + var1 = var1.toLowerCase(); // L: 364 + int var2 = this.groupNameHashTable.get(class101.hashString(var1)); // L: 365 + return this.groupLoadPercent(var2); // L: 366 } } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 61fdccff80..98877f37cb 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -2,415 +2,26 @@ 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("je") +@ObfuscatedName("jc") @Implements("AbstractByteArrayCopier") public abstract class AbstractByteArrayCopier { AbstractByteArrayCopier() { } // L: 4 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "2035077648" + descriptor = "(B)[B", + garbageValue = "70" ) @Export("get") abstract byte[] get(); - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "-1279201457" + garbageValue = "-362326915" ) @Export("set") abstract void set(byte[] var1); - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "-58" - ) - static int method5506(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 2341 - if (Decimator.friendSystem.field805 == 0) { // L: 2342 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -2; - } else if (Decimator.friendSystem.field805 == 1) { // L: 2343 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.friendSystem.friendsList.getSize(); // L: 2344 - } - - return 1; // L: 2345 - } else { - int var3; - if (var0 == ScriptOpcodes.FRIEND_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2348 - if (Decimator.friendSystem.method1681() && var3 >= 0 && var3 < Decimator.friendSystem.friendsList.getSize()) { // L: 2349 - Friend var8 = (Friend)Decimator.friendSystem.friendsList.get(var3); // L: 2350 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var8.getName(); // L: 2351 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 2352 - } else { - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 2355 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 2356 - } - - return 1; // L: 2358 - } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2361 - if (Decimator.friendSystem.method1681() && var3 >= 0 && var3 < Decimator.friendSystem.friendsList.getSize()) { // L: 2362 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Decimator.friendSystem.friendsList.get(var3)).world; // L: 2363 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2365 - } - - return 1; // L: 2366 - } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2369 - if (Decimator.friendSystem.method1681() && var3 >= 0 && var3 < Decimator.friendSystem.friendsList.getSize()) { // L: 2370 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Decimator.friendSystem.friendsList.get(var3)).rank; // L: 2371 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2373 - } - - return 1; // L: 2374 - } else { - String var5; - if (var0 == ScriptOpcodes.FRIEND_SETRANK) { - var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2377 - int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2378 - WorldMapLabelSize.method3903(var5, var6); // L: 2379 - return 1; // L: 2380 - } else if (var0 == ScriptOpcodes.FRIEND_ADD) { - var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2383 - Decimator.friendSystem.addFriend(var5); // L: 2384 - return 1; // L: 2385 - } else if (var0 == ScriptOpcodes.FRIEND_DEL) { - var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2388 - Decimator.friendSystem.removeFriend(var5); // L: 2389 - return 1; // L: 2390 - } else if (var0 == ScriptOpcodes.IGNORE_ADD) { - var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2393 - Decimator.friendSystem.addIgnore(var5); // L: 2394 - return 1; // L: 2395 - } else if (var0 == ScriptOpcodes.IGNORE_DEL) { - var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2398 - Decimator.friendSystem.removeIgnore(var5); // L: 2399 - return 1; // L: 2400 - } else if (var0 == ScriptOpcodes.FRIEND_TEST) { - var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2403 - var5 = class160.method3280(var5); // L: 2404 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.friendSystem.isFriended(new Username(var5, class122.loginType), false) ? 1 : 0; // L: 2405 - return 1; // L: 2406 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { - if (ClientPacket.friendsChat != null) { // L: 2409 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ClientPacket.friendsChat.name; // L: 2410 - } else { - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 2412 - } - - return 1; // L: 2413 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { - if (ClientPacket.friendsChat != null) { // L: 2416 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClientPacket.friendsChat.getSize(); // L: 2417 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2419 - } - - return 1; // L: 2420 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2423 - if (ClientPacket.friendsChat != null && var3 < ClientPacket.friendsChat.getSize()) { // L: 2424 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ClientPacket.friendsChat.get(var3).getUsername().getName(); // L: 2425 - } else { - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 2427 - } - - return 1; // L: 2428 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2431 - if (ClientPacket.friendsChat != null && var3 < ClientPacket.friendsChat.getSize()) { // L: 2432 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)ClientPacket.friendsChat.get(var3)).getWorld(); // L: 2433 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2435 - } - - return 1; // L: 2436 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2439 - if (ClientPacket.friendsChat != null && var3 < ClientPacket.friendsChat.getSize()) { // L: 2440 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)ClientPacket.friendsChat.get(var3)).rank; // L: 2441 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2443 - } - - return 1; // L: 2444 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClientPacket.friendsChat != null ? ClientPacket.friendsChat.minKick : 0; // L: 2447 - return 1; // L: 2448 - } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { - var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2451 - MidiPcmStream.clanKickUser(var5); // L: 2452 - return 1; // L: 2453 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClientPacket.friendsChat != null ? ClientPacket.friendsChat.rank * -1273194957 * 1318081787 : 0; // L: 2456 - return 1; // L: 2457 - } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { - var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2460 - WorldMapElement.Clan_joinChat(var5); // L: 2461 - return 1; // L: 2462 - } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { - WorldMapSprite.Clan_leaveChat(); // L: 2465 - return 1; // L: 2466 - } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { - if (!Decimator.friendSystem.method1681()) { // L: 2469 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.friendSystem.ignoreList.getSize(); // L: 2470 - } - - return 1; // L: 2471 - } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2474 - if (Decimator.friendSystem.method1681() && var3 >= 0 && var3 < Decimator.friendSystem.ignoreList.getSize()) { // L: 2475 - Ignored var4 = (Ignored)Decimator.friendSystem.ignoreList.get(var3); // L: 2476 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2477 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2478 - } else { - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 2481 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 2482 - } - - return 1; // L: 2484 - } else if (var0 == ScriptOpcodes.IGNORE_TEST) { - var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2487 - var5 = class160.method3280(var5); // L: 2488 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.friendSystem.isIgnored(new Username(var5, class122.loginType)) ? 1 : 0; // L: 2489 - return 1; // L: 2490 - } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2493 - if (ClientPacket.friendsChat != null && var3 < ClientPacket.friendsChat.getSize() && ClientPacket.friendsChat.get(var3).getUsername().equals(GrandExchangeEvents.localPlayer.username)) { // L: 2494 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2495 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2497 - } - - return 1; // L: 2498 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { - if (ClientPacket.friendsChat != null && ClientPacket.friendsChat.owner != null) { // L: 2501 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ClientPacket.friendsChat.owner; // L: 2502 - } else { - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 2504 - } - - return 1; // L: 2505 - } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2508 - if (ClientPacket.friendsChat != null && var3 < ClientPacket.friendsChat.getSize() && ((ClanMate)ClientPacket.friendsChat.get(var3)).isFriend()) { // L: 2509 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2510 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2512 - } - - return 1; // L: 2513 - } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { - if (var0 == 3628) { - Decimator.friendSystem.friendsList.removeComparator(); // L: 2524 - return 1; // L: 2525 - } else { - boolean var7; - if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2528 - Decimator.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2529 - return 1; // L: 2530 - } else if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2533 - Decimator.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2534 - return 1; // L: 2535 - } else if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2538 - Decimator.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2539 - return 1; // L: 2540 - } else if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2543 - Decimator.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2544 - return 1; // L: 2545 - } else if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2548 - Decimator.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2549 - return 1; // L: 2550 - } else if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2553 - Decimator.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2554 - return 1; // L: 2555 - } else if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2558 - Decimator.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2559 - return 1; // L: 2560 - } else if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2563 - Decimator.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2564 - return 1; // L: 2565 - } else if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2568 - Decimator.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2569 - return 1; // L: 2570 - } else if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2573 - Decimator.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2574 - return 1; // L: 2575 - } else if (var0 == 3639) { - Decimator.friendSystem.friendsList.sort(); // L: 2578 - return 1; // L: 2579 - } else if (var0 == 3640) { - Decimator.friendSystem.ignoreList.removeComparator(); // L: 2582 - return 1; // L: 2583 - } else if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2586 - Decimator.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2587 - return 1; // L: 2588 - } else if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2591 - Decimator.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2592 - return 1; // L: 2593 - } else if (var0 == 3643) { - Decimator.friendSystem.ignoreList.sort(); // L: 2596 - return 1; // L: 2597 - } else if (var0 == 3644) { - if (ClientPacket.friendsChat != null) { // L: 2600 - ClientPacket.friendsChat.removeComparator(); // L: 2601 - } - - return 1; // L: 2603 - } else if (var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2606 - if (ClientPacket.friendsChat != null) { // L: 2607 - ClientPacket.friendsChat.addComparator(new UserComparator1(var7)); // L: 2608 - } - - return 1; // L: 2610 - } else if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2613 - if (ClientPacket.friendsChat != null) { // L: 2614 - ClientPacket.friendsChat.addComparator(new UserComparator2(var7)); // L: 2615 - } - - return 1; // L: 2617 - } else if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2620 - if (ClientPacket.friendsChat != null) { // L: 2621 - ClientPacket.friendsChat.addComparator(new UserComparator3(var7)); // L: 2622 - } - - return 1; // L: 2624 - } else if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2627 - if (ClientPacket.friendsChat != null) { // L: 2628 - ClientPacket.friendsChat.addComparator(new UserComparator4(var7)); // L: 2629 - } - - return 1; // L: 2631 - } else if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2634 - if (ClientPacket.friendsChat != null) { // L: 2635 - ClientPacket.friendsChat.addComparator(new UserComparator5(var7)); // L: 2636 - } - - return 1; // L: 2638 - } else if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2641 - if (ClientPacket.friendsChat != null) { // L: 2642 - ClientPacket.friendsChat.addComparator(new UserComparator6(var7)); // L: 2643 - } - - return 1; // L: 2645 - } else if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2648 - if (ClientPacket.friendsChat != null) { // L: 2649 - ClientPacket.friendsChat.addComparator(new UserComparator7(var7)); // L: 2650 - } - - return 1; // L: 2652 - } else if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2655 - if (ClientPacket.friendsChat != null) { // L: 2656 - ClientPacket.friendsChat.addComparator(new UserComparator8(var7)); // L: 2657 - } - - return 1; // L: 2659 - } else if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2662 - if (ClientPacket.friendsChat != null) { // L: 2663 - ClientPacket.friendsChat.addComparator(new UserComparator9(var7)); // L: 2664 - } - - return 1; // L: 2666 - } else if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2669 - if (ClientPacket.friendsChat != null) { // L: 2670 - ClientPacket.friendsChat.addComparator(new UserComparator10(var7)); // L: 2671 - } - - return 1; // L: 2673 - } else if (var0 == 3655) { - if (ClientPacket.friendsChat != null) { // L: 2676 - ClientPacket.friendsChat.sort(); // L: 2677 - } - - return 1; // L: 2679 - } else if (var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2682 - Decimator.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2683 - return 1; // L: 2684 - } else if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2687 - if (ClientPacket.friendsChat != null) { // L: 2688 - ClientPacket.friendsChat.addComparator(new BuddyRankComparator(var7)); // L: 2689 - } - - return 1; // L: 2691 - } else { - return 2; // L: 2693 - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2516 - if (ClientPacket.friendsChat != null && var3 < ClientPacket.friendsChat.getSize() && ((ClanMate)ClientPacket.friendsChat.get(var3)).isIgnored()) { // L: 2517 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2518 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2520 - } - - return 1; // L: 2521 - } - } - } - } - - @ObfuscatedName("jz") - @ObfuscatedSignature( - descriptor = "([Lky;Lky;ZI)V", - garbageValue = "1933510801" - ) - @Export("revalidateWidgetScroll") - static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { - int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * -188983191 * -885606439 : var1.width * -1328038141 * -1237179477; // L: 10789 - int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 153385713 * -1426770415 : var1.height * 191855667 * -686825733; // L: 10790 - ModelData0.resizeInterface(var0, var1.id, var3, var4, var2); // L: 10791 - if (var1.children != null) { // L: 10792 - ModelData0.resizeInterface(var1.children, var1.id, var3, var4, var2); - } - - InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 10793 - if (var5 != null) { // L: 10794 - int var6 = var5.group; // L: 10795 - if (class155.loadInterface(var6)) { // L: 10797 - ModelData0.resizeInterface(Widget.Widget_interfaceComponents[var6], -1, var3, var4, var2); // L: 10798 - } - } - - if (var1.contentType == 1337) { // L: 10801 - } - - } // L: 10802 } diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index 6fbc80c081..1b1563d6a2 100644 --- a/runescape-client/src/main/java/AbstractFont.java +++ b/runescape-client/src/main/java/AbstractFont.java @@ -4,76 +4,76 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("me") +@ObfuscatedName("mo") @Implements("AbstractFont") public abstract class AbstractFont extends Rasterizer2D { - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "[Lqq;" + descriptor = "[Lqd;" ) @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; - @ObfuscatedName("p") + @ObfuscatedName("c") @Export("AbstractFont_strike") static int AbstractFont_strike; @ObfuscatedName("w") @Export("AbstractFont_underline") static int AbstractFont_underline; - @ObfuscatedName("k") + @ObfuscatedName("b") @Export("AbstractFont_previousShadow") static int AbstractFont_previousShadow; - @ObfuscatedName("d") + @ObfuscatedName("t") @Export("AbstractFont_shadow") static int AbstractFont_shadow; - @ObfuscatedName("m") + @ObfuscatedName("g") @Export("AbstractFont_previousColor") static int AbstractFont_previousColor; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("AbstractFont_color") static int AbstractFont_color; - @ObfuscatedName("t") + @ObfuscatedName("n") @Export("AbstractFont_alpha") static int AbstractFont_alpha; - @ObfuscatedName("g") + @ObfuscatedName("e") @Export("AbstractFont_justificationTotal") static int AbstractFont_justificationTotal; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("AbstractFont_justificationCurrent") static int AbstractFont_justificationCurrent; - @ObfuscatedName("a") + @ObfuscatedName("f") @Export("AbstractFont_random") static Random AbstractFont_random; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("AbstractFont_lines") static String[] AbstractFont_lines; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("pixels") byte[][] pixels; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("advances") int[] advances; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("widths") int[] widths; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("heights") int[] heights; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("leftBearings") int[] leftBearings; - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("topBearings") int[] topBearings; - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("ascent") public int ascent; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("maxAscent") public int maxAscent; - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("maxDescent") public int maxDescent; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("kerning") byte[] kerning; @@ -123,15 +123,15 @@ public abstract class AbstractFont extends Rasterizer2D { this.readMetrics(var1); // L: 54 } // L: 55 - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); - @ObfuscatedName("q") + @ObfuscatedName("m") @Export("readMetrics") void readMetrics(byte[] var1) { this.advances = new int[256]; // L: 58 @@ -193,7 +193,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (var13 != 32 && var13 != 160) { // L: 90 for (var8 = 0; var8 < 256; ++var8) { // L: 91 if (var8 != 32 && var8 != 160) { // L: 92 - this.kerning[var8 + (var13 << 8)] = (byte)method6326(var11, var12, var4, this.advances, var10, var13, var8); // L: 93 + this.kerning[var8 + (var13 << 8)] = (byte)method6212(var11, var12, var4, this.advances, var10, var13, var8); // L: 93 } } } @@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 98 - @ObfuscatedName("r") + @ObfuscatedName("s") @Export("charWidth") int charWidth(char var1) { if (var1 == 160) { // L: 123 var1 = ' '; } - return this.advances[class327.charToByteCp1252(var1) & 255]; // L: 124 + return this.advances[UserComparator5.charToByteCp1252(var1) & 255]; // L: 124 } - @ObfuscatedName("p") + @ObfuscatedName("r") @Export("stringWidth") public int stringWidth(String var1) { if (var1 == null) { // L: 128 @@ -238,7 +238,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (!var7.equals("gt")) { // L: 142 if (var7.startsWith("img=")) { // L: 143 try { - int var8 = class19.method288(var7.substring(4)); // L: 145 + int var8 = class92.method2373(var7.substring(4)); // L: 145 var4 += AbstractFont_modIconSprites[var8].width; // L: 146 var3 = -1; // L: 147 } catch (Exception var10) { // L: 149 @@ -256,7 +256,7 @@ public abstract class AbstractFont extends Rasterizer2D { } if (var2 == -1) { // L: 155 - var4 += this.advances[(char)(class327.charToByteCp1252(var6) & 255)]; // L: 156 + var4 += this.advances[(char)(UserComparator5.charToByteCp1252(var6) & 255)]; // L: 156 if (this.kerning != null && var3 != -1) { // L: 157 var4 += this.kerning[var6 + (var3 << 8)]; } @@ -270,7 +270,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("w") + @ObfuscatedName("v") @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { if (var1 == null) { // L: 165 @@ -321,7 +321,7 @@ public abstract class AbstractFont extends Rasterizer2D { var11 = '>'; // L: 204 } else if (var16.startsWith("img=")) { // L: 206 try { - int var17 = class19.method288(var16.substring(4)); // L: 208 + int var17 = class92.method2373(var16.substring(4)); // L: 208 var4 += AbstractFont_modIconSprites[var17].width; // L: 209 var11 = 0; // L: 210 } catch (Exception var20) { // L: 212 @@ -375,7 +375,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("k") + @ObfuscatedName("y") @Export("lineWidth") public int lineWidth(String var1, int var2) { int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 249 @@ -391,17 +391,17 @@ public abstract class AbstractFont extends Rasterizer2D { return var4; // L: 255 } - @ObfuscatedName("d") + @ObfuscatedName("c") @Export("lineCount") public int lineCount(String var1, int var2) { return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 259 } - @ObfuscatedName("u") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;II)Lnm;" + descriptor = "(IILjava/lang/String;II)Lne;" ) - public Bounds method6333(int var1, int var2, String var3, int var4, int var5) { + public Bounds method6219(int var1, int var2, String var3, int var4, int var5) { if (var3 != null && var3.length() >= var2 + var1) { // L: 280 int var6 = var4 - this.stringWidth(var3) / 2; // L: 283 var6 += this.stringWidth(var3.substring(0, var1)); // L: 284 @@ -442,7 +442,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 308 - @ObfuscatedName("a") + @ObfuscatedName("n") @Export("drawCentered") public void drawCentered(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { // L: 311 @@ -451,7 +451,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 314 - @ObfuscatedName("y") + @ObfuscatedName("e") @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: 317 @@ -512,7 +512,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("j") + @ObfuscatedName("h") @Export("drawCenteredWave") public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 352 @@ -527,7 +527,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 357 - @ObfuscatedName("e") + @ObfuscatedName("f") @Export("drawCenteredWave2") public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 360 @@ -544,7 +544,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 369 - @ObfuscatedName("z") + @ObfuscatedName("d") @Export("drawCenteredShake") public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var1 != null) { // L: 372 @@ -564,7 +564,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 379 - @ObfuscatedName("h") + @ObfuscatedName("j") @Export("drawRandomAlphaAndSpacing") public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 382 @@ -585,7 +585,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 393 - @ObfuscatedName("ae") + @ObfuscatedName("z") @Export("reset") void reset(int var1, int var2) { AbstractFont_strike = -1; // L: 396 @@ -599,28 +599,28 @@ public abstract class AbstractFont extends Rasterizer2D { AbstractFont_justificationCurrent = 0; // L: 402 } // L: 403 - @ObfuscatedName("aq") + @ObfuscatedName("i") @Export("decodeTag") void decodeTag(String var1) { try { if (var1.startsWith("col=")) { // L: 407 - AbstractFont_color = PcmPlayer.method746(var1.substring(4), 16); + AbstractFont_color = Canvas.method344(var1.substring(4), 16); } else if (var1.equals("/col")) { // L: 408 AbstractFont_color = AbstractFont_previousColor; } else if (var1.startsWith("str=")) { // L: 409 - AbstractFont_strike = PcmPlayer.method746(var1.substring(4), 16); + AbstractFont_strike = Canvas.method344(var1.substring(4), 16); } else if (var1.equals("str")) { // L: 410 AbstractFont_strike = 8388608; } else if (var1.equals("/str")) { // L: 411 AbstractFont_strike = -1; } else if (var1.startsWith("u=")) { // L: 412 - AbstractFont_underline = PcmPlayer.method746(var1.substring(2), 16); + AbstractFont_underline = Canvas.method344(var1.substring(2), 16); } else if (var1.equals("u")) { // L: 413 AbstractFont_underline = 0; } else if (var1.equals("/u")) { // L: 414 AbstractFont_underline = -1; } else if (var1.startsWith("shad=")) { // L: 415 - AbstractFont_shadow = PcmPlayer.method746(var1.substring(5), 16); + AbstractFont_shadow = Canvas.method344(var1.substring(5), 16); } else if (var1.equals("shad")) { // L: 416 AbstractFont_shadow = 0; } else if (var1.equals("/shad")) { // L: 417 @@ -633,7 +633,7 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 421 - @ObfuscatedName("aw") + @ObfuscatedName("u") @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { int var3 = 0; // L: 424 @@ -656,7 +656,7 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 433 - @ObfuscatedName("am") + @ObfuscatedName("ag") @Export("draw0") void draw0(String var1, int var2, int var3) { var3 -= this.ascent; // L: 436 @@ -665,7 +665,7 @@ public abstract class AbstractFont extends Rasterizer2D { for (int var6 = 0; var6 < var1.length(); ++var6) { // L: 439 if (var1.charAt(var6) != 0) { // L: 440 - char var7 = (char)(class327.charToByteCp1252(var1.charAt(var6)) & 255); // L: 441 + char var7 = (char)(UserComparator5.charToByteCp1252(var1.charAt(var6)) & 255); // L: 441 if (var7 == '<') { // L: 442 var4 = var6; // L: 443 } else { @@ -679,7 +679,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (!var8.equals("gt")) { // L: 450 if (var8.startsWith("img=")) { // L: 451 try { - var9 = class19.method288(var8.substring(4)); // L: 453 + var9 = class92.method2373(var8.substring(4)); // L: 453 IndexedSprite var10 = AbstractFont_modIconSprites[var9]; // L: 454 var10.drawAt(var2, var3 + this.ascent - var10.height); // L: 455 var2 += var10.width; // L: 456 @@ -745,7 +745,7 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 496 - @ObfuscatedName("ak") + @ObfuscatedName("ar") @Export("drawWithOffsets0") void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) { var3 -= this.ascent; // L: 499 @@ -755,7 +755,7 @@ public abstract class AbstractFont extends Rasterizer2D { for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 503 if (var1.charAt(var9) != 0) { // L: 504 - char var10 = (char)(class327.charToByteCp1252(var1.charAt(var9)) & 255); // L: 505 + char var10 = (char)(UserComparator5.charToByteCp1252(var1.charAt(var9)) & 255); // L: 505 if (var10 == '<') { // L: 506 var6 = var9; // L: 507 } else { @@ -784,7 +784,7 @@ public abstract class AbstractFont extends Rasterizer2D { } ++var8; // L: 523 - var14 = class19.method288(var11.substring(4)); // L: 524 + var14 = class92.method2373(var11.substring(4)); // L: 524 IndexedSprite var15 = AbstractFont_modIconSprites[var14]; // L: 525 var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); // L: 526 var2 += var15.width; // L: 527 @@ -863,8 +863,8 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 574 - @ObfuscatedName("o") - static int method6326(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { + @ObfuscatedName("p") + static int method6212(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { int var7 = var2[var5]; // L: 101 int var8 = var7 + var4[var5]; // L: 102 int var9 = var2[var6]; // L: 103 @@ -899,7 +899,7 @@ public abstract class AbstractFont extends Rasterizer2D { return -var13; // L: 119 } - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("escapeBrackets") public static String escapeBrackets(String var0) { int var1 = var0.length(); // L: 263 @@ -928,7 +928,7 @@ public abstract class AbstractFont extends Rasterizer2D { return var6.toString(); // L: 276 } - @ObfuscatedName("ao") + @ObfuscatedName("am") @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: 580 @@ -970,7 +970,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 609 - @ObfuscatedName("aj") + @ObfuscatedName("ac") @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: 612 @@ -1018,7 +1018,7 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 632 - @ObfuscatedName("al") + @ObfuscatedName("ab") @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: 635 @@ -1060,7 +1060,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 664 - @ObfuscatedName("av") + @ObfuscatedName("aj") @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: 667 diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java index 3f658d194c..96b3ce2390 100644 --- a/runescape-client/src/main/java/AbstractRasterProvider.java +++ b/runescape-client/src/main/java/AbstractRasterProvider.java @@ -4,21 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qu") +@ObfuscatedName("qi") @Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("pixels") public int[] pixels; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1418570525 + intValue = 1186832289 ) @Export("width") public int width; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -845833355 + intValue = 1838365041 ) @Export("height") public int height; @@ -26,26 +26,26 @@ public abstract class AbstractRasterProvider { protected AbstractRasterProvider() { } // L: 8 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IIS)V", - garbageValue = "131" + descriptor = "(III)V", + garbageValue = "1511692839" ) @Export("drawFull") public abstract void drawFull(int var1, int var2); - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-1598391098" + garbageValue = "-1899949578" ) @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1263903710" + garbageValue = "1981530244" ) @Export("apply") public final void apply() { diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index 939c452e63..705507cd3d 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -1,95 +1,60 @@ import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ny") +@ObfuscatedName("nf") @Implements("AbstractSocket") public abstract class AbstractSocket { - @ObfuscatedName("bk") - @ObfuscatedGetter( - intValue = 770576215 - ) - static int field4275; - protected AbstractSocket() { } // L: 7 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-13138" + descriptor = "(I)V", + garbageValue = "731891927" ) @Export("close") public abstract void close(); - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-891040314" + descriptor = "(B)I", + garbageValue = "18" ) @Export("readUnsignedByte") public abstract int readUnsignedByte() throws IOException; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "46" + descriptor = "(I)I", + garbageValue = "-1429957580" ) @Export("available") public abstract int available() throws IOException; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "27" + descriptor = "(II)Z", + garbageValue = "-15219997" ) @Export("isAvailable") public abstract boolean isAvailable(int var1) throws IOException; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "-118" + descriptor = "([BIII)I", + garbageValue = "-642682113" ) @Export("read") public abstract int read(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-1359342670" + garbageValue = "257086671" ) @Export("write") public abstract void write(byte[] var1, int var2, int var3) throws IOException; - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Lln;Ljava/lang/String;Ljava/lang/String;B)Lqq;", - garbageValue = "3" - ) - @Export("SpriteBuffer_getIndexedSpriteByName") - public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); // L: 125 - int var4 = var0.getFileId(var3, var2); // L: 126 - byte[] var7 = var0.takeFile(var3, var4); // L: 131 - boolean var6; - if (var7 == null) { // L: 132 - var6 = false; // L: 133 - } else { - WorldMapArea.SpriteBuffer_decode(var7); // L: 136 - var6 = true; // L: 137 - } - - IndexedSprite var5; - if (!var6) { // L: 139 - var5 = null; // L: 140 - } else { - var5 = HorizontalAlignment.method3492(); // L: 143 - } - - return var5; // L: 145 - } } diff --git a/runescape-client/src/main/java/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java index 6ae6579585..fa516b560a 100644 --- a/runescape-client/src/main/java/AbstractSound.java +++ b/runescape-client/src/main/java/AbstractSound.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("bm") +@ObfuscatedName("bi") @Implements("AbstractSound") public abstract class AbstractSound extends Node { - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("position") int position; diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 5b5909f1b8..03b905a442 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -4,20 +4,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nz") +@ObfuscatedName("ng") @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { - @ObfuscatedName("c") + @ObfuscatedName("ek") + @ObfuscatedSignature( + descriptor = "Lle;" + ) + @Export("archive6") + static Archive archive6; + @ObfuscatedName("q") @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { } // L: 8 - @ObfuscatedName("q") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(Ljava/util/Comparator;B)V", - garbageValue = "-80" + garbageValue = "-16" ) @Export("addComparator") final void addComparator(Comparator var1) { @@ -29,10 +35,10 @@ public abstract class AbstractUserComparator implements Comparator { } // L: 17 - @ObfuscatedName("o") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lnn;Lnn;I)I", - garbageValue = "1222967356" + descriptor = "(Lnb;Lnb;I)I", + garbageValue = "1476396448" ) @Export("compareUser") protected final int compareUser(User var1, User var2) { @@ -42,17 +48,4 @@ public abstract class AbstractUserComparator implements Comparator { public boolean equals(Object var1) { return super.equals(var1); // L: 25 } - - @ObfuscatedName("iz") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-89739893" - ) - static String method6736(int var0) { - if (var0 < 0) { // L: 9848 - return ""; - } else { - return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; // L: 9849 9850 - } - } } diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index 16c33a54da..255e416958 100644 --- a/runescape-client/src/main/java/AbstractWorldMapData.java +++ b/runescape-client/src/main/java/AbstractWorldMapData.java @@ -1,122 +1,117 @@ -import java.io.IOException; -import java.lang.reflect.Field; -import java.lang.reflect.Method; 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.Reflection; -@ObfuscatedName("hz") +@ObfuscatedName("ib") @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { - @ObfuscatedName("gz") - @ObfuscatedSignature( - descriptor = "Lof;" - ) - @Export("WorldMapElement_fonts") - static Fonts WorldMapElement_fonts; - @ObfuscatedName("b") + @ObfuscatedName("tk") @ObfuscatedGetter( - intValue = 406251203 + intValue = -508466371 + ) + static int field2851; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1205484999 ) @Export("regionXLow") int regionXLow; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -110127755 + intValue = -1189289885 ) @Export("regionYLow") int regionYLow; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 100910989 + intValue = -1037344187 ) @Export("regionX") int regionX; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 654356143 + intValue = -1460800009 ) @Export("regionY") int regionY; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 27961817 + intValue = 716017053 ) @Export("minPlane") int minPlane; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1476238073 + intValue = -1555977189 ) @Export("planes") int planes; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1237188241 + intValue = -1656704067 ) @Export("groupId") int groupId; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1492092043 + intValue = 96165071 ) @Export("fileId") int fileId; @ObfuscatedName("w") @Export("floorUnderlayIds") short[][][] floorUnderlayIds; - @ObfuscatedName("k") + @ObfuscatedName("b") @Export("floorOverlayIds") short[][][] floorOverlayIds; - @ObfuscatedName("d") - byte[][][] field2334; - @ObfuscatedName("m") - byte[][][] field2342; - @ObfuscatedName("u") + @ObfuscatedName("t") + byte[][][] field2845; + @ObfuscatedName("g") + byte[][][] field2847; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "[[[[Lhl;" + descriptor = "[[[[Liy;" ) @Export("decorations") WorldMapDecoration[][][][] decorations; - @ObfuscatedName("t") - boolean field2346; - @ObfuscatedName("g") - boolean field2347; + @ObfuscatedName("n") + boolean field2848; + @ObfuscatedName("e") + boolean field2850; AbstractWorldMapData() { this.groupId = -1; // L: 14 this.fileId = -1; // L: 15 new LinkedList(); - this.field2346 = false; - this.field2347 = false; - } + this.field2848 = false; // L: 26 + this.field2850 = false; + } // L: 29 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "169222990" + descriptor = "(Lpx;I)V", + garbageValue = "933342926" ) @Export("readGeography") abstract void readGeography(Buffer var1); - @ObfuscatedName("y") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "95" + garbageValue = "39" ) @Export("isFullyLoaded") boolean isFullyLoaded() { - return this.field2346 && this.field2347; // L: 32 + return this.field2848 && this.field2850; // L: 32 } - @ObfuscatedName("j") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lln;B)V", - garbageValue = "-10" + descriptor = "(Llp;B)V", + garbageValue = "1" ) @Export("loadGeography") void loadGeography(AbstractArchive var1) { @@ -124,53 +119,53 @@ public abstract class AbstractWorldMapData { byte[] var2 = var1.takeFile(this.groupId, this.fileId); // L: 37 if (var2 != null) { // L: 38 this.readGeography(new Buffer(var2)); // L: 39 - this.field2346 = true; // L: 40 - this.field2347 = true; // L: 41 + this.field2848 = true; // L: 40 + this.field2850 = true; // L: 41 } } } // L: 43 - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-50" + descriptor = "(I)V", + garbageValue = "2016462267" ) @Export("reset") void reset() { this.floorUnderlayIds = null; // L: 46 this.floorOverlayIds = null; // L: 47 - this.field2334 = null; // L: 48 - this.field2342 = null; // L: 49 + this.field2845 = null; // L: 48 + this.field2847 = null; // L: 49 this.decorations = null; // L: 50 - this.field2346 = false; // L: 51 - this.field2347 = false; // L: 52 + this.field2848 = false; // L: 51 + this.field2850 = false; // L: 52 } // L: 53 @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IILpi;I)V", - garbageValue = "289519849" + descriptor = "(IILpx;I)V", + garbageValue = "1843686575" ) @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.method4319(var1, var2, var3, var4); // L: 61 + this.method4769(var1, var2, var3, var4); // L: 61 } else { - this.method4320(var1, var2, var3, var4); // L: 64 + this.method4770(var1, var2, var3, var4); // L: 64 } } } // L: 58 66 - @ObfuscatedName("h") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IILpi;II)V", - garbageValue = "-1881481092" + descriptor = "(IILpx;IB)V", + garbageValue = "18" ) - void method4319(int var1, int var2, Buffer var3, int var4) { + void method4769(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 @@ -179,12 +174,12 @@ public abstract class AbstractWorldMapData { this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 73 } // L: 74 - @ObfuscatedName("ae") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IILpi;IB)V", - garbageValue = "-121" + descriptor = "(IILpx;IB)V", + garbageValue = "44" ) - void method4320(int var1, int var2, Buffer var3, int var4) { + void method4770(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 @@ -200,8 +195,8 @@ public abstract class AbstractWorldMapData { if (var14 != 0) { // L: 85 this.floorOverlayIds[var9][var1][var2] = (short)var14; // L: 86 var11 = var3.readUnsignedByte(); // L: 87 - this.field2334[var9][var1][var2] = (byte)(var11 >> 2); // L: 88 - this.field2342[var9][var1][var2] = (byte)(var11 & 3); // L: 89 + this.field2845[var9][var1][var2] = (byte)(var11 >> 2); // L: 88 + this.field2847[var9][var1][var2] = (byte)(var11 & 3); // L: 89 } } } @@ -213,7 +208,7 @@ public abstract class AbstractWorldMapData { WorldMapDecoration[] var10 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; // L: 99 for (var11 = 0; var11 < var9; ++var11) { // L: 100 - int var12 = var3.method7692(); // L: 101 + int var12 = var3.method7532(); // L: 101 int var13 = var3.readUnsignedByte(); // L: 102 var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); // L: 103 } @@ -223,186 +218,149 @@ public abstract class AbstractWorldMapData { } // L: 107 - @ObfuscatedName("aq") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "964749640" + garbageValue = "608097340" ) @Export("getRegionX") int getRegionX() { - return this.regionX; + return this.regionX; // L: 112 } - @ObfuscatedName("aw") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1283249810" + garbageValue = "-2122627873" ) @Export("getRegionY") int getRegionY() { - return this.regionY; + return this.regionY; // L: 116 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lln;Lln;Lln;Lji;I)Z", - garbageValue = "1083179858" + descriptor = "(II)Lkt;", + garbageValue = "406038723" ) - public static boolean method4342(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { - class273.musicPatchesArchive = var0; // L: 26 - class273.musicSamplesArchive = var1; // L: 27 - class273.soundEffectsArchive = var2; // L: 28 - class273.midiPcmStream = var3; // L: 29 - return true; // L: 30 + public static GameBuild method4799(int var0) { + GameBuild[] var1 = new GameBuild[]{GameBuild.LIVE, GameBuild.BUILDLIVE, GameBuild.WIP, GameBuild.RC}; // L: 21 + GameBuild[] var2 = var1; // L: 23 + + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 24 + GameBuild var4 = var2[var3]; // L: 25 + if (var0 == var4.buildId) { // L: 27 + return var4; + } + } + + return null; // L: 31 } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)Lca;", - garbageValue = "-1138182451" + descriptor = "(Llp;Llp;ZII)V", + garbageValue = "-598382128" ) - static ClientPreferences method4344() { - AccessFile var0 = null; // L: 112 - ClientPreferences var1 = new ClientPreferences(); // L: 113 + static void method4800(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { + if (Login.clearLoginScreen) { // L: 183 + if (var3 == 4) { // L: 184 + class126.method2799(4); // L: 185 + } - try { - var0 = ModeWhere.getPreferencesFile("", Messages.field1305.name, false); // L: 115 - byte[] var2 = new byte[(int)var0.length()]; // L: 116 + } else { + if (var3 == 0) { // L: 189 + WorldMapData_1.method4706(var2); // L: 190 + } else { + class126.method2799(var3); // L: 193 + } - int var4; - for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 117 118 121 - var4 = var0.read(var2, var3, var2.length - var3); // L: 119 - if (var4 == -1) { - throw new IOException(); // L: 120 + Rasterizer2D.Rasterizer2D_clear(); // L: 195 + byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 196 + UserComparator6.leftTitleSprite = Frames.method4217(var4); // L: 197 + SecureRandomCallable.rightTitleSprite = UserComparator6.leftTitleSprite.mirrorHorizontally(); // L: 198 + int var5 = Client.worldProperties; // L: 199 + if ((var5 & 536870912) != 0) { // L: 201 + Clock.logoSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 202 + } else if ((var5 & 1073741824) != 0) { // L: 204 + Clock.logoSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 205 + } else { + Clock.logoSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 208 + } + + Login.titleboxSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 211 + Login.titlebuttonSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 212 + Clock.field1839 = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); // L: 213 + Login.field882 = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); // L: 214 + JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); // L: 215 + int var7 = var1.getGroupId("runes"); // L: 218 + int var8 = var1.getFileId(var7, ""); // L: 219 + IndexedSprite[] var6 = ItemContainer.method2062(var1, var7, var8); // L: 220 + Login.runesSprite = var6; // L: 222 + var8 = var1.getGroupId("title_mute"); // L: 225 + int var9 = var1.getFileId(var8, ""); // L: 226 + IndexedSprite[] var11 = ItemContainer.method2062(var1, var8, var9); // L: 227 + class358.title_muteSprite = var11; // L: 229 + class67.options_buttons_0Sprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 230 + Login.field888 = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 231 + class101.options_buttons_2Sprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 232 + UrlRequester.field1354 = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 233 + class16.field81 = class67.options_buttons_0Sprite.subWidth; // L: 234 + class268.field3212 = class67.options_buttons_0Sprite.subHeight; // L: 235 + class193.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); // L: 236 + if (var2) { // L: 237 + Login.Login_username = ""; // L: 238 + Login.Login_password = ""; // L: 239 + Login.field876 = new String[8]; // L: 240 + Login.field896 = 0; // L: 241 + } + + WorldMapCacheName.field2912 = 0; // L: 243 + class92.otp = ""; // L: 244 + Login.field900 = true; // L: 245 + Login.worldSelectOpen = false; // L: 246 + if (!class12.clientPreferences.method2226()) { // L: 247 + Archive var12 = AbstractUserComparator.archive6; // L: 248 + var9 = var12.getGroupId("scape main"); // L: 250 + int var10 = var12.getFileId(var9, ""); // L: 251 + UserComparator4.method2573(2, var12, var9, var10, 255, false); // L: 252 + } else { + UrlRequester.method2538(2); // L: 255 + } + + MouseRecorder.method2088(false); // L: 256 + Login.clearLoginScreen = true; // L: 257 + Login.xPadding = (GraphicsObject.canvasWidth - 765) / 2; // L: 258 + Login.loginBoxX = Login.xPadding + 202; // L: 259 + Decimator.loginBoxCenter = Login.loginBoxX + 180; // L: 260 + UserComparator6.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 261 + SecureRandomCallable.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 262 + Clock.logoSprite.drawAt(Login.xPadding + 382 - Clock.logoSprite.subWidth / 2, 18); // L: 263 + } + } // L: 187 264 + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-707674670" + ) + @Export("runWidgetOnLoadListener") + static void runWidgetOnLoadListener(int var0) { + if (var0 != -1) { // L: 4722 + if (WorldMapDecoration.loadInterface(var0)) { // L: 4723 + Widget[] var1 = NetSocket.Widget_interfaceComponents[var0]; // L: 4724 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 4725 + Widget var3 = var1[var2]; // L: 4726 + if (var3.onLoad != null) { // L: 4727 + ScriptEvent var4 = new ScriptEvent(); // L: 4728 + var4.widget = var3; // L: 4729 + var4.args = var3.onLoad; // L: 4730 + class10.runScript(var4, 5000000, 0); // L: 4731 + } } - } - var1 = new ClientPreferences(new Buffer(var2)); // L: 123 - } catch (Exception var6) { // L: 125 - } - - try { - if (var0 != null) { // L: 127 - var0.close(); - } - } catch (Exception var5) { // L: 129 - } - - return var1; // L: 130 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-2052179879" - ) - @Export("readReflectionCheck") - public static void readReflectionCheck(Buffer var0, int var1) { - ReflectionCheck var2 = new ReflectionCheck(); // L: 133 - var2.size = var0.readUnsignedByte(); // L: 134 - var2.id = var0.readInt(); // L: 135 - var2.operations = new int[var2.size]; // L: 136 - var2.creationErrors = new int[var2.size]; // L: 137 - var2.fields = new Field[var2.size]; // L: 138 - var2.intReplaceValues = new int[var2.size]; // L: 139 - var2.methods = new Method[var2.size]; // L: 140 - var2.arguments = new byte[var2.size][][]; // L: 141 - - for (int var3 = 0; var3 < var2.size; ++var3) { // L: 142 - try { - int var4 = var0.readUnsignedByte(); // L: 144 - String var5; - String var6; - int var7; - if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 145 - if (var4 == 3 || var4 == 4) { // L: 155 - var5 = var0.readStringCp1252NullTerminated(); // L: 156 - var6 = var0.readStringCp1252NullTerminated(); // L: 157 - var7 = var0.readUnsignedByte(); // L: 158 - String[] var8 = new String[var7]; // L: 159 - - for (int var9 = 0; var9 < var7; ++var9) { // L: 160 - var8[var9] = var0.readStringCp1252NullTerminated(); - } - - String var20 = var0.readStringCp1252NullTerminated(); // L: 161 - byte[][] var10 = new byte[var7][]; // L: 162 - int var12; - if (var4 == 3) { // L: 163 - for (int var11 = 0; var11 < var7; ++var11) { // L: 164 - var12 = var0.readInt(); // L: 165 - var10[var11] = new byte[var12]; // L: 166 - var0.readBytes(var10[var11], 0, var12); // L: 167 - } - } - - var2.operations[var3] = var4; // L: 170 - Class[] var21 = new Class[var7]; // L: 171 - - for (var12 = 0; var12 < var7; ++var12) { // L: 172 - var21[var12] = class430.loadClassFromDescriptor(var8[var12]); - } - - Class var22 = class430.loadClassFromDescriptor(var20); // L: 173 - if (class430.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 174 - throw new SecurityException(); - } - - Method[] var13 = class430.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 175 - Method[] var14 = var13; // L: 177 - - for (int var15 = 0; var15 < var14.length; ++var15) { // L: 178 - Method var16 = var14[var15]; // L: 179 - if (Reflection.getMethodName(var16).equals(var6)) { // L: 181 - Class[] var17 = Reflection.getParameterTypes(var16); // L: 182 - if (var17.length == var21.length) { // L: 183 - boolean var18 = true; // L: 184 - - for (int var19 = 0; var19 < var21.length; ++var19) { // L: 185 - if (var17[var19] != var21[var19]) { // L: 186 - var18 = false; // L: 187 - break; // L: 188 - } - } - - if (var18 && var22 == var16.getReturnType()) { // L: 191 - var2.methods[var3] = var16; // L: 192 - } - } - } - } - - var2.arguments[var3] = var10; // L: 199 - } - } else { - var5 = var0.readStringCp1252NullTerminated(); // L: 146 - var6 = var0.readStringCp1252NullTerminated(); // L: 147 - var7 = 0; // L: 148 - if (var4 == 1) { // L: 149 - var7 = var0.readInt(); - } - - var2.operations[var3] = var4; // L: 150 - var2.intReplaceValues[var3] = var7; // L: 151 - if (class430.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 152 - throw new SecurityException(); - } - - var2.fields[var3] = Reflection.findField(class430.loadClassFromDescriptor(var5), var6); // L: 153 - } - } catch (ClassNotFoundException var24) { // L: 202 - var2.creationErrors[var3] = -1; // L: 203 - } catch (SecurityException var25) { // L: 205 - var2.creationErrors[var3] = -2; // L: 206 - } catch (NullPointerException var26) { // L: 208 - var2.creationErrors[var3] = -3; // L: 209 - } catch (Exception var27) { // L: 211 - var2.creationErrors[var3] = -4; // L: 212 - } catch (Throwable var28) { // L: 214 - var2.creationErrors[var3] = -5; // L: 215 } } - - class54.reflectionChecks.addFirst(var2); // L: 218 - } // L: 219 + } // L: 4734 } diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index bf21453f3b..d49351e690 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -1,149 +1,148 @@ -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("hq") +@ObfuscatedName("iw") @Implements("AbstractWorldMapIcon") public abstract class AbstractWorldMapIcon { - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lks;" + descriptor = "Lkd;" ) @Export("coord2") public final Coord coord2; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lks;" + descriptor = "Lkd;" ) @Export("coord1") public final Coord coord1; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 331814097 + intValue = -1792317661 ) @Export("screenX") int screenX; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -247318993 + intValue = -1102368635 ) @Export("screenY") int screenY; @ObfuscatedSignature( - descriptor = "(Lks;Lks;)V" + descriptor = "(Lkd;Lkd;)V" ) AbstractWorldMapIcon(Coord var1, Coord var2) { this.coord1 = var1; // L: 13 - this.coord2 = var2; + this.coord2 = var2; // L: 14 } // L: 15 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "364835409" + descriptor = "(B)I", + garbageValue = "16" ) @Export("getElement") public abstract int getElement(); - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)Lho;", - garbageValue = "-32" + descriptor = "(I)Lip;", + garbageValue = "1420245554" ) @Export("getLabel") abstract WorldMapLabel getLabel(); - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-915724910" + descriptor = "(B)I", + garbageValue = "102" ) @Export("getSubWidth") abstract int getSubWidth(); - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1982860019" + garbageValue = "-1663406998" ) @Export("getSubHeight") abstract int getSubHeight(); - @ObfuscatedName("e") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-95" + descriptor = "(III)Z", + garbageValue = "2104661633" ) @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { if (this.elementFitsScreen(var1, var2)) { // L: 18 - return true; // L: 19 + return true; } else { - return this.labelFitsScreen(var1, var2); // L: 21 + return this.labelFitsScreen(var1, var2); } } - @ObfuscatedName("z") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1632005333" + garbageValue = "1482741220" ) @Export("hasValidElement") boolean hasValidElement() { return this.getElement() >= 0; // L: 33 } - @ObfuscatedName("h") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "845547829" + descriptor = "(IIB)Z", + garbageValue = "19" ) @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { - if (!this.hasValidElement()) { // L: 37 + if (!this.hasValidElement()) { return false; } else { - WorldMapElement var3 = UserComparator7.WorldMapElement_get(this.getElement()); // L: 38 - int var4 = this.getSubWidth(); // L: 39 - int var5 = this.getSubHeight(); // L: 40 - switch(var3.horizontalAlignment.value) { // L: 41 + WorldMapElement var3 = class120.WorldMapElement_get(this.getElement()); + int var4 = this.getSubWidth(); + int var5 = this.getSubHeight(); + switch(var3.horizontalAlignment.value) { case 0: - if (var1 >= this.screenX && var1 < var4 + this.screenX) { // L: 54 + if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) { // L: 54 break; } return false; case 1: - if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { // L: 44 - return false; + if (var1 >= this.screenX && var1 < var4 + this.screenX) { + break; } - break; + + return false; case 2: - if (var1 <= this.screenX - var4 || var1 > this.screenX) { // L: 49 + if (var1 <= this.screenX - var4 || var1 > this.screenX) { return false; } } - switch(var3.verticalAlignment.value) { // L: 58 + switch(var3.verticalAlignment.value) { case 0: - if (var2 >= this.screenY && var2 < var5 + this.screenY) { // L: 61 + if (var2 > this.screenY - var5 && var2 <= this.screenY) { break; } return false; case 1: - if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) { // L: 66 + if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) { break; } return false; case 2: - if (var2 <= this.screenY - var5 || var2 > this.screenY) { // L: 71 + if (var2 < this.screenY || var2 >= var5 + this.screenY) { // L: 61 return false; } } @@ -152,59 +151,162 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("ae") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-1755965847" + descriptor = "(IIB)Z", + garbageValue = "49" ) @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 <= var3.height + this.screenY; // L: 84 + WorldMapLabel var3 = this.getLabel(); + if (var3 == null) { + return false; + } else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { + return var2 >= this.screenY && var2 <= this.screenY + var3.height; } else { - return false; // L: 85 + return false; } } - @ObfuscatedName("v") - public static double method4415(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("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-151614308" + descriptor = "(IILgw;Lgh;S)Z", + garbageValue = "128" ) - static void method4429() { - WorldMapRegion.WorldMapRegion_cachedSprites.clear(); // L: 47 - } // L: 48 + public static final boolean method4863(int var0, int var1, RouteStrategy var2, CollisionMap var3) { + int var4 = var0; // L: 19 + int var5 = var1; // L: 20 + byte var6 = 64; // L: 21 + byte var7 = 64; // L: 22 + int var8 = var0 - var6; // L: 23 + int var9 = var1 - var7; // L: 24 + class194.directions[var6][var7] = 99; // L: 25 + class194.distances[var6][var7] = 0; // L: 26 + byte var10 = 0; // L: 27 + int var11 = 0; // L: 28 + class194.bufferX[var10] = var0; // L: 29 + byte var10001 = var10; + int var18 = var10 + 1; + class194.bufferY[var10001] = var1; // L: 30 + int[][] var12 = var3.flags; // L: 31 - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Ljava/io/File;ZB)Z", - garbageValue = "-95" - ) - static boolean method4405(File var0, boolean var1) { - try { - RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); // L: 232 - int var3 = var2.read(); // L: 233 - var2.seek(0L); // L: 234 - var2.write(var3); // L: 235 - var2.seek(0L); // L: 236 - var2.close(); // L: 237 - if (var1) { // L: 238 - var0.delete(); + while (var18 != var11) { // L: 34 + var4 = class194.bufferX[var11]; // L: 35 + var5 = class194.bufferY[var11]; // L: 36 + var11 = var11 + 1 & 4095; // L: 37 + int var16 = var4 - var8; // L: 38 + int var17 = var5 - var9; // L: 39 + int var13 = var4 - var3.xInset; // L: 40 + int var14 = var5 - var3.yInset; // L: 41 + if (var2.hasArrived(1, var4, var5, var3)) { // L: 42 + Varps.field3348 = var4; // L: 43 + class194.field2255 = var5; // L: 44 + return true; // L: 45 } - return true; // L: 239 - } catch (Exception var4) { // L: 241 - return false; // L: 242 + int var15 = class194.distances[var16][var17] + 1; // L: 47 + if (var16 > 0 && class194.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) { // L: 48 + class194.bufferX[var18] = var4 - 1; // L: 49 + class194.bufferY[var18] = var5; // L: 50 + var18 = var18 + 1 & 4095; // L: 51 + class194.directions[var16 - 1][var17] = 2; // L: 52 + class194.distances[var16 - 1][var17] = var15; // L: 53 + } + + if (var16 < 127 && class194.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) { // L: 55 + class194.bufferX[var18] = var4 + 1; // L: 56 + class194.bufferY[var18] = var5; // L: 57 + var18 = var18 + 1 & 4095; // L: 58 + class194.directions[var16 + 1][var17] = 8; // L: 59 + class194.distances[var16 + 1][var17] = var15; // L: 60 + } + + if (var17 > 0 && class194.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { // L: 62 + class194.bufferX[var18] = var4; // L: 63 + class194.bufferY[var18] = var5 - 1; // L: 64 + var18 = var18 + 1 & 4095; // L: 65 + class194.directions[var16][var17 - 1] = 1; // L: 66 + class194.distances[var16][var17 - 1] = var15; // L: 67 + } + + if (var17 < 127 && class194.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { // L: 69 + class194.bufferX[var18] = var4; // L: 70 + class194.bufferY[var18] = var5 + 1; // L: 71 + var18 = var18 + 1 & 4095; // L: 72 + class194.directions[var16][var17 + 1] = 4; // L: 73 + class194.distances[var16][var17 + 1] = var15; // L: 74 + } + + if (var16 > 0 && var17 > 0 && class194.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: 76 + class194.bufferX[var18] = var4 - 1; // L: 77 + class194.bufferY[var18] = var5 - 1; // L: 78 + var18 = var18 + 1 & 4095; // L: 79 + class194.directions[var16 - 1][var17 - 1] = 3; // L: 80 + class194.distances[var16 - 1][var17 - 1] = var15; // L: 81 + } + + if (var16 < 127 && var17 > 0 && class194.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: 83 + class194.bufferX[var18] = var4 + 1; // L: 84 + class194.bufferY[var18] = var5 - 1; // L: 85 + var18 = var18 + 1 & 4095; // L: 86 + class194.directions[var16 + 1][var17 - 1] = 9; // L: 87 + class194.distances[var16 + 1][var17 - 1] = var15; // L: 88 + } + + if (var16 > 0 && var17 < 127 && class194.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: 90 + class194.bufferX[var18] = var4 - 1; // L: 91 + class194.bufferY[var18] = var5 + 1; // L: 92 + var18 = var18 + 1 & 4095; // L: 93 + class194.directions[var16 - 1][var17 + 1] = 6; // L: 94 + class194.distances[var16 - 1][var17 + 1] = var15; // L: 95 + } + + if (var16 < 127 && var17 < 127 && class194.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: 97 + class194.bufferX[var18] = var4 + 1; // L: 98 + class194.bufferY[var18] = var5 + 1; // L: 99 + var18 = var18 + 1 & 4095; // L: 100 + class194.directions[var16 + 1][var17 + 1] = 12; // L: 101 + class194.distances[var16 + 1][var17 + 1] = var15; // L: 102 + } } + + Varps.field3348 = var4; // L: 105 + class194.field2255 = var5; // L: 106 + return false; // L: 107 } + + @ObfuscatedName("hq") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-94279171" + ) + @Export("worldToScreen") + static final void worldToScreen(int var0, int var1, int var2) { + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 5460 + int var3 = class202.getTileHeight(var0, var1, class128.Client_plane) - var2; // L: 5465 + var0 -= class343.cameraX; // L: 5466 + var3 -= class295.cameraY; // L: 5467 + var1 -= FaceNormal.cameraZ; // L: 5468 + int var4 = Rasterizer3D.Rasterizer3D_sine[GameEngine.cameraPitch]; // L: 5469 + int var5 = Rasterizer3D.Rasterizer3D_cosine[GameEngine.cameraPitch]; // L: 5470 + int var6 = Rasterizer3D.Rasterizer3D_sine[StudioGame.cameraYaw]; // L: 5471 + int var7 = Rasterizer3D.Rasterizer3D_cosine[StudioGame.cameraYaw]; // L: 5472 + int var8 = var6 * var1 + var0 * var7 >> 16; // L: 5473 + var1 = var7 * var1 - var0 * var6 >> 16; // L: 5474 + var0 = var8; // L: 5475 + var8 = var5 * var3 - var4 * var1 >> 16; // L: 5476 + var1 = var5 * var1 + var3 * var4 >> 16; // L: 5477 + if (var1 >= 50) { // L: 5479 + Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 5480 + Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; // L: 5481 + } else { + Client.viewportTempX = -1; // L: 5484 + Client.viewportTempY = -1; // L: 5485 + } + + } else { + Client.viewportTempX = -1; // L: 5461 + Client.viewportTempY = -1; // L: 5462 + } + } // L: 5463 5487 } diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index 6258f77372..3b3c95fceb 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -9,33 +9,27 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ph") +@ObfuscatedName("pu") @Implements("AccessFile") public final class AccessFile { - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -104839557 - ) - @Export("musicTrackGroupId") - public static int musicTrackGroupId; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("file") RandomAccessFile file; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - longValue = -766606768005877029L + longValue = -3826011990097739857L ) @Export("maxSize") final long maxSize; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = 6664878474339586353L + longValue = -459654609599987919L ) @Export("offset") long offset; public AccessFile(File var1, String var2, long var3) throws IOException { - if (var3 == -1L) { // L: 11 + if (-1L == var3) { // L: 11 var3 = Long.MAX_VALUE; } @@ -55,17 +49,17 @@ public final class AccessFile { this.file.seek(0L); // L: 23 } // L: 24 - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("seek") final void seek(long var1) throws IOException { this.file.seek(var1); // L: 27 this.offset = var1; // L: 28 } // L: 29 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-26128943" + garbageValue = "133309999" ) @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { @@ -79,20 +73,20 @@ public final class AccessFile { } } // L: 39 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1730487128" + descriptor = "(B)V", + garbageValue = "-16" ) @Export("close") public final void close() throws IOException { this.closeSync(false); // L: 42 } // L: 43 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1333706766" + descriptor = "(ZB)V", + garbageValue = "76" ) @Export("closeSync") public final void closeSync(boolean var1) throws IOException { @@ -110,20 +104,20 @@ public final class AccessFile { } // L: 56 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)J", - garbageValue = "1939570997" + garbageValue = "1020700652" ) @Export("length") public final long length() throws IOException { return this.file.length(); // L: 59 } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "([BIIB)I", - garbageValue = "-22" + garbageValue = "10" ) @Export("read") public final int read(byte[] var1, int var2, int var3) throws IOException { diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 31ae4f183e..43fb732182 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -4,649 +4,633 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cb") +@ObfuscatedName("cx") @Implements("Actor") public abstract class Actor extends Renderable { - @ObfuscatedName("ak") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -737197671 + intValue = 121889507 ) @Export("x") int x; - @ObfuscatedName("ao") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -1503029363 + intValue = 661010269 ) @Export("y") int y; - @ObfuscatedName("aj") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 949937203 + intValue = -1669699483 ) @Export("rotation") int rotation; - @ObfuscatedName("al") + @ObfuscatedName("az") @Export("isWalking") boolean isWalking; - @ObfuscatedName("av") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -783744909 + intValue = 1075193415 ) - int field1150; - @ObfuscatedName("at") + int field1167; + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 2090551411 + intValue = 1662995403 ) @Export("playerCycle") int playerCycle; - @ObfuscatedName("an") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 232574947 + intValue = 277443883 ) @Export("idleSequence") int idleSequence; - @ObfuscatedName("ay") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 1143253727 + intValue = -828957377 ) @Export("turnLeftSequence") int turnLeftSequence; - @ObfuscatedName("ag") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -1560864183 + intValue = 541405107 ) @Export("turnRightSequence") int turnRightSequence; - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -1127685057 + intValue = 567570905 ) @Export("walkSequence") int walkSequence; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 744886811 + intValue = 181548217 ) @Export("walkBackSequence") int walkBackSequence; - @ObfuscatedName("ab") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -956659469 + intValue = -268256549 ) @Export("walkLeftSequence") int walkLeftSequence; - @ObfuscatedName("au") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 184480963 + intValue = -1210183331 ) @Export("walkRightSequence") int walkRightSequence; - @ObfuscatedName("af") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -1130956487 + intValue = -2015875653 ) @Export("runSequence") int runSequence; - @ObfuscatedName("ad") + @ObfuscatedName("ah") + @ObfuscatedGetter( + intValue = 688372339 + ) + int field1150; + @ObfuscatedName("ao") + @ObfuscatedGetter( + intValue = -1227089691 + ) + int field1183; + @ObfuscatedName("av") + @ObfuscatedGetter( + intValue = 659809895 + ) + int field1152; + @ObfuscatedName("ai") + @ObfuscatedGetter( + intValue = 850455971 + ) + int field1160; + @ObfuscatedName("ay") + @ObfuscatedGetter( + intValue = 1260070347 + ) + int field1154; + @ObfuscatedName("aa") + @ObfuscatedGetter( + intValue = 1833639881 + ) + int field1155; + @ObfuscatedName("ax") + @ObfuscatedGetter( + intValue = -417824403 + ) + int field1156; + @ObfuscatedName("at") @Export("overheadText") String overheadText; - @ObfuscatedName("ai") + @ObfuscatedName("br") @Export("isAutoChatting") boolean isAutoChatting; - @ObfuscatedName("ax") - boolean field1130; - @ObfuscatedName("ar") + @ObfuscatedName("ba") + boolean field1198; + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = -1982594461 + intValue = -1230418907 ) @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; - @ObfuscatedName("ap") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -634626739 + intValue = -2134963039 ) @Export("overheadTextColor") int overheadTextColor; - @ObfuscatedName("az") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = -775634919 + intValue = 2079520011 ) @Export("overheadTextEffect") int overheadTextEffect; - @ObfuscatedName("aa") + @ObfuscatedName("bl") @Export("hitSplatCount") byte hitSplatCount; - @ObfuscatedName("bj") + @ObfuscatedName("bs") @Export("hitSplatTypes") int[] hitSplatTypes; - @ObfuscatedName("bm") + @ObfuscatedName("bx") @Export("hitSplatValues") int[] hitSplatValues; - @ObfuscatedName("br") + @ObfuscatedName("bd") @Export("hitSplatCycles") int[] hitSplatCycles; - @ObfuscatedName("bo") + @ObfuscatedName("bj") @Export("hitSplatTypes2") int[] hitSplatTypes2; - @ObfuscatedName("bl") + @ObfuscatedName("be") @Export("hitSplatValues2") int[] hitSplatValues2; - @ObfuscatedName("be") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "Llk;" + descriptor = "Llo;" ) @Export("healthBars") IterableNodeDeque healthBars; - @ObfuscatedName("bh") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -1015640839 + intValue = 16666525 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("bf") + @ObfuscatedName("bv") @Export("false0") boolean false0; - @ObfuscatedName("bb") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = 2088058279 + intValue = 1468417251 ) - int field1121; - @ObfuscatedName("bw") - boolean field1144; - @ObfuscatedName("bx") + int field1172; + @ObfuscatedName("bu") + boolean field1173; + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = 1146125633 + intValue = -87801333 ) @Export("movementSequence") int movementSequence; - @ObfuscatedName("bg") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 898293505 + intValue = -1659027519 ) @Export("movementFrame") int movementFrame; - @ObfuscatedName("bn") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = -112560555 + intValue = -1628370693 ) @Export("movementFrameCycle") int movementFrameCycle; - @ObfuscatedName("bq") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 10456859 + intValue = -419918963 ) @Export("sequence") int sequence; - @ObfuscatedName("ba") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = 560334071 + intValue = 647710587 ) @Export("sequenceFrame") int sequenceFrame; - @ObfuscatedName("bk") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 1378795463 + intValue = -1189789481 ) @Export("sequenceFrameCycle") int sequenceFrameCycle; - @ObfuscatedName("bs") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = 404973767 + intValue = 1226146741 ) @Export("sequenceDelay") int sequenceDelay; - @ObfuscatedName("by") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = 483100279 + intValue = -1495425719 ) - int field1152; - @ObfuscatedName("bt") + int field1186; + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = 949581517 + intValue = 556914221 ) @Export("spotAnimation") int spotAnimation; - @ObfuscatedName("bd") + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = -246855743 + intValue = -861517093 ) @Export("spotAnimationFrame") int spotAnimationFrame; - @ObfuscatedName("bc") + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = 428527393 + intValue = 511018915 ) @Export("spotAnimationFrameCycle") int spotAnimationFrameCycle; - @ObfuscatedName("bp") + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = -1353205367 + intValue = -539089199 ) - int field1134; - @ObfuscatedName("bi") + int field1185; + @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = -848140033 + intValue = 1282068867 ) @Export("spotAnimationHeight") int spotAnimationHeight; - @ObfuscatedName("bu") + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = 2105127011 + intValue = -598436523 ) - int field1129; - @ObfuscatedName("bz") - @ObfuscatedGetter( - intValue = 2045898909 - ) - int field1132; - @ObfuscatedName("bv") - @ObfuscatedGetter( - intValue = -1275901079 - ) - int field1160; + int field1187; @ObfuscatedName("cm") @ObfuscatedGetter( - intValue = -9234697 + intValue = -1307371871 ) - int field1161; + int field1188; + @ObfuscatedName("ca") + @ObfuscatedGetter( + intValue = 1779400399 + ) + int field1189; + @ObfuscatedName("ci") + @ObfuscatedGetter( + intValue = 2006327735 + ) + int field1190; + @ObfuscatedName("cx") + @ObfuscatedGetter( + intValue = -192434321 + ) + int field1191; + @ObfuscatedName("cn") + @ObfuscatedGetter( + intValue = -41775789 + ) + int field1192; @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = 46528465 + intValue = -1780782035 ) - int field1143; - @ObfuscatedName("ch") + int field1139; + @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = -1381806485 - ) - int field1163; - @ObfuscatedName("cf") - @ObfuscatedGetter( - intValue = 988836337 - ) - int field1135; - @ObfuscatedName("cv") - @ObfuscatedGetter( - intValue = 871764515 + intValue = 986187043 ) @Export("npcCycle") int npcCycle; - @ObfuscatedName("cs") + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = 512453881 + intValue = 1812690243 ) @Export("defaultHeight") int defaultHeight; - @ObfuscatedName("cz") + @ObfuscatedName("cd") @ObfuscatedGetter( - intValue = 688985935 + intValue = -1016685127 ) - int field1167; - @ObfuscatedName("ct") + int field1196; + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = 1582188565 + intValue = -1275836225 ) - int field1168; - @ObfuscatedName("cb") - byte field1169; - @ObfuscatedName("cp") - byte field1114; - @ObfuscatedName("co") - byte field1171; - @ObfuscatedName("ca") - byte field1122; - @ObfuscatedName("ci") + int field1197; + @ObfuscatedName("cf") + byte field1143; + @ObfuscatedName("cq") + byte field1199; + @ObfuscatedName("cg") + byte field1153; + @ObfuscatedName("cl") + byte field1140; + @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = 1373710797 + intValue = 1211095435 ) @Export("orientation") int orientation; - @ObfuscatedName("cy") + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = 1390704935 + intValue = 1602792415 ) - int field1174; - @ObfuscatedName("cr") + int field1203; + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = -1419386607 + intValue = 1818380337 ) - int field1175; - @ObfuscatedName("cq") + int field1204; + @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = 661195985 + intValue = -1724632665 ) @Export("pathLength") int pathLength; - @ObfuscatedName("cn") + @ObfuscatedName("cj") @Export("pathX") int[] pathX; - @ObfuscatedName("cu") + @ObfuscatedName("cb") @Export("pathY") int[] pathY; - @ObfuscatedName("cg") + @ObfuscatedName("cp") @ObfuscatedSignature( - descriptor = "[Lgm;" + descriptor = "[Lgd;" ) @Export("pathTraversed") class193[] pathTraversed; - @ObfuscatedName("cj") + @ObfuscatedName("dc") @ObfuscatedGetter( - intValue = -1219276617 + intValue = 753559813 ) - int field1179; - @ObfuscatedName("ce") + int field1194; + @ObfuscatedName("dp") @ObfuscatedGetter( - intValue = -167546627 + intValue = 1620196957 ) - int field1170; - @ObfuscatedName("cl") + int field1200; + @ObfuscatedName("dg") @ObfuscatedGetter( - intValue = -1781781251 + intValue = 731891927 ) - int field1182; + int field1210; Actor() { this.isWalking = false; // L: 13 - this.field1150 = 1; // L: 14 + this.field1167 = 1; // L: 14 this.idleSequence = -1; // L: 16 this.turnLeftSequence = -1; // L: 17 this.turnRightSequence = -1; // L: 18 - this.walkSequence = -1; - this.walkBackSequence = -1; + this.walkSequence = -1; // L: 19 + this.walkBackSequence = -1; // L: 20 this.walkLeftSequence = -1; // L: 21 this.walkRightSequence = -1; // L: 22 this.runSequence = -1; // L: 23 - this.overheadText = null; // L: 24 - this.field1130 = false; // L: 26 - this.overheadTextCyclesRemaining = 100; // L: 27 - this.overheadTextColor = 0; // L: 28 - this.overheadTextEffect = 0; // L: 29 - this.hitSplatCount = 0; // L: 31 - this.hitSplatTypes = new int[4]; // L: 32 - this.hitSplatValues = new int[4]; // L: 33 - this.hitSplatCycles = new int[4]; // L: 34 - this.hitSplatTypes2 = new int[4]; // L: 35 - this.hitSplatValues2 = new int[4]; // L: 36 - this.healthBars = new IterableNodeDeque(); // L: 37 - this.targetIndex = -1; // L: 38 - this.false0 = false; // L: 39 - this.field1121 = -1; // L: 40 - this.movementSequence = -1; // L: 42 - this.movementFrame = 0; // L: 43 - this.movementFrameCycle = 0; // L: 44 - this.sequence = -1; // L: 45 - this.sequenceFrame = 0; // L: 46 - this.sequenceFrameCycle = 0; // L: 47 - this.sequenceDelay = 0; // L: 48 - this.field1152 = 0; // L: 49 - this.spotAnimation = -1; - this.spotAnimationFrame = 0; - this.spotAnimationFrameCycle = 0; - this.npcCycle = 0; - this.defaultHeight = 200; - this.field1167 = -1; - this.field1168 = -1; - this.field1174 = 0; // L: 71 - this.field1175 = 32; // L: 72 - this.pathLength = 0; // L: 73 - this.pathX = new int[10]; // L: 74 - this.pathY = new int[10]; // L: 75 - this.pathTraversed = new class193[10]; // L: 76 - this.field1179 = 0; // L: 77 - this.field1170 = 0; // L: 78 - this.field1182 = -1; // L: 79 - } // L: 81 + this.field1150 = -1; // L: 24 + this.field1183 = -1; // L: 25 + this.field1152 = -1; // L: 26 + this.field1160 = -1; // L: 27 + this.field1154 = -1; // L: 28 + this.field1155 = -1; // L: 29 + this.field1156 = -1; // L: 30 + this.overheadText = null; // L: 31 + this.field1198 = false; // L: 33 + this.overheadTextCyclesRemaining = 100; // L: 34 + this.overheadTextColor = 0; // L: 35 + this.overheadTextEffect = 0; // L: 36 + this.hitSplatCount = 0; // L: 38 + this.hitSplatTypes = new int[4]; // L: 39 + this.hitSplatValues = new int[4]; // L: 40 + this.hitSplatCycles = new int[4]; // L: 41 + this.hitSplatTypes2 = new int[4]; // L: 42 + this.hitSplatValues2 = new int[4]; // L: 43 + this.healthBars = new IterableNodeDeque(); // L: 44 + this.targetIndex = -1; // L: 45 + this.false0 = false; // L: 46 + this.field1172 = -1; // L: 47 + this.movementSequence = -1; // L: 49 + this.movementFrame = 0; // L: 50 + this.movementFrameCycle = 0; // L: 51 + this.sequence = -1; // L: 52 + this.sequenceFrame = 0; // L: 53 + this.sequenceFrameCycle = 0; // L: 54 + this.sequenceDelay = 0; // L: 55 + this.field1186 = 0; // L: 56 + this.spotAnimation = -1; // L: 57 + this.spotAnimationFrame = 0; // L: 58 + this.spotAnimationFrameCycle = 0; // L: 59 + this.npcCycle = 0; // L: 69 + this.defaultHeight = 200; // L: 70 + this.field1196 = -1; // L: 71 + this.field1197 = -1; // L: 72 + this.field1203 = 0; // L: 78 + this.field1204 = 32; // L: 79 + this.pathLength = 0; // L: 80 + this.pathX = new int[10]; // L: 81 + this.pathY = new int[10]; // L: 82 + this.pathTraversed = new class193[10]; // L: 83 + this.field1194 = 0; // L: 84 + this.field1200 = 0; // L: 85 + this.field1210 = -1; // L: 86 + } // L: 88 - @ObfuscatedName("g") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-323504433" + descriptor = "(B)Z", + garbageValue = "-4" ) @Export("isVisible") boolean isVisible() { - return false; // L: 89 + return false; // L: 96 } - @ObfuscatedName("bj") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-124" + garbageValue = "0" ) - final void method2179() { - this.pathLength = 0; // L: 84 - this.field1170 = 0; // L: 85 - } // L: 86 - - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "(IIIIIIB)V", - garbageValue = "32" - ) - @Export("addHitSplat") - final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { - boolean var7 = true; // L: 93 - boolean var8 = true; // L: 94 - - int var9; - for (var9 = 0; var9 < 4; ++var9) { // L: 95 - if (this.hitSplatCycles[var9] > var5) { // L: 96 - var7 = false; - } else { - var8 = false; // L: 97 - } - } - - var9 = -1; // L: 99 - int var10 = -1; // L: 100 - int var11 = 0; // L: 101 - if (var1 >= 0) { // L: 102 - HitSplatDefinition var12 = UserComparator3.method2602(var1); // L: 103 - var10 = var12.field2007; // L: 104 - var11 = var12.field1998; // L: 105 - } - - int var14; - if (var8) { // L: 107 - if (var10 == -1) { // L: 108 - return; - } - - var9 = 0; // L: 109 - var14 = 0; // L: 110 - if (var10 == 0) { // L: 111 - var14 = this.hitSplatCycles[0]; - } else if (var10 == 1) { // L: 112 - var14 = this.hitSplatValues[0]; - } - - for (int var13 = 1; var13 < 4; ++var13) { // L: 113 - if (var10 == 0) { // L: 114 - if (this.hitSplatCycles[var13] < var14) { // L: 115 - var9 = var13; // L: 116 - var14 = this.hitSplatCycles[var13]; // L: 117 - } - } else if (var10 == 1 && this.hitSplatValues[var13] < var14) { // L: 120 121 - var9 = var13; // L: 122 - var14 = this.hitSplatValues[var13]; // L: 123 - } - } - - if (var10 == 1 && var14 >= var2) { // L: 127 - return; - } - } else { - if (var7) { // L: 130 - this.hitSplatCount = 0; - } - - for (var14 = 0; var14 < 4; ++var14) { // L: 131 - byte var15 = this.hitSplatCount; // L: 132 - this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4); // L: 133 - if (this.hitSplatCycles[var15] <= var5) { // L: 134 - var9 = var15; // L: 135 - break; // L: 136 - } - } - } - - if (var9 >= 0) { // L: 140 - this.hitSplatTypes[var9] = var1; // L: 141 - this.hitSplatValues[var9] = var2; // L: 142 - this.hitSplatTypes2[var9] = var3; // L: 143 - this.hitSplatValues2[var9] = var4; // L: 144 - this.hitSplatCycles[var9] = var5 + var11 + var6; // L: 145 - } - } // L: 146 + final void method2180() { + this.pathLength = 0; // L: 91 + this.field1200 = 0; // L: 92 + } // L: 93 @ObfuscatedName("br") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "-36044149" + garbageValue = "1908161271" + ) + @Export("addHitSplat") + final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { + boolean var7 = true; // L: 100 + boolean var8 = true; // L: 101 + + int var9; + for (var9 = 0; var9 < 4; ++var9) { // L: 102 + if (this.hitSplatCycles[var9] > var5) { // L: 103 + var7 = false; + } else { + var8 = false; // L: 104 + } + } + + var9 = -1; // L: 106 + int var10 = -1; // L: 107 + int var11 = 0; // L: 108 + if (var1 >= 0) { // L: 109 + HitSplatDefinition var12 = UserComparator4.method2567(var1); // L: 110 + var10 = var12.field2070; // L: 111 + var11 = var12.field2071; // L: 112 + } + + int var14; + if (var8) { // L: 114 + if (var10 == -1) { // L: 115 + return; + } + + var9 = 0; // L: 116 + var14 = 0; // L: 117 + if (var10 == 0) { // L: 118 + var14 = this.hitSplatCycles[0]; + } else if (var10 == 1) { // L: 119 + var14 = this.hitSplatValues[0]; + } + + for (int var13 = 1; var13 < 4; ++var13) { // L: 120 + if (var10 == 0) { // L: 121 + if (this.hitSplatCycles[var13] < var14) { // L: 122 + var9 = var13; // L: 123 + var14 = this.hitSplatCycles[var13]; // L: 124 + } + } else if (var10 == 1 && this.hitSplatValues[var13] < var14) { // L: 127 128 + var9 = var13; // L: 129 + var14 = this.hitSplatValues[var13]; // L: 130 + } + } + + if (var10 == 1 && var14 >= var2) { // L: 134 + return; + } + } else { + if (var7) { // L: 137 + this.hitSplatCount = 0; + } + + for (var14 = 0; var14 < 4; ++var14) { // L: 138 + byte var15 = this.hitSplatCount; // L: 139 + this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4); // L: 140 + if (this.hitSplatCycles[var15] <= var5) { // L: 141 + var9 = var15; // L: 142 + break; // L: 143 + } + } + } + + if (var9 >= 0) { // L: 147 + this.hitSplatTypes[var9] = var1; // L: 148 + this.hitSplatValues[var9] = var2; // L: 149 + this.hitSplatTypes2[var9] = var3; // L: 150 + this.hitSplatValues2[var9] = var4; // L: 151 + this.hitSplatCycles[var9] = var5 + var11 + var6; // L: 152 + } + } // L: 153 + + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "(IIIIIII)V", + garbageValue = "-1476814237" ) @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var7 = ClanChannelMember.method2870(var1); // L: 149 - HealthBar var8 = null; // L: 150 - HealthBar var9 = null; // L: 151 - int var10 = var7.int2; // L: 152 - int var11 = 0; // L: 153 - - HealthBar var12; - for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { // L: 154 - ++var11; // L: 155 - if (var12.definition.field1862 == var7.field1862) { // L: 156 - var12.put(var2 + var4, var5, var6, var3); // L: 157 - return; // L: 158 + HealthBarDefinition var8 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); // L: 158 + HealthBarDefinition var7; + if (var8 != null) { // L: 159 + var7 = var8; // L: 160 + } else { + byte[] var9 = World.HealthBarDefinition_archive.takeFile(33, var1); // L: 163 + var8 = new HealthBarDefinition(); // L: 164 + if (var9 != null) { // L: 165 + var8.decode(new Buffer(var9)); } - if (var12.definition.int1 <= var7.int1) { // L: 160 - var8 = var12; + HealthBarDefinition.HealthBarDefinition_cached.put(var8, (long)var1); // L: 166 + var7 = var8; // L: 167 + } + + var8 = var7; // L: 169 + HealthBar var14 = null; // L: 170 + HealthBar var10 = null; // L: 171 + int var11 = var7.int2; // L: 172 + int var12 = 0; // L: 173 + + HealthBar var13; + for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) { // L: 174 + ++var12; // L: 175 + if (var13.definition.field1908 == var8.field1908) { // L: 176 + var13.put(var2 + var4, var5, var6, var3); // L: 177 + return; // L: 178 } - if (var12.definition.int2 > var10) { // L: 161 - var9 = var12; // L: 162 - var10 = var12.definition.int2; // L: 163 + if (var13.definition.int1 <= var8.int1) { // L: 180 + var14 = var13; + } + + if (var13.definition.int2 > var11) { // L: 181 + var10 = var13; // L: 182 + var11 = var13.definition.int2; // L: 183 } } - if (var9 != null || var11 < 4) { // L: 166 - var12 = new HealthBar(var7); // L: 167 - if (var8 == null) { // L: 168 - this.healthBars.addLast(var12); + if (var10 != null || var12 < 4) { // L: 186 + var13 = new HealthBar(var8); // L: 187 + if (var14 == null) { // L: 188 + this.healthBars.addLast(var13); } else { - IterableNodeDeque.IterableNodeDeque_addBefore(var12, var8); // L: 169 + IterableNodeDeque.IterableNodeDeque_addBefore(var13, var14); // L: 189 } - var12.put(var2 + var4, var5, var6, var3); // L: 170 - if (var11 >= 4) { // L: 171 - var9.remove(); + var13.put(var2 + var4, var5, var6, var3); // L: 190 + if (var12 >= 4) { // L: 191 + var10.remove(); } } - } // L: 172 + } // L: 192 @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2121685273" + descriptor = "(IB)V", + garbageValue = "-3" ) @Export("removeHealthBar") final void removeHealthBar(int var1) { - HealthBarDefinition var2 = ClanChannelMember.method2870(var1); // L: 175 - - for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { // L: 176 - if (var2 == var3.definition) { // L: 177 - var3.remove(); // L: 178 - return; // L: 179 - } - } - - } // L: 182 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-954026724" - ) - @Export("addGameMessage") - static void addGameMessage(int var0, String var1, String var2) { - class301.addChatMessage(var0, var1, var2, (String)null); // L: 19 - } // L: 20 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" - ) - public static void method2183(int var0) { - class273.musicPlayerStatus = 1; // L: 60 - class273.musicTrackArchive = null; // L: 61 - AccessFile.musicTrackGroupId = -1; // L: 62 - class273.musicTrackFileId = -1; // L: 63 - class273.musicTrackVolume = 0; // L: 64 - class17.musicTrackBoolean = false; // L: 65 - class273.pcmSampleLength = var0; // L: 66 - } // L: 67 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-24811" - ) - static void method2177() { - Messages.Messages_channels.clear(); // L: 50 - Messages.Messages_hashTable.clear(); // L: 51 - Messages.Messages_queue.clear(); // L: 52 - Messages.Messages_count = 0; // L: 53 - } // L: 54 - - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "([BI)[B", - garbageValue = "-1778836338" - ) - @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.field3981 != 0 && var3 > AbstractArchive.field3981) { // 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 + HealthBarDefinition var3 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); // L: 197 + HealthBarDefinition var2; + if (var3 != null) { // L: 198 + var2 = var3; // L: 199 } else { - int var4 = var1.readInt(); // L: 393 - if (var4 >= 0 && (AbstractArchive.field3981 == 0 || var4 <= AbstractArchive.field3981)) { // 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 - } + byte[] var4 = World.HealthBarDefinition_archive.takeFile(33, var1); // L: 202 + var3 = new HealthBarDefinition(); // L: 203 + if (var4 != null) { // L: 204 + var3.decode(new Buffer(var4)); + } - return var5; // L: 400 - } else { - throw new RuntimeException(); // L: 395 + HealthBarDefinition.HealthBarDefinition_cached.put(var3, (long)var1); // L: 205 + var2 = var3; // L: 206 + } + + var3 = var2; // L: 208 + + for (HealthBar var5 = (HealthBar)this.healthBars.last(); var5 != null; var5 = (HealthBar)this.healthBars.previous()) { // L: 209 + if (var3 == var5.definition) { // L: 210 + var5.remove(); // L: 211 + return; // L: 212 } } - } - @ObfuscatedName("fg") - @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "53" - ) - @Export("queueSoundEffect") - static void queueSoundEffect(int var0, int var1, int var2) { - if (class131.clientPreferences.method2243() != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 3597 - Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 3598 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 3599 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 3600 - Client.soundEffects[Client.soundEffectCount] = null; // L: 3601 - Client.soundLocations[Client.soundEffectCount] = 0; // L: 3602 - ++Client.soundEffectCount; // L: 3603 - } - - } // L: 3605 + } // L: 215 } diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index 1ba9a77e53..e1d1cb881d 100644 --- a/runescape-client/src/main/java/Animation.java +++ b/runescape-client/src/main/java/Animation.java @@ -3,51 +3,51 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hf") +@ObfuscatedName("gu") @Implements("Animation") public class Animation { - @ObfuscatedName("v") - static int[] field2515; - @ObfuscatedName("c") - static int[] field2517; - @ObfuscatedName("i") - static int[] field2516; - @ObfuscatedName("f") - static int[] field2523; - @ObfuscatedName("b") + @ObfuscatedName("o") + static int[] field2344; + @ObfuscatedName("q") + static int[] field2342; + @ObfuscatedName("l") + static int[] field2351; + @ObfuscatedName("k") + static int[] field2345; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lgf;" ) @Export("skeleton") Skeleton skeleton; - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("transformCount") int transformCount; - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("transformSkeletonLabels") int[] transformSkeletonLabels; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("transformXs") int[] transformXs; - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("transformYs") int[] transformYs; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("transformZs") int[] transformZs; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("hasAlphaTransform") boolean hasAlphaTransform; static { - field2515 = new int[500]; // L: 8 - field2517 = new int[500]; // L: 9 - field2516 = new int[500]; // L: 10 - field2523 = new int[500]; // L: 11 + field2344 = new int[500]; // L: 8 + field2342 = new int[500]; // L: 9 + field2351 = new int[500]; // L: 10 + field2345 = new int[500]; // L: 11 } @ObfuscatedSignature( - descriptor = "([BLha;)V" + descriptor = "([BLgf;)V" ) Animation(byte[] var1, Skeleton var2) { this.skeleton = null; // L: 12 @@ -69,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 - field2515[var7] = var10; // L: 35 - field2517[var7] = 0; // L: 36 - field2516[var7] = 0; // L: 37 - field2523[var7] = 0; // L: 38 + field2344[var7] = var10; // L: 35 + field2342[var7] = 0; // L: 36 + field2351[var7] = 0; // L: 37 + field2345[var7] = 0; // L: 38 ++var7; // L: 39 break; } } } - field2515[var7] = var8; // L: 44 + field2344[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 - field2517[var7] = var4.readShortSmart(); + field2342[var7] = var4.readShortSmart(); } else { - field2517[var7] = var11; // L: 48 + field2342[var7] = var11; // L: 48 } if ((var9 & 2) != 0) { // L: 49 - field2516[var7] = var4.readShortSmart(); + field2351[var7] = var4.readShortSmart(); } else { - field2516[var7] = var11; // L: 50 + field2351[var7] = var11; // L: 50 } if ((var9 & 4) != 0) { // L: 51 - field2523[var7] = var4.readShortSmart(); + field2345[var7] = var4.readShortSmart(); } else { - field2523[var7] = var11; // L: 52 + field2345[var7] = var11; // L: 52 } var6 = var8; // L: 53 @@ -121,10 +121,10 @@ public class Animation { this.transformZs = new int[var7]; // L: 65 for (var8 = 0; var8 < var7; ++var8) { // L: 66 - this.transformSkeletonLabels[var8] = field2515[var8]; // L: 67 - this.transformXs[var8] = field2517[var8]; // L: 68 - this.transformYs[var8] = field2516[var8]; // L: 69 - this.transformZs[var8] = field2523[var8]; // L: 70 + this.transformSkeletonLabels[var8] = field2344[var8]; // L: 67 + this.transformXs[var8] = field2342[var8]; // L: 68 + this.transformYs[var8] = field2351[var8]; // L: 69 + this.transformZs[var8] = field2345[var8]; // L: 70 } } diff --git a/runescape-client/src/main/java/ApproximateRouteStrategy.java b/runescape-client/src/main/java/ApproximateRouteStrategy.java index ca46436f96..47393a35a6 100644 --- a/runescape-client/src/main/java/ApproximateRouteStrategy.java +++ b/runescape-client/src/main/java/ApproximateRouteStrategy.java @@ -2,162 +2,130 @@ 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("bh") +@ObfuscatedName("bl") @Implements("ApproximateRouteStrategy") public class ApproximateRouteStrategy extends RouteStrategy { - @ObfuscatedName("eg") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "Llx;" + descriptor = "Lke;" ) - @Export("archive20") - static Archive archive20; + static StudioGame field473; + @ObfuscatedName("fw") + static String field471; ApproximateRouteStrategy() { - } // L: 12726 + } // L: 12776 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIILgv;I)Z", - garbageValue = "773884525" + descriptor = "(IIILgh;I)Z", + garbageValue = "-425355466" ) @Export("hasArrived") public boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { - return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 12729 + return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 12780 } - @ObfuscatedName("v") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "([BB)Ljava/lang/String;", - garbageValue = "79" + descriptor = "(IIB)Lki;", + garbageValue = "-103" ) - public static String method1125(byte[] var0) { - return WorldMapData_1.method4226(var0, 0, var0.length); // L: 58 - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-227036396" - ) - static int method1124(int var0, Script var1, boolean var2) { - Widget var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1312 - if (var0 == ScriptOpcodes.IF_GETX) { // L: 1313 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; // L: 1314 - return 1; // L: 1315 - } else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1317 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; // L: 1318 - return 1; // L: 1319 - } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1321 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; // L: 1322 - return 1; // L: 1323 - } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1325 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; // L: 1326 - return 1; // L: 1327 - } else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1329 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1330 - return 1; // L: 1331 - } else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1333 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; // L: 1334 - return 1; // L: 1335 + @Export("getWidgetChild") + public static Widget getWidgetChild(int var0, int var1) { + Widget var2 = class92.getWidget(var0); // L: 239 + if (var1 == -1) { // L: 240 + return var2; } else { - return 2; // L: 1337 + return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 241 242 } } - @ObfuscatedName("as") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "-54" + descriptor = "(I)V", + garbageValue = "-630623402" ) - static int method1123(int var0, Script var1, boolean var2) { - if (var0 == 7400) { // L: 4670 - --Interpreter.Interpreter_intStackSize; // L: 4671 - --class122.Interpreter_stringStackSize; // L: 4672 - return 1; // L: 4673 - } else if (var0 == 7401) { // L: 4675 - --Interpreter.Interpreter_intStackSize; // L: 4676 - --class122.Interpreter_stringStackSize; // L: 4677 - return 1; // L: 4678 - } else if (var0 == 7402) { // L: 4680 - Interpreter.Interpreter_intStackSize -= 2; // L: 4681 - --class122.Interpreter_stringStackSize; // L: 4682 - return 1; // L: 4683 - } else if (var0 == 7403) { // L: 4685 - Interpreter.Interpreter_intStackSize -= 2; // L: 4686 - --class122.Interpreter_stringStackSize; // L: 4687 - return 1; // L: 4688 - } else if (var0 == 7404) { // L: 4690 - --Interpreter.Interpreter_intStackSize; // L: 4691 - --class122.Interpreter_stringStackSize; // L: 4692 - return 1; // L: 4693 - } else if (var0 == 7405) { // L: 4695 - Interpreter.Interpreter_intStackSize -= 2; // L: 4696 - return 1; // L: 4697 - } else if (var0 == 7406) { // L: 4699 - --Interpreter.Interpreter_intStackSize; // L: 4700 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 4701 - return 1; // L: 4702 - } else if (var0 == 7407) { // L: 4704 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4705 - return 1; // L: 4706 - } else if (var0 == 7408) { // L: 4708 - Interpreter.Interpreter_intStackSize -= 2; // L: 4709 - --class122.Interpreter_stringStackSize; // L: 4710 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4711 - return 1; // L: 4712 - } else if (var0 == 7409) { // L: 4714 - --Interpreter.Interpreter_intStackSize; // L: 4715 - return 1; // L: 4716 - } else { - return 2; // L: 4718 - } + public static void method1110() { + class273.midiPcmStream.clear(); // L: 42 + class273.musicPlayerStatus = 1; // L: 43 + ClanChannelMember.musicTrackArchive = null; // L: 44 + } // L: 45 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)[Lcq;", + garbageValue = "768338863" + ) + static AttackOption[] method1108() { + return new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.field1285, AttackOption.AttackOption_alwaysRightClick, AttackOption.field1283, AttackOption.AttackOption_dependsOnCombatLevels}; // L: 12729 } - @ObfuscatedName("jw") + @ObfuscatedName("ir") @ObfuscatedSignature( - descriptor = "(Lky;IIZI)V", - garbageValue = "229748808" + descriptor = "(Lca;IIII)V", + garbageValue = "611280226" ) - @Export("alignWidgetSize") - static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { - int var4 = var0.width; // L: 10820 - int var5 = var0.height; // L: 10821 - if (var0.widthAlignment == 0) { // L: 10822 - var0.width = var0.rawWidth; - } else if (var0.widthAlignment == 1) { // L: 10823 - var0.width = var1 - var0.rawWidth; - } else if (var0.widthAlignment == 2) { // L: 10824 - var0.width = var0.rawWidth * var1 >> 14; - } + @Export("addPlayerToMenu") + static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { + if (ModelData0.localPlayer != var0) { // L: 10138 + if (Client.menuOptionsCount < 400) { // L: 10139 + String var4; + if (var0.skillLevel == 0) { // L: 10141 + var4 = var0.actions[0] + var0.username + var0.actions[1] + IgnoreList.method6430(var0.combatLevel, ModelData0.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; + } else { + var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 10142 + } - if (var0.heightAlignment == 0) { // L: 10825 - var0.height = var0.rawHeight; - } else if (var0.heightAlignment == 1) { // L: 10826 - var0.height = var2 - var0.rawHeight; - } else if (var0.heightAlignment == 2) { // L: 10827 - var0.height = var2 * var0.rawHeight >> 14; - } + int var5; + if (Client.isItemSelected == 1) { // L: 10143 + Projectile.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class166.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 10144 + } else if (Client.isSpellSelected) { // L: 10147 + if ((class113.selectedSpellFlags & 8) == 8) { // L: 10148 + Projectile.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class166.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 10149 + } + } else { + for (var5 = 7; var5 >= 0; --var5) { // L: 10154 + if (Client.playerMenuActions[var5] != null) { // L: 10155 + short var6 = 0; // L: 10156 + if (Client.playerMenuActions[var5].equalsIgnoreCase("Attack")) { // L: 10157 + if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { // L: 10158 + continue; + } - if (var0.widthAlignment == 4) { // L: 10828 - var0.width = var0.field3352 * var0.height / var0.field3353; - } + if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > ModelData0.localPlayer.combatLevel) { // L: 10159 + var6 = 2000; // L: 10160 + } - if (var0.heightAlignment == 4) { // L: 10829 - var0.height = var0.field3353 * var0.width / var0.field3352; - } + if (ModelData0.localPlayer.team != 0 && var0.team != 0) { // L: 10162 + if (var0.team == ModelData0.localPlayer.team) { // L: 10163 + var6 = 2000; + } else { + var6 = 0; // L: 10164 + } + } else if (AttackOption.field1283 == Client.playerAttackOption && var0.isClanMember()) { // L: 10166 + var6 = 2000; // L: 10167 + } + } else if (Client.playerOptionsPriorities[var5]) { // L: 10170 + var6 = 2000; + } - if (var0.contentType == 1337) { // L: 10830 - Client.viewportWidget = var0; - } + boolean var7 = false; // L: 10171 + int var8 = Client.playerMenuOpcodes[var5] + var6; // L: 10172 + Projectile.insertMenuItemNoShift(Client.playerMenuActions[var5], class166.colorStartTag(16777215) + var4, var8, var1, var2, var3); // L: 10173 + } + } + } - if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 10831 - ScriptEvent var6 = new ScriptEvent(); // L: 10832 - var6.widget = var0; // L: 10833 - var6.args = var0.onResize; // L: 10834 - Client.scriptEvents.addFirst(var6); // L: 10835 - } + for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { // L: 10178 + if (Client.menuOpcodes[var5] == 23) { // L: 10179 + Client.menuTargets[var5] = class166.colorStartTag(16777215) + var4; // L: 10180 + break; + } + } - } // L: 10837 + } + } + } // L: 10184 } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index 200f5f7490..fe7d4f8978 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -4,883 +4,390 @@ 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("lx") +@ObfuscatedName("le") @Implements("Archive") public class Archive extends AbstractArchive { - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("Archive_crc") static CRC32 Archive_crc; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Lnc;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Lnc;" ) @Export("masterDisk") ArchiveDisk masterDisk; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1229527393 + intValue = 232250769 ) @Export("index") int index; - @ObfuscatedName("n") - volatile boolean field3952; + @ObfuscatedName("m") + volatile boolean field4009; + @ObfuscatedName("p") + boolean field4010; @ObfuscatedName("s") - boolean field3953; - @ObfuscatedName("l") @Export("validGroups") volatile boolean[] validGroups; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -359474927 + intValue = 693751521 ) @Export("indexCrc") int indexCrc; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1182663877 + intValue = -1377656539 ) @Export("indexVersion") int indexVersion; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -523880279 + intValue = -463478149 ) - int field3947; + int field4013; static { Archive_crc = new CRC32(); // L: 17 } @ObfuscatedSignature( - descriptor = "(Lnw;Lnw;IZZZ)V" + descriptor = "(Lnc;Lnc;IZZZ)V" ) public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { super(var4, var5); // L: 23 - this.field3952 = false; // L: 14 - this.field3953 = false; // L: 15 - this.field3947 = -1; // L: 20 + this.field4009 = false; // L: 14 + this.field4010 = false; // L: 15 + this.field4013 = -1; // L: 20 this.archiveDisk = var1; // L: 24 this.masterDisk = var2; // L: 25 this.index = var3; // L: 26 - this.field3953 = var6; // L: 27 - int var8 = this.index; // L: 29 - if (Huffman.NetCache_reference != null) { // L: 31 - Huffman.NetCache_reference.offset = var8 * 8 + 5; // L: 32 - int var9 = Huffman.NetCache_reference.readInt(); // L: 33 - int var10 = Huffman.NetCache_reference.readInt(); // L: 34 - this.loadIndex(var9, var10); // L: 35 + this.field4010 = var6; // L: 27 + class125.method2796(this, this.index); // L: 28 + } // L: 29 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-611080530" + ) + public boolean method5624() { + return this.field4009; // L: 32 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1253089575" + ) + @Export("percentage") + public int percentage() { + if (this.field4009) { // L: 36 + return 100; + } else if (super.groups != null) { // L: 37 + return 99; } else { - Language.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); // L: 38 - NetCache.NetCache_archives[var8] = this; // L: 39 + int var1 = class6.method45(255, this.index); // L: 38 + if (var1 >= 100) { // L: 39 + var1 = 99; + } + + return var1; // L: 40 + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "738299214" + ) + @Export("loadRegionFromGroup") + void loadRegionFromGroup(int var1) { + DevicePcmPlayerProvider.method336(this.index, var1); // L: 44 + } // L: 45 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-250456045" + ) + @Export("loadGroup") + void loadGroup(int var1) { + if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { // L: 48 + Skeleton.method4022(var1, this.archiveDisk, this); + } else { + class250.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 49 } - } // L: 41 + } // L: 50 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "2125886075" + ) + @Export("loadIndex") + public void loadIndex(int var1, int var2) { + this.indexCrc = var1; // L: 53 + this.indexVersion = var2; // L: 54 + if (this.masterDisk != null) { // L: 55 + Skeleton.method4022(this.index, this.masterDisk, this); + } else { + class250.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 56 + } + + } // L: 57 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I[BZZB)V", + garbageValue = "66" + ) + @Export("write") + public void write(int var1, byte[] var2, boolean var3, boolean var4) { + if (var3) { // L: 60 + if (this.field4009) { // L: 61 + throw new RuntimeException(); // L: 62 + } + + if (this.masterDisk != null) { // L: 64 + ModelData0.method4378(this.index, var2, this.masterDisk); + } + + this.decodeIndex(var2); // L: 65 + this.loadAllLocal(); // L: 66 + } else { + var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 69 + var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 70 + if (this.archiveDisk != null) { // L: 71 + ModelData0.method4378(var1, var2, this.archiveDisk); // L: 72 + this.validGroups[var1] = true; // L: 73 + } + + if (var4) { // L: 75 + super.groups[var1] = WorldMapEvent.method4929(var2, false); + } + } + + } // L: 77 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Lnc;I[BZB)V", + garbageValue = "-99" + ) + @Export("load") + public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { + int var5; + if (var1 == this.masterDisk) { // L: 80 + if (this.field4009) { // L: 81 + throw new RuntimeException(); // L: 82 + } else if (var3 == null) { // L: 84 + class250.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 85 + } else { + Archive_crc.reset(); // L: 88 + Archive_crc.update(var3, 0, var3.length); // L: 89 + var5 = (int)Archive_crc.getValue(); // L: 90 + if (var5 != this.indexCrc) { // L: 91 + class250.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 92 + } else { + Buffer var9 = new Buffer(Skills.decompressBytes(var3)); // L: 95 + int var7 = var9.readUnsignedByte(); // L: 96 + if (var7 != 5 && var7 != 6) { // L: 97 + throw new RuntimeException(var7 + "," + this.index + "," + var2); + } else { + int var8 = 0; // L: 98 + if (var7 >= 6) { // L: 99 + var8 = var9.readInt(); + } + + if (var8 != this.indexVersion) { // L: 100 + class250.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 101 + } else { + this.decodeIndex(var3); // L: 104 + this.loadAllLocal(); // L: 105 + } + } + } + } + } else { + if (!var4 && var2 == this.field4013) { // L: 108 + this.field4009 = true; // L: 109 + } + + if (var3 != null && var3.length > 2) { // L: 111 + Archive_crc.reset(); // L: 116 + Archive_crc.update(var3, 0, var3.length - 2); // L: 117 + var5 = (int)Archive_crc.getValue(); // L: 118 + int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 119 + if (var5 == super.groupCrcs[var2] && var6 == super.groupVersions[var2]) { // L: 120 + this.validGroups[var2] = true; // L: 125 + if (var4) { // L: 126 + super.groups[var2] = WorldMapEvent.method4929(var3, false); + } + + } else { + this.validGroups[var2] = false; // L: 121 + if (this.field4010 || var4) { // L: 122 + class250.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + } + + } + } else { + this.validGroups[var2] = false; // L: 112 + if (this.field4010 || var4) { // L: 113 + class250.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + } + + } + } + } // L: 86 93 102 114 123 128 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "100" + ) + @Export("loadAllLocal") + void loadAllLocal() { + this.validGroups = new boolean[super.groups.length]; // L: 131 + + int var1; + for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 132 + this.validGroups[var1] = false; + } + + if (this.archiveDisk == null) { // L: 133 + this.field4009 = true; // L: 134 + } else { + this.field4013 = -1; // L: 137 + + for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 138 + if (super.fileCounts[var1] > 0) { // L: 139 + ArchiveDisk var2 = this.archiveDisk; // L: 140 + ArchiveDiskAction var4 = new ArchiveDiskAction(); // L: 143 + var4.type = 1; // L: 144 + var4.key = (long)var1; // L: 145 + var4.archiveDisk = var2; // L: 146 + var4.archive = this; // L: 147 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 148 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4); // L: 149 + } // L: 150 + + class306.method5595(); // L: 151 + this.field4013 = var1; // L: 153 + } + } + + if (this.field4013 == -1) { // L: 156 + this.field4009 = true; + } + + } + } // L: 135 157 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "-41" + ) + @Export("groupLoadPercent") + int groupLoadPercent(int var1) { + if (super.groups[var1] != null) { // L: 160 + return 100; + } else { + return this.validGroups[var1] ? 100 : class6.method45(this.index, var1); // L: 161 162 + } + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1338724730" + descriptor = "(IS)Z", + garbageValue = "9905" ) - public boolean method5815() { - return this.field3952; // L: 44 + public boolean method5633(int var1) { + return this.validGroups[var1]; // L: 166 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1729381802" + ) + public boolean method5634(int var1) { + return this.getGroupFileIds(var1) != null; // L: 170 } @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-101" - ) - @Export("percentage") - public int percentage() { - if (this.field3952) { // L: 48 - return 100; - } else if (super.groups != null) { // L: 49 - return 99; - } else { - int var2 = this.index; // L: 51 - long var3 = (long)(var2 + 16711680); // L: 53 - int var1; - if (class271.NetCache_currentResponse != null && class271.NetCache_currentResponse.key == var3) { // L: 54 - var1 = class194.NetCache_responseArchiveBuffer.offset * 99 / (class194.NetCache_responseArchiveBuffer.array.length - class271.NetCache_currentResponse.padding) + 1; // L: 58 - } else { - var1 = 0; // L: 55 - } - - int var5 = var1; // L: 60 - if (var1 >= 100) { // L: 61 - var5 = 99; - } - - return var5; // L: 62 - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2136943756" - ) - @Export("loadRegionFromGroup") - void loadRegionFromGroup(int var1) { - Projectile.method1975(this.index, var1); // L: 66 - } // L: 67 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" - ) - @Export("loadGroup") - void loadGroup(int var1) { - if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { - class17.method256(var1, this.archiveDisk, this); // L: 70 - } else { - Language.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 71 - } - - } // L: 72 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-2075639401" - ) - @Export("loadIndex") - public void loadIndex(int var1, int var2) { - this.indexCrc = var1; // L: 75 - this.indexVersion = var2; // L: 76 - if (this.masterDisk != null) { // L: 77 - class17.method256(this.index, this.masterDisk, this); - } else { - Language.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 78 - } - - } // L: 79 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I[BZZI)V", - garbageValue = "2057711923" - ) - @Export("write") - public void write(int var1, byte[] var2, boolean var3, boolean var4) { - if (var3) { // L: 82 - if (this.field3952) { // L: 83 - throw new RuntimeException(); // L: 84 - } - - if (this.masterDisk != null) { // L: 86 - int var5 = this.index; // L: 87 - ArchiveDisk var6 = this.masterDisk; // L: 88 - ArchiveDiskAction var7 = new ArchiveDiskAction(); // L: 90 - var7.type = 0; // L: 91 - var7.key = (long)var5; // L: 92 - var7.data = var2; // L: 93 - var7.archiveDisk = var6; // L: 94 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 95 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var7); // L: 96 - } // L: 97 - - TileItem.method2395(); // L: 98 - } - - this.decodeIndex(var2); // L: 101 - this.loadAllLocal(); // L: 102 - } else { - var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 105 - var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 106 - if (this.archiveDisk != null) { // L: 107 - ArchiveDisk var11 = this.archiveDisk; // L: 108 - ArchiveDiskAction var14 = new ArchiveDiskAction(); // L: 110 - var14.type = 0; // L: 111 - var14.key = (long)var1; // L: 112 - var14.data = var2; // L: 113 - var14.archiveDisk = var11; // L: 114 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 115 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var14); // L: 116 - } // L: 117 - - TileItem.method2395(); // L: 118 - this.validGroups[var1] = true; // L: 120 - } - - if (var4) { - super.groups[var1] = InterfaceParent.method2084(var2, false); // L: 122 - } - } - - } // L: 124 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lnw;I[BZB)V", - garbageValue = "82" - ) - @Export("load") - public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { - int var5; - if (var1 == this.masterDisk) { // L: 127 - if (this.field3952) { // L: 128 - throw new RuntimeException(); // L: 129 - } - - if (var3 == null) { // L: 131 - Language.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 132 - return; // L: 133 - } - - Archive_crc.reset(); // L: 135 - Archive_crc.update(var3, 0, var3.length); // L: 136 - var5 = (int)Archive_crc.getValue(); // L: 137 - if (var5 != this.indexCrc) { // L: 138 - Language.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 139 - return; // L: 140 - } - - Buffer var9 = new Buffer(Actor.decompressBytes(var3)); // L: 142 - int var7 = var9.readUnsignedByte(); // L: 143 - if (var7 != 5 && var7 != 6) { // L: 144 - throw new RuntimeException(var7 + "," + this.index + "," + var2); - } - - int var8 = 0; // L: 145 - if (var7 >= 6) { // L: 146 - var8 = var9.readInt(); - } - - if (var8 != this.indexVersion) { // L: 147 - Language.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 148 - return; // L: 149 - } - - this.decodeIndex(var3); // L: 151 - this.loadAllLocal(); // L: 152 - } else { - if (!var4 && var2 == this.field3947) { // L: 155 - this.field3952 = true; // L: 156 - } - - if (var3 == null || var3.length <= 2) { // L: 158 - this.validGroups[var2] = false; // L: 159 - if (this.field3953 || var4) { // L: 160 - Language.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); - } - - return; // L: 161 - } - - Archive_crc.reset(); // L: 163 - Archive_crc.update(var3, 0, var3.length - 2); // L: 164 - var5 = (int)Archive_crc.getValue(); // L: 165 - int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 166 - if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { // L: 167 - this.validGroups[var2] = false; // L: 168 - if (this.field3953 || var4) { // L: 169 - Language.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); - } - - return; // L: 170 - } - - this.validGroups[var2] = true; // L: 172 - if (var4) { // L: 173 - super.groups[var2] = InterfaceParent.method2084(var3, false); - } - } - - } // L: 175 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "8" - ) - @Export("loadAllLocal") - void loadAllLocal() { - this.validGroups = new boolean[super.groups.length]; // L: 178 - - int var1; - for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 179 - this.validGroups[var1] = false; - } - - if (this.archiveDisk == null) { // L: 180 - this.field3952 = true; // L: 181 - } else { - this.field3947 = -1; // L: 184 - - for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 185 - if (super.fileCounts[var1] > 0) { // L: 186 - ArchiveDisk var2 = this.archiveDisk; // L: 187 - ArchiveDiskAction var4 = new ArchiveDiskAction(); // L: 190 - var4.type = 1; // L: 191 - var4.key = (long)var1; // L: 192 - var4.archiveDisk = var2; // L: 193 - var4.archive = this; // L: 194 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 195 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4); // L: 196 - } // L: 197 - - TileItem.method2395(); // L: 198 - this.field3947 = var1; // L: 200 - } - } - - if (this.field3947 == -1) { // L: 203 - this.field3952 = true; - } - - } - } // L: 182 204 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1034622346" - ) - @Export("groupLoadPercent") - int groupLoadPercent(int var1) { - if (super.groups[var1] != null) { // L: 207 - return 100; - } else if (this.validGroups[var1]) { // L: 208 - return 100; - } else { - int var3 = this.index; // L: 210 - long var4 = (long)((var3 << 16) + var1); // L: 212 - int var2; - if (class271.NetCache_currentResponse != null && class271.NetCache_currentResponse.key == var4) { // L: 213 - var2 = class194.NetCache_responseArchiveBuffer.offset * 99 / (class194.NetCache_responseArchiveBuffer.array.length - class271.NetCache_currentResponse.padding) + 1; // L: 217 - } else { - var2 = 0; // L: 214 - } - - return var2; // L: 219 - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1922129831" - ) - public boolean method5814(int var1) { - return this.validGroups[var1]; // L: 223 - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1391440725" - ) - public boolean method5824(int var1) { - return this.getGroupFileIds(var1) != null; // L: 227 - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "118" + garbageValue = "-62" ) @Export("loadPercent") public int loadPercent() { - int var1 = 0; // L: 231 - int var2 = 0; // L: 232 + int var1 = 0; // L: 174 + int var2 = 0; // L: 175 int var3; - for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 233 - if (super.fileCounts[var3] > 0) { // L: 234 - var1 += 100; // L: 235 - var2 += this.groupLoadPercent(var3); // L: 236 + for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 176 + if (super.fileCounts[var3] > 0) { // L: 177 + var1 += 100; // L: 178 + var2 += this.groupLoadPercent(var3); // L: 179 } } - if (var1 == 0) { // L: 239 + if (var1 == 0) { // L: 182 return 100; } else { - var3 = var2 * 100 / var1; // L: 240 - return var3; // L: 241 + var3 = var2 * 100 / var1; // L: 183 + return var3; // L: 184 } } - @ObfuscatedName("fa") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "875632133" + descriptor = "(ILbb;ZI)I", + garbageValue = "489788300" ) - @Export("load") - static void load() { - int var14; - if (Client.titleLoadingStage == 0) { // L: 1477 - ArchiveLoader.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 1478 - - for (var14 = 0; var14 < 4; ++var14) { // L: 1479 - Client.collisionMaps[var14] = new CollisionMap(104, 104); + static int method5623(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3789 + class12.Interpreter_intStackSize -= 2; // L: 3790 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3791 + int var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3792 + if (!Client.isCameraLocked) { // L: 3793 + Client.camAngleX = var3; // L: 3794 + Client.camAngleY = var4; // L: 3795 } - HealthBarUpdate.sceneMinimapSprite = new SpritePixels(512, 512); // L: 1480 - Login.Login_loadingText = "Starting game engine..."; // L: 1481 - Login.Login_loadingPercent = 5; // L: 1482 - Client.titleLoadingStage = 20; // L: 1483 - } else if (Client.titleLoadingStage == 20) { // L: 1486 - Login.Login_loadingText = "Prepared visibility map"; // L: 1487 - Login.Login_loadingPercent = 10; // L: 1488 - Client.titleLoadingStage = 30; // L: 1489 - } else if (Client.titleLoadingStage == 30) { // L: 1492 - KeyHandler.archive0 = WorldMapID.newArchive(0, false, true, true); // L: 1493 - UserComparator8.archive1 = WorldMapID.newArchive(1, false, true, true); // L: 1494 - class10.archive2 = WorldMapID.newArchive(2, true, false, true); // L: 1495 - BufferedNetSocket.archive3 = WorldMapID.newArchive(3, false, true, true); // L: 1496 - class182.archive4 = WorldMapID.newArchive(4, false, true, true); // L: 1497 - Players.archive5 = WorldMapID.newArchive(5, true, true, true); // L: 1498 - class16.archive6 = WorldMapID.newArchive(6, true, true, true); // L: 1499 - LoginScreenAnimation.archive7 = WorldMapID.newArchive(7, false, true, true); // L: 1500 - class145.archive8 = WorldMapID.newArchive(8, false, true, true); // L: 1501 - WorldMapDecorationType.archive9 = WorldMapID.newArchive(9, false, true, true); // L: 1502 - JagexCache.archive10 = WorldMapID.newArchive(10, false, true, true); // L: 1503 - Message.archive11 = WorldMapID.newArchive(11, false, true, true); // L: 1504 - class152.archive12 = WorldMapID.newArchive(12, false, true, true); // L: 1505 - class166.archive13 = WorldMapID.newArchive(13, true, false, true); // L: 1506 - class291.archive14 = WorldMapID.newArchive(14, false, true, true); // L: 1507 - class28.archive15 = WorldMapID.newArchive(15, false, true, true); // L: 1508 - class54.archive17 = WorldMapID.newArchive(17, true, true, true); // L: 1509 - WorldMapRectangle.archive18 = WorldMapID.newArchive(18, false, true, true); // L: 1510 - ObjectSound.archive19 = WorldMapID.newArchive(19, false, true, true); // L: 1511 - ApproximateRouteStrategy.archive20 = WorldMapID.newArchive(20, false, true, true); // L: 1512 - Login.Login_loadingText = "Connecting to update server"; // L: 1513 - Login.Login_loadingPercent = 20; // L: 1514 - Client.titleLoadingStage = 40; // L: 1515 - } else if (Client.titleLoadingStage == 40) { // L: 1518 - byte var33 = 0; // L: 1519 - var14 = var33 + KeyHandler.archive0.percentage() * 4 / 100; // L: 1520 - var14 += UserComparator8.archive1.percentage() * 4 / 100; // L: 1521 - var14 += class10.archive2.percentage() * 2 / 100; // L: 1522 - var14 += BufferedNetSocket.archive3.percentage() * 2 / 100; // L: 1523 - var14 += class182.archive4.percentage() * 6 / 100; // L: 1524 - var14 += Players.archive5.percentage() * 4 / 100; // L: 1525 - var14 += class16.archive6.percentage() * 2 / 100; // L: 1526 - var14 += LoginScreenAnimation.archive7.percentage() * 56 / 100; // L: 1527 - var14 += class145.archive8.percentage() * 2 / 100; // L: 1528 - var14 += WorldMapDecorationType.archive9.percentage() * 2 / 100; // L: 1529 - var14 += JagexCache.archive10.percentage() * 2 / 100; // L: 1530 - var14 += Message.archive11.percentage() * 2 / 100; // L: 1531 - var14 += class152.archive12.percentage() * 2 / 100; // L: 1532 - var14 += class166.archive13.percentage() * 2 / 100; // L: 1533 - var14 += class291.archive14.percentage() * 2 / 100; // L: 1534 - var14 += class28.archive15.percentage() * 2 / 100; // L: 1535 - var14 += ObjectSound.archive19.percentage() / 100; // L: 1536 - var14 += WorldMapRectangle.archive18.percentage() / 100; // L: 1537 - var14 += ApproximateRouteStrategy.archive20.percentage() / 100; // L: 1538 - var14 += class54.archive17.method5815() && class54.archive17.isFullyLoaded() ? 1 : 0; // L: 1539 - if (var14 != 100) { // L: 1540 - if (var14 != 0) { // L: 1541 - Login.Login_loadingText = "Checking for updates - " + var14 + "%"; - } - - Login.Login_loadingPercent = 30; // L: 1542 - } else { - class1.method8(KeyHandler.archive0, "Animations"); // L: 1545 - class1.method8(UserComparator8.archive1, "Skeletons"); // L: 1546 - class1.method8(class182.archive4, "Sound FX"); // L: 1547 - class1.method8(Players.archive5, "Maps"); // L: 1548 - class1.method8(class16.archive6, "Music Tracks"); // L: 1549 - class1.method8(LoginScreenAnimation.archive7, "Models"); // L: 1550 - class1.method8(class145.archive8, "Sprites"); // L: 1551 - class1.method8(Message.archive11, "Music Jingles"); // L: 1552 - class1.method8(class291.archive14, "Music Samples"); // L: 1553 - class1.method8(class28.archive15, "Music Patches"); // L: 1554 - class1.method8(ObjectSound.archive19, "World Map"); // L: 1555 - class1.method8(WorldMapRectangle.archive18, "World Map Geography"); // L: 1556 - class1.method8(ApproximateRouteStrategy.archive20, "World Map Ground"); // L: 1557 - Language.spriteIds = new GraphicsDefaults(); // L: 1558 - Language.spriteIds.decode(class54.archive17); // L: 1559 - Login.Login_loadingText = "Loaded update list"; // L: 1560 - Login.Login_loadingPercent = 30; // L: 1561 - Client.titleLoadingStage = 45; // L: 1562 + return 1; // L: 3797 + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3799 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3800 + return 1; // L: 3801 + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3803 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3804 + return 1; // L: 3805 + } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3807 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3808 + if (var3 < 0) { // L: 3809 + var3 = 0; } - } else if (Client.titleLoadingStage == 45) { // L: 1565 - class78.method2082(22050, !Client.isLowDetail, 2); // L: 1566 - MidiPcmStream var24 = new MidiPcmStream(); // L: 1567 - var24.method5248(9, 128); // L: 1568 - KeyHandler.pcmPlayer0 = Varps.method5523(GameEngine.taskHandler, 0, 22050); // L: 1569 - KeyHandler.pcmPlayer0.setStream(var24); // L: 1570 - AbstractWorldMapData.method4342(class28.archive15, class291.archive14, class182.archive4, var24); // L: 1571 - ViewportMouse.pcmPlayer1 = Varps.method5523(GameEngine.taskHandler, 1, 2048); // L: 1572 - StructComposition.pcmStreamMixer = new PcmStreamMixer(); // L: 1573 - ViewportMouse.pcmPlayer1.setStream(StructComposition.pcmStreamMixer); // L: 1574 - WorldMapRectangle.decimator = new Decimator(22050, PcmPlayer.field268); // L: 1575 - Login.Login_loadingText = "Prepared sound engine"; // L: 1576 - Login.Login_loadingPercent = 35; // L: 1577 - Client.titleLoadingStage = 50; // L: 1578 - AbstractWorldMapData.WorldMapElement_fonts = new Fonts(class145.archive8, class166.archive13); // L: 1579 + + Client.camFollowHeight = var3; // L: 3810 + return 1; // L: 3811 + } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3813 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3814 + return 1; // L: 3815 } else { - int var15; - if (Client.titleLoadingStage == 50) { // L: 1582 - FontName[] var23 = new FontName[]{FontName.FontName_plain11, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_plain12, FontName.FontName_bold12, FontName.FontName_verdana13}; // L: 1585 - var15 = var23.length; // L: 1587 - Fonts var25 = AbstractWorldMapData.WorldMapElement_fonts; // L: 1588 - FontName[] var31 = new FontName[]{FontName.FontName_plain11, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_plain12, FontName.FontName_bold12, FontName.FontName_verdana13}; // L: 1591 - Client.fontsMap = var25.createMap(var31); // L: 1593 - if (Client.fontsMap.size() < var15) { // L: 1594 - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var15 + "%"; // L: 1595 - Login.Login_loadingPercent = 40; // L: 1596 - } else { - class113.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 1599 - class13.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 1600 - RouteStrategy.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 1601 - class263.platformInfo = Client.platformInfoProvider.get(); // L: 1602 - Login.Login_loadingText = "Loaded fonts"; // L: 1603 - Login.Login_loadingPercent = 40; // L: 1604 - Client.titleLoadingStage = 60; // L: 1605 - } - } else { - Archive var2; - int var3; - Archive var26; - int var29; - if (Client.titleLoadingStage == 60) { // L: 1608 - var26 = JagexCache.archive10; // L: 1610 - var2 = class145.archive8; // L: 1611 - var3 = 0; // L: 1613 - String[] var32 = Login.field917; // L: 1615 - - int var21; - String var28; - for (var21 = 0; var21 < var32.length; ++var21) { // L: 1616 - var28 = var32[var21]; // L: 1617 - if (var26.tryLoadFileByNames(var28, "")) { // L: 1619 - ++var3; - } - } - - var32 = Login.field918; // L: 1624 - - for (var21 = 0; var21 < var32.length; ++var21) { // L: 1625 - var28 = var32[var21]; // L: 1626 - if (var2.tryLoadFileByNames(var28, "")) { // L: 1628 - ++var3; - } - } - - var29 = Login.field917.length + Login.field918.length; // L: 1637 - if (var3 < var29) { // L: 1640 - Login.Login_loadingText = "Loading title screen - " + var3 * 100 / var29 + "%"; // L: 1641 - Login.Login_loadingPercent = 50; // L: 1642 - } else { - Login.Login_loadingText = "Loaded title screen"; // L: 1645 - Login.Login_loadingPercent = 50; // L: 1646 - Decimator.updateGameState(5); // L: 1647 - Client.titleLoadingStage = 70; // L: 1648 - } - } else if (Client.titleLoadingStage == 70) { // L: 1651 - if (!class10.archive2.isFullyLoaded()) { // L: 1652 - Login.Login_loadingText = "Loading config - " + class10.archive2.loadPercent() + "%"; // L: 1653 - Login.Login_loadingPercent = 60; // L: 1654 - } else { - Archive var22 = class10.archive2; // L: 1657 - FloorOverlayDefinition.FloorOverlayDefinition_archive = var22; // L: 1659 - var26 = class10.archive2; // L: 1661 - FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var26; // L: 1663 - var2 = class10.archive2; // L: 1665 - Archive var17 = LoginScreenAnimation.archive7; // L: 1666 - KitDefinition.KitDefinition_archive = var2; // L: 1668 - class147.KitDefinition_modelsArchive = var17; // L: 1669 - KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); // L: 1670 - Archive var18 = class10.archive2; // L: 1672 - Archive var27 = LoginScreenAnimation.archive7; // L: 1673 - boolean var19 = Client.isLowDetail; // L: 1674 - WorldMapData_0.ObjectDefinition_archive = var18; // L: 1676 - ObjectComposition.ObjectDefinition_modelsArchive = var27; // L: 1677 - ObjectComposition.ObjectDefinition_isLowDetail = var19; // L: 1678 - KitDefinition.method3452(class10.archive2, LoginScreenAnimation.archive7); // L: 1680 - Archive var20 = class10.archive2; // L: 1681 - StructComposition.StructDefinition_archive = var20; // L: 1683 - class163.method3318(class10.archive2, LoginScreenAnimation.archive7, Client.isMembersWorld, class113.fontPlain11); // L: 1685 - class125.method2811(class10.archive2, KeyHandler.archive0, UserComparator8.archive1); // L: 1686 - Archive var30 = class10.archive2; // L: 1687 - Archive var9 = LoginScreenAnimation.archive7; // L: 1688 - SpotAnimationDefinition.SpotAnimationDefinition_archive = var30; // L: 1690 - SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var9; // L: 1691 - Archive var10 = class10.archive2; // L: 1693 - class11.VarbitDefinition_archive = var10; // L: 1695 - Archive var11 = class10.archive2; // L: 1697 - VarpDefinition.VarpDefinition_archive = var11; // L: 1699 - VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 1700 - Renderable.method4917(BufferedNetSocket.archive3, LoginScreenAnimation.archive7, class145.archive8, class166.archive13); // L: 1702 - WorldMapEvent.method4506(class10.archive2); // L: 1703 - Canvas.method357(class10.archive2); // L: 1704 - Archive var12 = class10.archive2; // L: 1705 - class384.VarcInt_archive = var12; // L: 1707 - Bounds.method6969(class10.archive2); // L: 1709 - Archive var13 = class10.archive2; // L: 1710 - ParamComposition.ParamDefinition_archive = var13; // L: 1712 - ReflectionCheck.HitSplatDefinition_cachedSprites = new class426(Messages.field1305, 54, Skills.clientLanguage, class10.archive2); // L: 1714 - DirectByteArrayCopier.HitSplatDefinition_cached = new class426(Messages.field1305, 47, Skills.clientLanguage, class10.archive2); // L: 1715 - class160.varcs = new Varcs(); // L: 1716 - UserComparator7.method2590(class10.archive2, class145.archive8, class166.archive13); // L: 1717 - UserComparator5.method2592(class10.archive2, class145.archive8); // L: 1718 - class152.method3170(class10.archive2, class145.archive8); // L: 1719 - Login.Login_loadingText = "Loaded config"; // L: 1720 - Login.Login_loadingPercent = 60; // L: 1721 - Client.titleLoadingStage = 80; // L: 1722 - } - } else if (Client.titleLoadingStage == 80) { // L: 1725 - var14 = 0; // L: 1726 - if (class14.compass == null) { // L: 1727 - class14.compass = class6.SpriteBuffer_getSprite(class145.archive8, Language.spriteIds.compass, 0); - } else { - ++var14; // L: 1728 - } - - if (Canvas.redHintArrowSprite == null) { // L: 1729 - Canvas.redHintArrowSprite = class6.SpriteBuffer_getSprite(class145.archive8, Language.spriteIds.field4314, 0); - } else { - ++var14; // L: 1730 - } - - IndexedSprite[] var1; - boolean var4; - byte[] var5; - IndexedSprite[] var6; - int var7; - IndexedSprite var8; - if (GraphicsDefaults.mapSceneSprites == null) { // L: 1731 - var2 = class145.archive8; // L: 1733 - var3 = Language.spriteIds.mapScenes; // L: 1734 - var5 = var2.takeFile(var3, 0); // L: 1738 - if (var5 == null) { // L: 1739 - var4 = false; // L: 1740 - } else { - WorldMapArea.SpriteBuffer_decode(var5); // L: 1743 - var4 = true; // L: 1744 - } - - if (!var4) { // L: 1746 - var1 = null; // L: 1747 - } else { - var6 = new IndexedSprite[class451.SpriteBuffer_spriteCount]; // L: 1752 - - for (var7 = 0; var7 < class451.SpriteBuffer_spriteCount; ++var7) { // L: 1753 - var8 = var6[var7] = new IndexedSprite(); // L: 1754 - var8.width = class451.SpriteBuffer_spriteWidth; // L: 1755 - var8.height = class451.SpriteBuffer_spriteHeight; // L: 1756 - var8.xOffset = class451.SpriteBuffer_xOffsets[var7]; // L: 1757 - var8.yOffset = class271.SpriteBuffer_yOffsets[var7]; // L: 1758 - var8.subWidth = class451.SpriteBuffer_spriteWidths[var7]; // L: 1759 - var8.subHeight = class451.SpriteBuffer_spriteHeights[var7]; // L: 1760 - var8.palette = NetFileRequest.SpriteBuffer_spritePalette; // L: 1761 - var8.pixels = FriendLoginUpdate.SpriteBuffer_pixels[var7]; // L: 1762 - } - - ArchiveDiskActionHandler.method5813(); // L: 1764 - var1 = var6; // L: 1767 - } - - GraphicsDefaults.mapSceneSprites = var1; // L: 1769 - } else { - ++var14; // L: 1771 - } - - if (class150.headIconPkSprites == null) { // L: 1772 - class150.headIconPkSprites = class429.method7568(class145.archive8, Language.spriteIds.headIconsPk, 0); - } else { - ++var14; // L: 1773 - } - - if (WallDecoration.headIconPrayerSprites == null) { // L: 1774 - WallDecoration.headIconPrayerSprites = class429.method7568(class145.archive8, Language.spriteIds.field4322, 0); - } else { - ++var14; // L: 1775 - } - - if (InvDefinition.headIconHintSprites == null) { // L: 1776 - InvDefinition.headIconHintSprites = class429.method7568(class145.archive8, Language.spriteIds.field4318, 0); - } else { - ++var14; // L: 1777 - } - - if (WorldMapLabelSize.mapMarkerSprites == null) { // L: 1778 - WorldMapLabelSize.mapMarkerSprites = class429.method7568(class145.archive8, Language.spriteIds.field4319, 0); - } else { - ++var14; // L: 1779 - } - - if (class11.crossSprites == null) { // L: 1780 - class11.crossSprites = class429.method7568(class145.archive8, Language.spriteIds.field4320, 0); - } else { - ++var14; // L: 1781 - } - - if (class54.mapDotSprites == null) { // L: 1782 - class54.mapDotSprites = class429.method7568(class145.archive8, Language.spriteIds.field4321, 0); - } else { - ++var14; // L: 1783 - } - - if (class29.scrollBarSprites == null) { // L: 1784 - var2 = class145.archive8; // L: 1786 - var3 = Language.spriteIds.field4315; // L: 1787 - var5 = var2.takeFile(var3, 0); // L: 1791 - if (var5 == null) { // L: 1792 - var4 = false; // L: 1793 - } else { - WorldMapArea.SpriteBuffer_decode(var5); // L: 1796 - var4 = true; // L: 1797 - } - - if (!var4) { // L: 1799 - var1 = null; // L: 1800 - } else { - var6 = new IndexedSprite[class451.SpriteBuffer_spriteCount]; // L: 1805 - - for (var7 = 0; var7 < class451.SpriteBuffer_spriteCount; ++var7) { // L: 1806 - var8 = var6[var7] = new IndexedSprite(); // L: 1807 - var8.width = class451.SpriteBuffer_spriteWidth; // L: 1808 - var8.height = class451.SpriteBuffer_spriteHeight; // L: 1809 - var8.xOffset = class451.SpriteBuffer_xOffsets[var7]; // L: 1810 - var8.yOffset = class271.SpriteBuffer_yOffsets[var7]; // L: 1811 - var8.subWidth = class451.SpriteBuffer_spriteWidths[var7]; // L: 1812 - var8.subHeight = class451.SpriteBuffer_spriteHeights[var7]; // L: 1813 - var8.palette = NetFileRequest.SpriteBuffer_spritePalette; // L: 1814 - var8.pixels = FriendLoginUpdate.SpriteBuffer_pixels[var7]; // L: 1815 - } - - ArchiveDiskActionHandler.method5813(); // L: 1817 - var1 = var6; // L: 1820 - } - - class29.scrollBarSprites = var1; // L: 1822 - } else { - ++var14; // L: 1824 - } - - if (PcmPlayer.modIconSprites == null) { // L: 1825 - var2 = class145.archive8; // L: 1827 - var3 = Language.spriteIds.field4323; // L: 1828 - var5 = var2.takeFile(var3, 0); // L: 1832 - if (var5 == null) { // L: 1833 - var4 = false; // L: 1834 - } else { - WorldMapArea.SpriteBuffer_decode(var5); // L: 1837 - var4 = true; // L: 1838 - } - - if (!var4) { // L: 1840 - var1 = null; // L: 1841 - } else { - var6 = new IndexedSprite[class451.SpriteBuffer_spriteCount]; // L: 1846 - - for (var7 = 0; var7 < class451.SpriteBuffer_spriteCount; ++var7) { // L: 1847 - var8 = var6[var7] = new IndexedSprite(); // L: 1848 - var8.width = class451.SpriteBuffer_spriteWidth; // L: 1849 - var8.height = class451.SpriteBuffer_spriteHeight; // L: 1850 - var8.xOffset = class451.SpriteBuffer_xOffsets[var7]; // L: 1851 - var8.yOffset = class271.SpriteBuffer_yOffsets[var7]; // L: 1852 - var8.subWidth = class451.SpriteBuffer_spriteWidths[var7]; // L: 1853 - var8.subHeight = class451.SpriteBuffer_spriteHeights[var7]; // L: 1854 - var8.palette = NetFileRequest.SpriteBuffer_spritePalette; // L: 1855 - var8.pixels = FriendLoginUpdate.SpriteBuffer_pixels[var7]; // L: 1856 - } - - ArchiveDiskActionHandler.method5813(); // L: 1858 - var1 = var6; // L: 1861 - } - - PcmPlayer.modIconSprites = var1; // L: 1863 - } else { - ++var14; // L: 1865 - } - - if (var14 < 11) { // L: 1866 - Login.Login_loadingText = "Loading sprites - " + var14 * 100 / 12 + "%"; // L: 1867 - Login.Login_loadingPercent = 70; // L: 1868 - } else { - AbstractFont.AbstractFont_modIconSprites = PcmPlayer.modIconSprites; // L: 1871 - Canvas.redHintArrowSprite.normalize(); // L: 1872 - var15 = (int)(Math.random() * 21.0D) - 10; // L: 1873 - int var16 = (int)(Math.random() * 21.0D) - 10; // L: 1874 - var3 = (int)(Math.random() * 21.0D) - 10; // L: 1875 - var29 = (int)(Math.random() * 41.0D) - 20; // L: 1876 - GraphicsDefaults.mapSceneSprites[0].shiftColors(var15 + var29, var29 + var16, var29 + var3); // L: 1877 - Login.Login_loadingText = "Loaded sprites"; // L: 1878 - Login.Login_loadingPercent = 70; // L: 1879 - Client.titleLoadingStage = 90; // L: 1880 - } - } else if (Client.titleLoadingStage == 90) { // L: 1883 - if (!WorldMapDecorationType.archive9.isFullyLoaded()) { // L: 1884 - Login.Login_loadingText = "Loading textures - " + "0%"; // L: 1885 - Login.Login_loadingPercent = 90; // L: 1886 - } else { - class138.textureProvider = new TextureProvider(WorldMapDecorationType.archive9, class145.archive8, 20, class131.clientPreferences.method2240(), Client.isLowDetail ? 64 : 128); // L: 1889 - Rasterizer3D.Rasterizer3D_setTextureLoader(class138.textureProvider); // L: 1890 - Rasterizer3D.Rasterizer3D_setBrightness(class131.clientPreferences.method2240()); // L: 1891 - Client.titleLoadingStage = 100; // L: 1892 - } - } else if (Client.titleLoadingStage == 100) { // L: 1895 - var14 = class138.textureProvider.getLoadedPercentage(); // L: 1896 - if (var14 < 100) { // L: 1897 - Login.Login_loadingText = "Loading textures - " + var14 + "%"; // L: 1898 - Login.Login_loadingPercent = 90; // L: 1899 - } else { - Login.Login_loadingText = "Loaded textures"; // L: 1902 - Login.Login_loadingPercent = 90; // L: 1903 - Client.titleLoadingStage = 110; // L: 1904 - } - } else if (Client.titleLoadingStage == 110) { // L: 1907 - class120.mouseRecorder = new MouseRecorder(); // L: 1908 - GameEngine.taskHandler.newThreadTask(class120.mouseRecorder, 10); // L: 1909 - Login.Login_loadingText = "Loaded input handler"; // L: 1910 - Login.Login_loadingPercent = 92; // L: 1911 - Client.titleLoadingStage = 120; // L: 1912 - } else if (Client.titleLoadingStage == 120) { // L: 1915 - if (!JagexCache.archive10.tryLoadFileByNames("huffman", "")) { // L: 1916 - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 1917 - Login.Login_loadingPercent = 94; // L: 1918 - } else { - Huffman var0 = new Huffman(JagexCache.archive10.takeFileByNames("huffman", "")); // L: 1921 - class282.huffman = var0; // L: 1923 - Login.Login_loadingText = "Loaded wordpack"; // L: 1925 - Login.Login_loadingPercent = 94; // L: 1926 - Client.titleLoadingStage = 130; // L: 1927 - } - } else if (Client.titleLoadingStage == 130) { // L: 1930 - if (!BufferedNetSocket.archive3.isFullyLoaded()) { // L: 1931 - Login.Login_loadingText = "Loading interfaces - " + BufferedNetSocket.archive3.loadPercent() * 4 / 5 + "%"; // L: 1932 - Login.Login_loadingPercent = 96; // L: 1933 - } else if (!class152.archive12.isFullyLoaded()) { // L: 1936 - Login.Login_loadingText = "Loading interfaces - " + (80 + class152.archive12.loadPercent() / 6) + "%"; // L: 1937 - Login.Login_loadingPercent = 96; // L: 1938 - } else if (!class166.archive13.isFullyLoaded()) { // L: 1941 - Login.Login_loadingText = "Loading interfaces - " + (96 + class166.archive13.loadPercent() / 50) + "%"; // L: 1942 - Login.Login_loadingPercent = 96; // L: 1943 - } else { - Login.Login_loadingText = "Loaded interfaces"; // L: 1946 - Login.Login_loadingPercent = 98; // L: 1947 - Client.titleLoadingStage = 140; // L: 1948 - } - } else if (Client.titleLoadingStage == 140) { // L: 1951 - Login.Login_loadingPercent = 100; // L: 1952 - if (!ObjectSound.archive19.tryLoadGroupByName(WorldMapCacheName.field2413.name)) { // L: 1953 - Login.Login_loadingText = "Loading world map - " + ObjectSound.archive19.groupLoadPercentByName(WorldMapCacheName.field2413.name) / 10 + "%"; // L: 1954 - } else { - if (ScriptFrame.worldMap == null) { // L: 1957 - ScriptFrame.worldMap = new WorldMap(); // L: 1958 - ScriptFrame.worldMap.init(ObjectSound.archive19, WorldMapRectangle.archive18, ApproximateRouteStrategy.archive20, RouteStrategy.fontBold12, Client.fontsMap, GraphicsDefaults.mapSceneSprites); // L: 1959 - } - - Login.Login_loadingText = "Loaded world map"; // L: 1961 - Client.titleLoadingStage = 150; // L: 1962 - } - } else if (Client.titleLoadingStage == 150) { // L: 1965 - Decimator.updateGameState(10); // L: 1966 - } - } + return 2; // L: 3817 } - } // L: 1484 1490 1516 1543 1563 1580 1597 1606 1643 1649 1655 1723 1869 1881 1887 1893 1900 1905 1913 1919 1928 1934 1939 1944 1949 1955 1963 1967 1969 + } } diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index 425c77fdf5..c7c91442d6 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -6,38 +6,38 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nw") +@ObfuscatedName("nc") @Implements("ArchiveDisk") public final class ArchiveDisk { - @ObfuscatedName("sl") - @ObfuscatedGetter( - intValue = 696721361 - ) - static int field4309; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; - @ObfuscatedName("c") + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1281452827 + ) + static int field4363; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lpb;" + descriptor = "Lpz;" ) @Export("datFile") BufferedFile datFile; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1094257697 - ) - @Export("archive") - int archive; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lpb;" + descriptor = "Lpz;" ) @Export("idxFile") BufferedFile idxFile; - @ObfuscatedName("b") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1624557141 + intValue = -54530023 + ) + @Export("archive") + int archive; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -698225049 ) @Export("maxEntrySize") int maxEntrySize; @@ -47,7 +47,7 @@ public final class ArchiveDisk { } @ObfuscatedSignature( - descriptor = "(ILpb;Lpb;I)V" + descriptor = "(ILpz;Lpz;I)V" ) public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { this.datFile = null; // L: 8 @@ -55,14 +55,14 @@ public final class ArchiveDisk { this.maxEntrySize = 65000; // L: 11 this.archive = var1; // L: 14 this.datFile = var2; // L: 15 - this.idxFile = var3; + this.idxFile = var3; // L: 16 this.maxEntrySize = var4; // L: 17 } // L: 18 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IB)[B", - garbageValue = "-3" + garbageValue = "-83" ) @Export("read") public byte[] read(int var1) { @@ -94,7 +94,7 @@ public final class ArchiveDisk { return (byte[])var10000; } - this.datFile.seek(520L * (long)var4); // L: 35 + this.datFile.seek((long)var4 * 520L); // L: 35 int var8 = var3 - var6; // L: 36 int var9; int var10; @@ -107,7 +107,7 @@ public final class ArchiveDisk { } var13 = 10; // L: 44 - this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); // L: 45 + this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); // L: 45 var9 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 46 var10 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8); // L: 47 var11 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16); // L: 48 @@ -118,14 +118,14 @@ public final class ArchiveDisk { } var13 = 8; // L: 53 - this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); // L: 54 + this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); // L: 54 var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); // L: 55 var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 56 var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); // L: 57 var12 = ArchiveDisk_buffer[7] & 255; // L: 58 } - if (var9 == var1 && var7 == var10 && var12 == this.archive) { // L: 60 + if (var9 == var1 && var10 == var7 && var12 == this.archive) { // L: 60 if (var11 >= 0 && (long)var11 <= this.datFile.length() / 520L) { // L: 61 int var14 = var13 + var8; // L: 62 @@ -156,18 +156,18 @@ public final class ArchiveDisk { } } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I[BIB)Z", - garbageValue = "38" + descriptor = "(I[BII)Z", + garbageValue = "-1867257059" ) @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) { - var5 = this.write0(var1, var2, var3, false); // L: 81 + if (!var5) { // L: 81 + var5 = this.write0(var1, var2, var3, false); } return var5; // L: 82 @@ -177,10 +177,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I[BIZI)Z", - garbageValue = "-2063908509" + garbageValue = "-802708417" ) @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { @@ -221,18 +221,18 @@ public final class ArchiveDisk { while (true) { if (var7 < var3) { // L: 111 - label169: { + label170: { int var9 = 0; // L: 112 int var10; if (var4) { // L: 113 - this.datFile.seek((long)var6 * 520L); // L: 114 + this.datFile.seek(520L * (long)var6); // L: 114 int var11; int var12; if (var1 > 65535) { // L: 118 try { this.datFile.read(ArchiveDisk_buffer, 0, 10); // L: 120 } catch (EOFException var17) { // L: 122 - break label169; // L: 123 + break label170; // L: 123 } var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 125 @@ -243,7 +243,7 @@ public final class ArchiveDisk { try { this.datFile.read(ArchiveDisk_buffer, 0, 8); // L: 132 } catch (EOFException var16) { // L: 134 - break label169; // L: 135 + break label170; // L: 135 } var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); // L: 137 @@ -252,7 +252,7 @@ public final class ArchiveDisk { var12 = ArchiveDisk_buffer[7] & 255; // L: 140 } - if (var10 != var1 || var11 != var8 || var12 != this.archive) { // L: 142 + if (var10 != var1 || var8 != var11 || var12 != this.archive) { // L: 142 var10000 = false; return var10000; } @@ -270,7 +270,7 @@ public final class ArchiveDisk { ++var9; } - if (var6 == var9) { // L: 149 + if (var9 == var6) { // L: 149 ++var9; } } @@ -312,7 +312,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 @@ -341,13 +341,4 @@ public final class ArchiveDisk { public String toString() { return "" + this.archive; // L: 198 } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)[Lcv;", - garbageValue = "1346835105" - ) - static class82[] method6935() { - return new class82[]{class82.field1057, class82.field1059, class82.field1055, class82.field1056, class82.field1053}; // L: 16 - } } diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index 653587583a..5c25b1d560 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -4,27 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kz") +@ObfuscatedName("ky") @Implements("ArchiveDiskAction") public class ArchiveDiskAction extends Node { - @ObfuscatedName("v") + @ObfuscatedName("m") + @Export("PcmPlayer_stereo") + protected static boolean PcmPlayer_stereo; + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "Lqd;" + ) + static IndexedSprite field3997; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 502285257 + intValue = 834168287 ) @Export("type") int type; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("data") public byte[] data; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Lnc;" ) @Export("archiveDisk") public ArchiveDisk archiveDisk; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Llx;" + descriptor = "Lle;" ) @Export("archive") public Archive archive; diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index 1b603b6e0d..3e03d5f7a9 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -1,46 +1,45 @@ +import java.io.DataInputStream; +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("lg") +@ObfuscatedName("lf") @Implements("ArchiveDiskActionHandler") public class ArchiveDiskActionHandler implements Runnable { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llv;" ) @Export("ArchiveDiskActionHandler_requestQueue") public static NodeDeque ArchiveDiskActionHandler_requestQueue; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llv;" ) @Export("ArchiveDiskActionHandler_responseQueue") public static NodeDeque ArchiveDiskActionHandler_responseQueue; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1344367175 + intValue = 996764791 ) - public static int field3945; - @ObfuscatedName("f") + static int field3998; + @ObfuscatedName("k") @Export("ArchiveDiskActionHandler_lock") - public static Object ArchiveDiskActionHandler_lock; - @ObfuscatedName("b") - @Export("ArchiveDiskActionHandler_thread") - static Thread ArchiveDiskActionHandler_thread; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lju;" + static Object ArchiveDiskActionHandler_lock; + @ObfuscatedName("nc") + @ObfuscatedGetter( + intValue = 1167654825 ) - @Export("musicTrack") - public static MusicTrack musicTrack; + @Export("selectedSpellWidget") + static int selectedSpellWidget; static { ArchiveDiskActionHandler_requestQueue = new NodeDeque(); // L: 9 ArchiveDiskActionHandler_responseQueue = new NodeDeque(); // L: 10 - field3945 = 0; // L: 11 + field3998 = 0; // L: 11 ArchiveDiskActionHandler_lock = new Object(); } // L: 12 @@ -51,226 +50,162 @@ public class ArchiveDiskActionHandler implements Runnable { try { while (true) { ArchiveDiskAction var1; - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 51 - var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 52 - } // L: 53 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 63 + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 64 + } - if (var1 != null) { // L: 54 - if (var1.type == 0) { // L: 55 - var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 56 - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 57 - var1.remove(); // L: 58 - } // L: 59 - } else if (var1.type == 1) { // L: 61 - var1.data = var1.archiveDisk.read((int)var1.key); // L: 62 - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 63 - ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 64 - } // L: 65 + if (var1 != null) { // L: 66 + if (var1.type == 0) { + var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 68 + synchronized(ArchiveDiskActionHandler_requestQueue) { + var1.remove(); // L: 70 + } // L: 71 + } else if (var1.type == 1) { + var1.data = var1.archiveDisk.read((int)var1.key); + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 75 + ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 76 + } } - synchronized(ArchiveDiskActionHandler_lock) { // L: 67 - if (field3945 <= 1) { // L: 68 - field3945 = 0; // L: 69 - ArchiveDiskActionHandler_lock.notifyAll(); // L: 70 - return; // L: 71 + synchronized(ArchiveDiskActionHandler_lock) { + if (field3998 <= 1) { // L: 80 + field3998 = 0; // L: 81 + ArchiveDiskActionHandler_lock.notifyAll(); + return; // L: 83 } - field3945 = 600; // L: 73 + field3998 = 600; // L: 85 } } else { - class93.method2384(100L); // L: 77 - synchronized(ArchiveDiskActionHandler_lock) { // L: 78 - if (field3945 <= 1) { // L: 79 - field3945 = 0; // L: 80 - ArchiveDiskActionHandler_lock.notifyAll(); // L: 81 - return; // L: 82 + class241.method4815(100L); // L: 89 + synchronized(ArchiveDiskActionHandler_lock) { + if (field3998 <= 1) { + field3998 = 0; + ArchiveDiskActionHandler_lock.notifyAll(); + return; } - --field3945; // L: 84 + --field3998; } } } - } catch (Exception var13) { // L: 89 - Widget.RunException_sendStackTrace((String)null, var13); // L: 90 + } catch (Exception var13) { // L: 101 + RunException_sendStackTrace((String)null, var13); // L: 102 } - } // L: 92 + } // L: 104 - @ObfuscatedName("f") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "-64972529" + descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;B)V", + garbageValue = "9" ) - @Export("ByteArrayPool_getArray") - public static synchronized byte[] ByteArrayPool_getArray(int var0) { - return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 112 + @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 = class427.method7379(var1); + } + + if (var0 != null) { // L: 35 + if (var1 != null) { + var2 = var2 + " | "; + } + + var2 = var2 + var0; + } + + System.out.println("Error: " + var2); // L: 39 + var2 = var2.replace(':', '.'); // L: 40 + var2 = var2.replace('@', '_'); + var2 = var2.replace('&', '_'); // L: 42 + var2 = var2.replace('#', '_'); + if (RunException.RunException_applet == null) { // L: 44 + return; + } + + URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + class385.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + class430.clientType + "&e=" + var2); + DataInputStream var4 = new DataInputStream(var3.openStream()); // L: 46 + var4.read(); + var4.close(); // L: 48 + } catch (Exception var5) { // L: 50 + } + + } } @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lky;I[B[BB)V", - garbageValue = "1" + descriptor = "(Ljava/lang/CharSequence;Lpj;B)Ljava/lang/String;", + garbageValue = "-25" ) - @Export("Widget_setKey") - static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { - if (var0.field3415 == null) { // L: 988 - if (var2 == null) { // L: 989 - return; // L: 995 - } - - var0.field3415 = new byte[11][]; // L: 990 - var0.field3485 = new byte[11][]; // L: 991 - var0.field3417 = new int[11]; // L: 992 - var0.field3418 = new int[11]; // L: 993 - } - - var0.field3415[var1] = var2; // L: 997 - if (var2 != null) { - var0.field3414 = true; // L: 998 + public static String method5612(CharSequence var0, LoginType var1) { + if (var0 == null) { // L: 36 + return null; } else { - var0.field3414 = false; // L: 1000 + int var2 = 0; // L: 37 - for (int var4 = 0; var4 < var0.field3415.length; ++var4) { // L: 1001 - if (var0.field3415[var4] != null) { // L: 1002 - var0.field3414 = true; // L: 1003 - break; // L: 1004 + int var3; + boolean var4; + char var5; + for (var3 = var0.length(); var2 < var3; ++var2) { // L: 38 41 51 + var5 = var0.charAt(var2); // L: 43 + var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; // L: 45 + if (!var4) { // L: 47 + break; } } - } - var0.field3485[var1] = var3; // L: 1008 - } // L: 1009 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-433593353" - ) - public static void method5813() { - class451.SpriteBuffer_xOffsets = null; // L: 239 - class271.SpriteBuffer_yOffsets = null; // L: 240 - class451.SpriteBuffer_spriteWidths = null; // L: 241 - class451.SpriteBuffer_spriteHeights = null; // L: 242 - NetFileRequest.SpriteBuffer_spritePalette = null; // L: 243 - FriendLoginUpdate.SpriteBuffer_pixels = null; // L: 244 - } // L: 245 - - @ObfuscatedName("kv") - @ObfuscatedSignature( - descriptor = "(Lky;IIIB)V", - garbageValue = "-122" - ) - @Export("drawMinimap") - static final void drawMinimap(Widget var0, int var1, int var2, int var3) { - class116.playPcmPlayers(); // L: 12220 - SpriteMask var4 = var0.getSpriteMask(false); // L: 12221 - if (var4 != null) { // L: 12222 - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 12223 - if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 12224 - int var5 = Client.camAngleY & 2047; // L: 12225 - int var6 = GrandExchangeEvents.localPlayer.x / 32 + 48; // L: 12226 - int var7 = 464 - GrandExchangeEvents.localPlayer.y / 32; // L: 12227 - HealthBarUpdate.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 12228 - - int var8; - int var10; - int var16; - for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 12229 - var16 = Client.mapIconXs[var8] * 4 + 2 - GrandExchangeEvents.localPlayer.x / 32; // L: 12230 - var10 = Client.mapIconYs[var8] * 4 + 2 - GrandExchangeEvents.localPlayer.y / 32; // L: 12231 - ReflectionCheck.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); // L: 12232 + while (var3 > var2) { // L: 55 + var5 = var0.charAt(var3 - 1); // L: 57 + var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; // L: 59 + if (!var4) { // L: 61 + break; } - int var11; - int var12; - for (var8 = 0; var8 < 104; ++var8) { // L: 12234 - for (var16 = 0; var16 < 104; ++var16) { // L: 12235 - NodeDeque var14 = Client.groundItems[class18.Client_plane][var8][var16]; // L: 12236 - if (var14 != null) { // L: 12237 - var11 = var8 * 4 + 2 - GrandExchangeEvents.localPlayer.x / 32; // L: 12238 - var12 = var16 * 4 + 2 - GrandExchangeEvents.localPlayer.y / 32; // L: 12239 - ReflectionCheck.drawSpriteOnMinimap(var1, var2, var11, var12, class54.mapDotSprites[0], var4); // L: 12240 - } - } - } - - for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 12244 - NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 12245 - if (var9 != null && var9.isVisible()) { // L: 12246 - NPCComposition var18 = var9.definition; // L: 12247 - if (var18 != null && var18.transforms != null) { // L: 12248 - var18 = var18.transform(); - } - - if (var18 != null && var18.drawMapDot && var18.isInteractable) { // L: 12249 - var11 = var9.x / 32 - GrandExchangeEvents.localPlayer.x / 32; // L: 12250 - var12 = var9.y / 32 - GrandExchangeEvents.localPlayer.y / 32; // L: 12251 - ReflectionCheck.drawSpriteOnMinimap(var1, var2, var11, var12, class54.mapDotSprites[1], var4); // L: 12252 - } - } - } - - var8 = Players.Players_count; // L: 12256 - int[] var17 = Players.Players_indices; // L: 12257 - - for (var10 = 0; var10 < var8; ++var10) { // L: 12258 - Player var15 = Client.players[var17[var10]]; // L: 12259 - if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != GrandExchangeEvents.localPlayer) { // L: 12260 - var12 = var15.x / 32 - GrandExchangeEvents.localPlayer.x / 32; // L: 12261 - int var13 = var15.y / 32 - GrandExchangeEvents.localPlayer.y / 32; // L: 12262 - if (var15.isFriend()) { // L: 12263 - ReflectionCheck.drawSpriteOnMinimap(var1, var2, var12, var13, class54.mapDotSprites[3], var4); - } else if (GrandExchangeEvents.localPlayer.team != 0 && var15.team != 0 && var15.team == GrandExchangeEvents.localPlayer.team) { // L: 12264 - ReflectionCheck.drawSpriteOnMinimap(var1, var2, var12, var13, class54.mapDotSprites[4], var4); - } else if (var15.isFriendsChatMember()) { // L: 12265 - ReflectionCheck.drawSpriteOnMinimap(var1, var2, var12, var13, class54.mapDotSprites[5], var4); - } else if (var15.isClanMember()) { // L: 12266 - ReflectionCheck.drawSpriteOnMinimap(var1, var2, var12, var13, class54.mapDotSprites[6], var4); - } else { - ReflectionCheck.drawSpriteOnMinimap(var1, var2, var12, var13, class54.mapDotSprites[2], var4); // L: 12267 - } - } - } - - if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 12270 - if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 12271 - NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; // L: 12272 - if (var19 != null) { // L: 12273 - var11 = var19.x / 32 - GrandExchangeEvents.localPlayer.x / 32; // L: 12274 - var12 = var19.y / 32 - GrandExchangeEvents.localPlayer.y / 32; // L: 12275 - ReflectionCheck.worldToMinimap(var1, var2, var11, var12, WorldMapLabelSize.mapMarkerSprites[1], var4); // L: 12276 - } - } - - if (Client.hintArrowType == 2) { // L: 12279 - var10 = Client.hintArrowX * 4 - GrandExchangeOfferOwnWorldComparator.baseX * 4 + 2 - GrandExchangeEvents.localPlayer.x / 32; // L: 12280 - var11 = Client.hintArrowY * 4 - VarcInt.baseY * 4 + 2 - GrandExchangeEvents.localPlayer.y / 32; // L: 12281 - ReflectionCheck.worldToMinimap(var1, var2, var10, var11, WorldMapLabelSize.mapMarkerSprites[1], var4); // L: 12282 - } - - if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 12284 - Player var20 = Client.players[Client.hintArrowPlayerIndex]; // L: 12285 - if (var20 != null) { // L: 12286 - var11 = var20.x / 32 - GrandExchangeEvents.localPlayer.x / 32; // L: 12287 - var12 = var20.y / 32 - GrandExchangeEvents.localPlayer.y / 32; // L: 12288 - ReflectionCheck.worldToMinimap(var1, var2, var11, var12, WorldMapLabelSize.mapMarkerSprites[1], var4); // L: 12289 - } - } - } - - if (Client.destinationX != 0) { // L: 12293 - var10 = Client.destinationX * 4 + 2 - GrandExchangeEvents.localPlayer.x / 32; // L: 12294 - var11 = Client.destinationY * 4 + 2 - GrandExchangeEvents.localPlayer.y / 32; // L: 12295 - ReflectionCheck.drawSpriteOnMinimap(var1, var2, var10, var11, WorldMapLabelSize.mapMarkerSprites[0], var4); // L: 12296 - } - - if (!GrandExchangeEvents.localPlayer.isHidden) { // L: 12298 - 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: 12300 + --var3; // L: 65 } - Client.field716[var3] = true; // L: 12301 + int var10 = var3 - var2; // L: 67 + if (var10 >= 1) { // L: 69 + byte var6; + if (var1 == null) { // L: 73 + var6 = 12; // L: 74 + } else { + switch(var1.field4617) { // L: 77 + case 0: + var6 = 20; // L: 82 + break; + default: + var6 = 12; // L: 79 + } + } + + if (var10 <= var6) { // L: 86 + StringBuilder var9 = new StringBuilder(var10); // L: 90 + + for (int var11 = var2; var11 < var3; ++var11) { // L: 91 + char var7 = var0.charAt(var11); // L: 92 + if (BufferedSource.method6702(var7)) { // L: 93 + char var8 = Language.method5877(var7); // L: 94 + if (var8 != 0) { // L: 95 + var9.append(var8); // L: 96 + } + } + } + + if (var9.length() == 0) { // L: 98 + return null; + } + + return var9.toString(); // L: 99 + } + } + + return null; // L: 88 } - } // L: 12302 + } } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index 14bdfd98d8..141bce742e 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -1,40 +1,34 @@ -import java.util.Collections; import 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("ArchiveLoader") public class ArchiveLoader { - @ObfuscatedName("hg") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lhv;" - ) - @Export("scene") - static Scene scene; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Llx;" + descriptor = "Lle;" ) @Export("archive") final Archive archive; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 711415979 + intValue = -404162061 ) @Export("groupCount") final int groupCount; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -905507323 + intValue = -1950157047 ) @Export("loadedCount") int loadedCount; @ObfuscatedSignature( - descriptor = "(Llx;Ljava/lang/String;)V" + descriptor = "(Lle;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { this.loadedCount = 0; // L: 9 @@ -42,17 +36,17 @@ public class ArchiveLoader { this.groupCount = var1.getGroupCount(); // L: 13 } // L: 14 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" + descriptor = "(I)Z", + garbageValue = "-1365376212" ) @Export("isLoaded") boolean isLoaded() { this.loadedCount = 0; // L: 17 for (int var1 = 0; var1 < this.groupCount; ++var1) { // L: 18 - if (!this.archive.method5824(var1) || this.archive.method5814(var1)) { + if (!this.archive.method5634(var1) || this.archive.method5633(var1)) { ++this.loadedCount; // L: 19 } } @@ -60,111 +54,578 @@ public class ArchiveLoader { return this.loadedCount >= this.groupCount; // L: 21 } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([I[II)V", - garbageValue = "-1372726492" + descriptor = "(ILbb;ZB)I", + garbageValue = "-59" ) - public static void method2061(int[] var0, int[] var1) { - if (var0 != null && var1 != null) { // L: 43 - FloorOverlayDefinition.ByteArrayPool_alternativeSizes = var0; // L: 50 - class128.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; // L: 51 - BoundaryObject.ByteArrayPool_arrays = new byte[var0.length][][]; // L: 52 - - for (int var2 = 0; var2 < FloorOverlayDefinition.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 53 - BoundaryObject.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; // L: 54 - ByteArrayPool.field4167.add(var0[var2]); // L: 55 - } - - Collections.sort(ByteArrayPool.field4167); // L: 57 - } else { - FloorOverlayDefinition.ByteArrayPool_alternativeSizes = null; // L: 44 - class128.ByteArrayPool_altSizeArrayCounts = null; // L: 45 - BoundaryObject.ByteArrayPool_arrays = null; // L: 46 - Login.method1960(); // L: 47 - } - } // L: 48 58 - - @ObfuscatedName("gr") - @ObfuscatedSignature( - descriptor = "(Lcz;ZI)V", - garbageValue = "784160741" - ) - @Export("addPlayerToScene") - static void addPlayerToScene(Player var0, boolean var1) { - if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 4782 - var0.isUnanimated = false; // L: 4783 - if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { // L: 4784 4785 - var0.isUnanimated = true; - } - - int var2 = var0.x >> 7; // L: 4787 - int var3 = var0.y >> 7; // L: 4788 - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 4789 - long var4 = GameObject.calculateTag(0, 0, 0, false, var0.index); // L: 4790 - if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 4791 - var0.isUnanimated = false; // L: 4792 - var0.tileHeight = WorldMapLabel.getTileHeight(var0.x, var0.y, class18.Client_plane); // L: 4793 - var0.playerCycle = Client.cycle; // L: 4794 - scene.addNullableObject(class18.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); // L: 4795 + static int method2041(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 1248 + if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1249 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = WorldMapSection1.Widget_unpackTargetMask(UrlRequester.getWidgetFlags(var3)); // L: 1250 + return 1; // L: 1251 + } else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1253 + if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1260 + if (var3.dataText == null) { // L: 1261 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; } else { - if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 4798 - if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 4799 - return; - } + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1262 + } - Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 4800 + return 1; // L: 1263 + } else { + return 2; // L: 1265 + } + } else { + int var4 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1254 + --var4; // L: 1255 + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1256 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1257 + } else { + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; + } + + return 1; // L: 1258 + } + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "664108386" + ) + @Export("hslToRgb") + static final int hslToRgb(int var0, int var1, int var2) { + if (var2 > 179) { // L: 990 + var1 /= 2; + } + + if (var2 > 192) { // L: 991 + var1 /= 2; + } + + if (var2 > 217) { // L: 992 + var1 /= 2; + } + + if (var2 > 243) { // L: 993 + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 994 + return var3; // L: 995 + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(ILbb;ZB)I", + garbageValue = "-74" + ) + static int method2045(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 3500) { // L: 2322 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2323 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = UserComparator8.method2581(var3) ? 1 : 0; // L: 2324 + return 1; // L: 2325 + } else if (var0 == 3501) { // L: 2327 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2328 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = WorldMapAreaData.method4880(var3) ? 1 : 0; // L: 2329 + return 1; // L: 2330 + } else if (var0 == 3502) { // L: 2332 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2333 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class19.method257(var3) ? 1 : 0; // L: 2334 + return 1; // L: 2335 + } else { + return 2; // L: 2337 + } + } + + @ObfuscatedName("fj") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1781905177" + ) + @Export("playPcmPlayers") + static final void playPcmPlayers() { + if (Fonts.pcmPlayer1 != null) { // L: 3757 + Fonts.pcmPlayer1.run(); + } + + if (SecureRandomCallable.pcmPlayer0 != null) { // L: 3758 + SecureRandomCallable.pcmPlayer0.run(); + } + + } // L: 3759 + + @ObfuscatedName("gn") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-440186297" + ) + @Export("drawEntities") + static final void drawEntities(int var0, int var1, int var2, int var3) { + ++Client.viewportDrawCount; // L: 4584 + if (ModelData0.localPlayer.x >> 7 == Client.destinationX && ModelData0.localPlayer.y >> 7 == Client.destinationY) { // L: 4586 + Client.destinationX = 0; // L: 4587 + } + + CollisionMap.method3778(); // L: 4590 + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 4592 + class263.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 4593 + } + + class137.addNpcsToScene(true); // L: 4596 + int var4 = Players.Players_count; // L: 4598 + int[] var5 = Players.Players_indices; // L: 4599 + + int var6; + for (var6 = 0; var6 < var4; ++var6) { // L: 4600 + if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { // L: 4601 + class263.addPlayerToScene(Client.players[var5[var6]], true); // L: 4602 + } + } + + class137.addNpcsToScene(false); // L: 4605 + + for (Projectile var30 = (Projectile)Client.projectiles.last(); var30 != null; var30 = (Projectile)Client.projectiles.previous()) { // L: 4607 4608 4625 + if (var30.plane == class128.Client_plane && Client.cycle <= var30.cycleEnd) { // L: 4609 + if (Client.cycle >= var30.cycleStart) { // L: 4610 + if (var30.targetIndex > 0) { // L: 4611 + NPC var34 = Client.npcs[var30.targetIndex - 1]; // L: 4612 + if (var34 != null && var34.x >= 0 && var34.x < 13312 && var34.y >= 0 && var34.y < 13312) { // L: 4613 + var30.setDestination(var34.x, var34.y, class202.getTileHeight(var34.x, var34.y, var30.plane) - var30.endHeight, Client.cycle); + } } - var0.tileHeight = WorldMapLabel.getTileHeight(var0.x, var0.y, class18.Client_plane); // L: 4802 - var0.playerCycle = Client.cycle; // L: 4803 - scene.drawEntity(class18.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 4804 + if (var30.targetIndex < 0) { // L: 4615 + var6 = -var30.targetIndex - 1; // L: 4617 + Player var35; + if (var6 == Client.localPlayerIndex) { // L: 4618 + var35 = ModelData0.localPlayer; + } else { + var35 = Client.players[var6]; // L: 4619 + } + + if (var35 != null && var35.x >= 0 && var35.x < 13312 && var35.y >= 0 && var35.y < 13312) { // L: 4620 + var30.setDestination(var35.x, var35.y, class202.getTileHeight(var35.x, var35.y, var30.plane) - var30.endHeight, Client.cycle); + } + } + + var30.advance(Client.field727); // L: 4622 + class175.scene.drawEntity(class128.Client_plane, (int)var30.x, (int)var30.y, (int)var30.z, 60, var30, var30.yaw, -1L, false); // L: 4623 + } + } else { + var30.remove(); + } + } + + for (GraphicsObject var37 = (GraphicsObject)Client.graphicsObjects.last(); var37 != null; var37 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 4629 4630 4637 + if (var37.plane == class128.Client_plane && !var37.isFinished) { // L: 4631 + if (Client.cycle >= var37.cycleStart) { // L: 4632 + var37.advance(Client.field727); // L: 4633 + if (var37.isFinished) { // L: 4634 + var37.remove(); + } else { + class175.scene.drawEntity(var37.plane, var37.x, var37.y, var37.z, 60, var37, 0, -1L, false); // L: 4635 + } + } + } else { + var37.remove(); + } + } + + GrandExchangeOfferOwnWorldComparator.setViewportShape(var0, var1, var2, var3, true); // L: 4640 + var0 = Client.viewportOffsetX; // L: 4641 + var1 = Client.viewportOffsetY; // L: 4642 + var2 = Client.viewportWidth; // L: 4643 + var3 = Client.viewportHeight; // L: 4644 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4645 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 4646 + var4 = Client.camAngleX; // L: 4647 + if (Client.field578 / 256 > var4) { // L: 4648 + var4 = Client.field578 / 256; + } + + if (Client.field743[4] && Client.field745[4] + 128 > var4) { // L: 4649 + var4 = Client.field745[4] + 128; + } + + int var31 = Client.camAngleY & 2047; // L: 4650 + User.method6523(HorizontalAlignment.oculusOrbFocalPointX, class140.field1666, class28.oculusOrbFocalPointY, var4, var31, class10.method94(var4), var3); // L: 4651 + int var7; + int var8; + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + int var16; + if (!Client.isCameraLocked) { // L: 4653 + if (class12.clientPreferences.method2222()) { // L: 4656 + var7 = class128.Client_plane; // L: 4657 + } else { + label630: { + var8 = 3; // L: 4660 + if (GameEngine.cameraPitch < 310) { // L: 4661 + label622: { + if (Client.oculusOrbState == 1) { // L: 4664 + var9 = HorizontalAlignment.oculusOrbFocalPointX >> 7; // L: 4665 + var10 = class28.oculusOrbFocalPointY >> 7; // L: 4666 + } else { + var9 = ModelData0.localPlayer.x >> 7; // L: 4669 + var10 = ModelData0.localPlayer.y >> 7; // L: 4670 + } + + var11 = class343.cameraX >> 7; // L: 4672 + var12 = FaceNormal.cameraZ >> 7; // L: 4673 + if (var11 >= 0 && var12 >= 0 && var11 < 104 && var12 < 104) { // L: 4674 + if (var9 >= 0 && var10 >= 0 && var9 < 104 && var10 < 104) { // L: 4678 + if ((Tiles.Tiles_renderFlags[class128.Client_plane][var11][var12] & 4) != 0) { // L: 4682 + var8 = class128.Client_plane; + } + + if (var9 > var11) { // L: 4684 + var13 = var9 - var11; + } else { + var13 = var11 - var9; // L: 4685 + } + + if (var10 > var12) { // L: 4687 + var14 = var10 - var12; + } else { + var14 = var12 - var10; // L: 4688 + } + + int var15; + if (var13 > var14) { // L: 4689 + var15 = var14 * 65536 / var13; // L: 4690 + var16 = 32768; // L: 4691 + + while (true) { + if (var9 == var11) { // L: 4692 + break label622; + } + + if (var11 < var9) { // L: 4693 + ++var11; + } else if (var11 > var9) { // L: 4694 + --var11; + } + + if ((Tiles.Tiles_renderFlags[class128.Client_plane][var11][var12] & 4) != 0) { // L: 4695 + var8 = class128.Client_plane; + } + + var16 += var15; // L: 4696 + if (var16 >= 65536) { // L: 4697 + var16 -= 65536; // L: 4698 + if (var12 < var10) { // L: 4699 + ++var12; + } else if (var12 > var10) { // L: 4700 + --var12; + } + + if ((Tiles.Tiles_renderFlags[class128.Client_plane][var11][var12] & 4) != 0) { // L: 4701 + var8 = class128.Client_plane; + } + } + } + } else { + if (var14 > 0) { // L: 4705 + var15 = var13 * 65536 / var14; // L: 4706 + var16 = 32768; // L: 4707 + + while (var12 != var10) { // L: 4708 + if (var12 < var10) { // L: 4709 + ++var12; + } else if (var12 > var10) { // L: 4710 + --var12; + } + + if ((Tiles.Tiles_renderFlags[class128.Client_plane][var11][var12] & 4) != 0) { // L: 4711 + var8 = class128.Client_plane; + } + + var16 += var15; // L: 4712 + if (var16 >= 65536) { // L: 4713 + var16 -= 65536; // L: 4714 + if (var11 < var9) { // L: 4715 + ++var11; + } else if (var11 > var9) { // L: 4716 + --var11; + } + + if ((Tiles.Tiles_renderFlags[class128.Client_plane][var11][var12] & 4) != 0) { // L: 4717 + var8 = class128.Client_plane; + } + } + } + } + break label622; + } + } + + var7 = class128.Client_plane; // L: 4679 + break label630; // L: 4680 + } + + var7 = class128.Client_plane; // L: 4675 + break label630; // L: 4676 + } + } + + if (ModelData0.localPlayer.x >= 0 && ModelData0.localPlayer.y >= 0 && ModelData0.localPlayer.x < 13312 && ModelData0.localPlayer.y < 13312) { // L: 4722 + if ((Tiles.Tiles_renderFlags[class128.Client_plane][ModelData0.localPlayer.x >> 7][ModelData0.localPlayer.y >> 7] & 4) != 0) { // L: 4726 + var8 = class128.Client_plane; + } + + var7 = var8; // L: 4727 + } else { + var7 = class128.Client_plane; // L: 4723 + } + } + } + + var6 = var7; // L: 4729 + } else { + var6 = class101.method2551(); // L: 4731 + } + + var7 = class343.cameraX; // L: 4732 + var8 = class295.cameraY; // L: 4733 + var9 = FaceNormal.cameraZ; // L: 4734 + var10 = GameEngine.cameraPitch; // L: 4735 + var11 = StudioGame.cameraYaw; // L: 4736 + + for (var12 = 0; var12 < 5; ++var12) { // L: 4737 + if (Client.field743[var12]) { // L: 4738 + var13 = (int)(Math.random() * (double)(Client.field744[var12] * 2 + 1) - (double)Client.field744[var12] + Math.sin((double)Client.field714[var12] / 100.0D * (double)Client.field677[var12]) * (double)Client.field745[var12]); // L: 4739 + if (var12 == 0) { // L: 4740 + class343.cameraX += var13; + } + + if (var12 == 1) { // L: 4741 + class295.cameraY += var13; + } + + if (var12 == 2) { // L: 4742 + FaceNormal.cameraZ += var13; + } + + if (var12 == 3) { // L: 4743 + StudioGame.cameraYaw = var13 + StudioGame.cameraYaw & 2047; + } + + if (var12 == 4) { // L: 4744 + GameEngine.cameraPitch += var13; // L: 4745 + if (GameEngine.cameraPitch < 128) { // L: 4746 + GameEngine.cameraPitch = 128; + } + + if (GameEngine.cameraPitch > 383) { // L: 4747 + GameEngine.cameraPitch = 383; + } } } } - } // L: 4808 + var12 = MouseHandler.MouseHandler_x; // L: 4751 + var13 = MouseHandler.MouseHandler_y; // L: 4752 + if (MouseHandler.MouseHandler_lastButton != 0) { // L: 4753 + var12 = MouseHandler.MouseHandler_lastPressedX; // L: 4754 + var13 = MouseHandler.MouseHandler_lastPressedY; // L: 4755 + } - @ObfuscatedName("ja") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1332589491" - ) - static boolean method2062(int var0) { - for (int var1 = 0; var1 < Client.field731; ++var1) { // L: 11711 - if (Client.field733[var1] == var0) { // L: 11712 - return true; + if (var12 >= var0 && var12 < var0 + var2 && var13 >= var1 && var13 < var3 + var1) { // L: 4757 + class136.method2865(var12 - var0, var13 - var1); // L: 4758 + } else { + ViewportMouse.ViewportMouse_isInViewport = false; // L: 4762 + ViewportMouse.ViewportMouse_entityCount = 0; // L: 4763 + } + + playPcmPlayers(); // L: 4766 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4767 + playPcmPlayers(); // L: 4768 + var14 = Rasterizer3D.Rasterizer3D_zoom; // L: 4769 + Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 4770 + class175.scene.draw(class343.cameraX, class295.cameraY, FaceNormal.cameraZ, GameEngine.cameraPitch, StudioGame.cameraYaw, var6); // L: 4771 + Rasterizer3D.Rasterizer3D_zoom = var14; // L: 4772 + playPcmPlayers(); // L: 4773 + class175.scene.clearTempGameObjects(); // L: 4774 + Client.overheadTextCount = 0; // L: 4776 + boolean var36 = false; // L: 4777 + var16 = -1; // L: 4778 + int var17 = -1; // L: 4779 + int var18 = Players.Players_count; // L: 4780 + int[] var19 = Players.Players_indices; // L: 4781 + + int var20; + for (var20 = 0; var20 < var18 + Client.npcCount; ++var20) { // L: 4782 + Object var33; + if (var20 < var18) { // L: 4784 + var33 = Client.players[var19[var20]]; // L: 4785 + if (var19[var20] == Client.combatTargetPlayerIndex) { // L: 4786 + var36 = true; // L: 4787 + var16 = var20; // L: 4788 + continue; + } + + if (var33 == ModelData0.localPlayer) { // L: 4791 + var17 = var20; // L: 4792 + continue; // L: 4793 + } + } else { + var33 = Client.npcs[Client.npcIndices[var20 - var18]]; // L: 4796 + } + + Client.drawActor2d((Actor)var33, var20, var0, var1, var2, var3); // L: 4797 + } + + if (Client.renderSelf && var17 != -1) { // L: 4799 + Client.drawActor2d(ModelData0.localPlayer, var17, var0, var1, var2, var3); // L: 4800 + } + + if (var36) { // L: 4802 + Client.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var16, var0, var1, var2, var3); // L: 4803 + } + + for (var20 = 0; var20 < Client.overheadTextCount; ++var20) { // L: 4805 + int var21 = Client.overheadTextXs[var20]; // L: 4806 + int var22 = Client.overheadTextYs[var20]; // L: 4807 + int var23 = Client.overheadTextXOffsets[var20]; // L: 4808 + int var24 = Client.overheadTextAscents[var20]; // L: 4809 + boolean var25 = true; // L: 4810 + + while (var25) { + var25 = false; // L: 4812 + + for (int var32 = 0; var32 < var20; ++var32) { // L: 4813 + if (var22 + 2 > Client.overheadTextYs[var32] - Client.overheadTextAscents[var32] && var22 - var24 < Client.overheadTextYs[var32] + 2 && var21 - var23 < Client.overheadTextXOffsets[var32] + Client.overheadTextXs[var32] && var21 + var23 > Client.overheadTextXs[var32] - Client.overheadTextXOffsets[var32] && Client.overheadTextYs[var32] - Client.overheadTextAscents[var32] < var22) { // L: 4814 4815 + var22 = Client.overheadTextYs[var32] - Client.overheadTextAscents[var32]; // L: 4816 + var25 = true; // L: 4817 + } + } + } + + Client.viewportTempX = Client.overheadTextXs[var20]; // L: 4822 + Client.viewportTempY = Client.overheadTextYs[var20] = var22; // L: 4823 + String var26 = Client.overheadText[var20]; // L: 4824 + if (Client.chatEffects == 0) { // L: 4825 + int var27 = 16776960; // L: 4826 + if (Client.overheadTextColors[var20] < 6) { // L: 4827 + var27 = Client.field769[Client.overheadTextColors[var20]]; + } + + if (Client.overheadTextColors[var20] == 6) { // L: 4828 + var27 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; + } + + if (Client.overheadTextColors[var20] == 7) { // L: 4829 + var27 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; + } + + if (Client.overheadTextColors[var20] == 8) { // L: 4830 + var27 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; + } + + int var28; + if (Client.overheadTextColors[var20] == 9) { // L: 4831 + var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 4832 + if (var28 < 50) { // L: 4833 + var27 = var28 * 1280 + 16711680; + } else if (var28 < 100) { // L: 4834 + var27 = 16776960 - (var28 - 50) * 327680; + } else if (var28 < 150) { // L: 4835 + var27 = (var28 - 100) * 5 + 65280; + } + } + + if (Client.overheadTextColors[var20] == 10) { // L: 4837 + var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 4838 + if (var28 < 50) { // L: 4839 + var27 = var28 * 5 + 16711680; + } else if (var28 < 100) { // L: 4840 + var27 = 16711935 - (var28 - 50) * 327680; + } else if (var28 < 150) { // L: 4841 + var27 = (var28 - 100) * 327680 + 255 - (var28 - 100) * 5; + } + } + + if (Client.overheadTextColors[var20] == 11) { // L: 4843 + var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 4844 + if (var28 < 50) { // L: 4845 + var27 = 16777215 - var28 * 327685; + } else if (var28 < 100) { // L: 4846 + var27 = (var28 - 50) * 327685 + 65280; + } else if (var28 < 150) { + var27 = 16777215 - (var28 - 100) * 327680; // L: 4847 + } + } + + if (Client.overheadTextEffects[var20] == 0) { // L: 4849 + ChatChannel.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0); + } + + if (Client.overheadTextEffects[var20] == 1) { // L: 4850 + ChatChannel.fontBold12.drawCenteredWave(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var20] == 2) { // L: 4851 + ChatChannel.fontBold12.drawCenteredWave2(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var20] == 3) { // L: 4852 + ChatChannel.fontBold12.drawCenteredShake(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var20]); + } + + if (Client.overheadTextEffects[var20] == 4) { // L: 4853 + var28 = (150 - Client.overheadTextCyclesRemaining[var20]) * (ChatChannel.fontBold12.stringWidth(var26) + 100) / 150; // L: 4854 + Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 4855 + ChatChannel.fontBold12.draw(var26, var0 + Client.viewportTempX + 50 - var28, Client.viewportTempY + var1, var27, 0); // L: 4856 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4857 + } + + if (Client.overheadTextEffects[var20] == 5) { // L: 4859 + var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 4860 + int var29 = 0; // L: 4861 + if (var28 < 25) { // L: 4862 + var29 = var28 - 25; + } else if (var28 > 125) { // L: 4863 + var29 = var28 - 125; + } + + Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - ChatChannel.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 4864 + ChatChannel.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, var29 + Client.viewportTempY + var1, var27, 0); // L: 4865 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4866 + } + } else { + ChatChannel.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 4870 } } - return false; // L: 11714 - } - - @ObfuscatedName("ls") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)Ljava/lang/String;", - garbageValue = "-1401650476" - ) - static String method2063(String var0, boolean var1) { - String var2 = var1 ? "https://" : "http://"; // L: 12488 - if (Client.gameBuild == 1) { // L: 12489 - var0 = var0 + "-wtrc"; - } else if (Client.gameBuild == 2) { // L: 12490 - var0 = var0 + "-wtqa"; - } else if (Client.gameBuild == 3) { // L: 12491 - var0 = var0 + "-wtwip"; - } else if (Client.gameBuild == 5) { // L: 12492 - var0 = var0 + "-wti"; - } else if (Client.gameBuild == 4) { // L: 12493 - var0 = "local"; + if (Client.hintArrowType == 2) { // L: 4875 + AbstractWorldMapIcon.worldToScreen((Client.hintArrowX - SecureRandomCallable.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - GrandExchangeOfferOwnWorldComparator.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4876 + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4877 + class21.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + } } - String var3 = ""; // L: 12494 - if (class65.field868 != null) { // L: 12495 - var3 = "/p=" + class65.field868; + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field727); // L: 4879 + class360.method6393(); // L: 4881 + class343.cameraX = var7; // L: 4883 + class295.cameraY = var8; // L: 4884 + FaceNormal.cameraZ = var9; // L: 4885 + GameEngine.cameraPitch = var10; // L: 4886 + StudioGame.cameraYaw = var11; // L: 4887 + if (Client.isLoading && HealthBarUpdate.method2181(true, false) == 0) { // L: 4888 + Client.isLoading = false; } - String var4 = "runescape.com"; // L: 12496 - return var2 + var0 + "." + var4 + "/l=" + Skills.clientLanguage + "/a=" + GrandExchangeOfferOwnWorldComparator.field483 + var3 + "/"; // L: 12497 - } + if (Client.isLoading) { // L: 4889 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4890 + class259.drawLoadingMessage("Loading - please wait.", false); // L: 4891 + } + + } // L: 4893 } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index db56969e88..b476e2dca7 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -4,73 +4,97 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cn") +@ObfuscatedName("cq") @Implements("AttackOption") public enum AttackOption implements MouseWheel { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lcn;" + descriptor = "Lcq;" ) @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lcn;" + descriptor = "Lcq;" ) @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lcn;" + descriptor = "Lcq;" ) - field1257(2), - @ObfuscatedName("f") + field1285(2), + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lcn;" + descriptor = "Lcq;" ) @Export("AttackOption_hidden") AttackOption_hidden(3), - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lcn;" + descriptor = "Lcq;" ) - field1263(4); + field1283(4); - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - @Export("ItemDefinition_modelArchive") - static AbstractArchive ItemDefinition_modelArchive; - @ObfuscatedName("t") + @ObfuscatedName("fn") @ObfuscatedGetter( - intValue = -2042861585 + intValue = 1045451155 ) - static int field1255; - @ObfuscatedName("ct") - @ObfuscatedSignature( - descriptor = "Lqq;" - ) - @Export("worldSelectRightSprite") - static IndexedSprite worldSelectRightSprite; - @ObfuscatedName("n") + static int field1290; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -887019937 + intValue = 1694685345 ) @Export("id") final int id; AttackOption(int var3) { - this.id = var3; // L: 12684 - } // L: 12685 + this.id = var3; // L: 12733 + } // L: 12734 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 12688 + return this.id; // L: 12738 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "-59" + ) + public static int method2401(int var0, int var1) { + int var2; + for (var2 = 1; var1 > 1; var1 >>= 1) { // L: 24 25 28 + if ((var1 & 1) != 0) { // L: 26 + var2 = var0 * var2; + } + + var0 *= var0; // L: 27 + } + + if (var1 == 1) { // L: 30 + return var0 * var2; + } else { + return var2; // L: 31 + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lpt;ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1761568873" + ) + static String method2393(IterableNodeHashTable var0, int var1, String var2) { + if (var0 == null) { // L: 41 + return var2; + } else { + ObjectNode var3 = (ObjectNode)var0.get((long)var1); // L: 42 + return var3 == null ? var2 : (String)var3.obj; // L: 43 44 + } } } diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index 01d670daca..11be3d41ad 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -3,154 +3,154 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aa") +@ObfuscatedName("ba") @Implements("AudioFilter") public class AudioFilter { - @ObfuscatedName("n") - static float[][] field407; - @ObfuscatedName("s") + @ObfuscatedName("m") + static float[][] field410; + @ObfuscatedName("p") @Export("coefficients") static int[][] coefficients; - @ObfuscatedName("l") - static float field409; - @ObfuscatedName("q") + @ObfuscatedName("s") + static float field417; + @ObfuscatedName("r") @Export("forwardMultiplier") static int forwardMultiplier; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("pairs") int[] pairs; - @ObfuscatedName("i") - int[][][] field412; - @ObfuscatedName("f") - int[][][] field402; - @ObfuscatedName("b") - int[] field413; + @ObfuscatedName("l") + int[][][] field415; + @ObfuscatedName("k") + int[][][] field413; + @ObfuscatedName("a") + int[] field412; static { - field407 = new float[2][8]; // L: 13 + field410 = new float[2][8]; // L: 13 coefficients = new int[2][8]; // L: 14 } AudioFilter() { this.pairs = new int[2]; // L: 8 - this.field412 = new int[2][2][4]; // L: 10 - this.field402 = new int[2][2][4]; // L: 11 - this.field413 = new int[2]; // L: 12 + this.field415 = new int[2][2][4]; // L: 10 + this.field413 = new int[2][2][4]; // L: 11 + this.field412 = new int[2]; // L: 12 } // L: 21 - @ObfuscatedName("v") - float method1040(int var1, int var2, float var3) { - float var4 = (float)this.field402[var1][0][var2] + var3 * (float)(this.field402[var1][1][var2] - this.field402[var1][0][var2]); // L: 24 + @ObfuscatedName("o") + float method1042(int var1, int var2, float var3) { + float var4 = (float)this.field413[var1][0][var2] + var3 * (float)(this.field413[var1][1][var2] - this.field413[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("i") - float method1056(int var1, int var2, float var3) { - float var4 = (float)this.field412[var1][0][var2] + var3 * (float)(this.field412[var1][1][var2] - this.field412[var1][0][var2]); // L: 35 + @ObfuscatedName("l") + float method1040(int var1, int var2, float var3) { + float var4 = (float)this.field415[var1][0][var2] + var3 * (float)(this.field415[var1][1][var2] - this.field415[var1][0][var2]); // L: 35 var4 *= 1.2207031E-4F; // L: 36 return normalize(var4); // L: 37 } - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("compute") int compute(int var1, float var2) { float var3; if (var1 == 0) { // L: 41 - var3 = (float)this.field413[0] + (float)(this.field413[1] - this.field413[0]) * var2; // L: 42 + var3 = (float)this.field412[0] + (float)(this.field412[1] - this.field412[0]) * var2; // L: 42 var3 *= 0.0030517578F; // L: 43 - field409 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44 - forwardMultiplier = (int)(field409 * 65536.0F); // L: 45 + field417 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44 + forwardMultiplier = (int)(field417 * 65536.0F); // L: 45 } if (this.pairs[var1] == 0) { // L: 47 return 0; } else { - var3 = this.method1040(var1, 0, var2); // L: 48 - field407[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1056(var1, 0, var2)); // L: 49 - field407[var1][1] = var3 * var3; // L: 50 + var3 = this.method1042(var1, 0, var2); // L: 48 + field410[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1040(var1, 0, var2)); // L: 49 + field410[var1][1] = var3 * var3; // L: 50 float[] var10000; int var4; for (var4 = 1; var4 < this.pairs[var1]; ++var4) { // L: 51 - var3 = this.method1040(var1, var4, var2); // L: 52 - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1056(var1, var4, var2)); // L: 53 + var3 = this.method1042(var1, var4, var2); // L: 52 + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1040(var1, var4, var2)); // L: 53 float var6 = var3 * var3; // L: 54 - field407[var1][var4 * 2 + 1] = field407[var1][var4 * 2 - 1] * var6; // L: 55 - field407[var1][var4 * 2] = field407[var1][var4 * 2 - 1] * var5 + field407[var1][var4 * 2 - 2] * var6; // L: 56 + field410[var1][var4 * 2 + 1] = field410[var1][var4 * 2 - 1] * var6; // L: 55 + field410[var1][var4 * 2] = field410[var1][var4 * 2 - 1] * var5 + field410[var1][var4 * 2 - 2] * var6; // L: 56 for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { // L: 57 - var10000 = field407[var1]; - var10000[var7] += field407[var1][var7 - 1] * var5 + field407[var1][var7 - 2] * var6; + var10000 = field410[var1]; + var10000[var7] += field410[var1][var7 - 1] * var5 + field410[var1][var7 - 2] * var6; } - var10000 = field407[var1]; // L: 58 - var10000[1] += field407[var1][0] * var5 + var6; - var10000 = field407[var1]; // L: 59 + var10000 = field410[var1]; // L: 58 + var10000[1] += field410[var1][0] * var5 + var6; + var10000 = field410[var1]; // L: 59 var10000[0] += var5; } if (var1 == 0) { // L: 61 for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - var10000 = field407[0]; - var10000[var4] *= field409; + var10000 = field410[0]; + var10000[var4] *= field417; } } for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { // L: 62 - coefficients[var1][var4] = (int)(field407[var1][var4] * 65536.0F); + coefficients[var1][var4] = (int)(field410[var1][var4] * 65536.0F); } return this.pairs[var1] * 2; // L: 63 } } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lpi;Lag;)V" + descriptor = "(Lpx;Laq;)V" ) final void method1044(Buffer var1, SoundEnvelope var2) { int var3 = var1.readUnsignedByte(); // L: 67 this.pairs[0] = var3 >> 4; // L: 68 this.pairs[1] = var3 & 15; // L: 69 if (var3 != 0) { // L: 70 - this.field413[0] = var1.readUnsignedShort(); // L: 71 - this.field413[1] = var1.readUnsignedShort(); // L: 72 + this.field412[0] = var1.readUnsignedShort(); // L: 71 + this.field412[1] = var1.readUnsignedShort(); // L: 72 int var7 = var1.readUnsignedByte(); // L: 73 int var5; int var6; for (var5 = 0; var5 < 2; ++var5) { // L: 74 for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 75 - this.field412[var5][0][var6] = var1.readUnsignedShort(); // L: 76 - this.field402[var5][0][var6] = var1.readUnsignedShort(); // L: 77 + this.field415[var5][0][var6] = var1.readUnsignedShort(); // L: 76 + this.field413[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.field412[var5][1][var6] = var1.readUnsignedShort(); // L: 83 - this.field402[var5][1][var6] = var1.readUnsignedShort(); // L: 84 + this.field415[var5][1][var6] = var1.readUnsignedShort(); // L: 83 + this.field413[var5][1][var6] = var1.readUnsignedShort(); // L: 84 } else { - this.field412[var5][1][var6] = this.field412[var5][0][var6]; // L: 87 - this.field402[var5][1][var6] = this.field402[var5][0][var6]; // L: 88 + this.field415[var5][1][var6] = this.field415[var5][0][var6]; // L: 87 + this.field413[var5][1][var6] = this.field413[var5][0][var6]; // L: 88 } } } - if (var7 != 0 || this.field413[1] != this.field413[0]) { // L: 92 + if (var7 != 0 || this.field412[1] != this.field412[0]) { // L: 92 var2.decodeSegments(var1); } } else { - int[] var4 = this.field413; // L: 95 - this.field413[1] = 0; // L: 96 + int[] var4 = this.field412; // L: 95 + this.field412[1] = 0; // L: 96 var4[0] = 0; // L: 97 } } // L: 99 - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("normalize") static float normalize(float var0) { float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); // L: 30 diff --git a/runescape-client/src/main/java/BZip2Decompressor.java b/runescape-client/src/main/java/BZip2Decompressor.java index 74607fc8c0..693b9aee3f 100644 --- a/runescape-client/src/main/java/BZip2Decompressor.java +++ b/runescape-client/src/main/java/BZip2Decompressor.java @@ -3,12 +3,12 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pm") +@ObfuscatedName("ph") @Implements("BZip2Decompressor") public final class BZip2Decompressor { - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lpr;" + descriptor = "Lpy;" ) @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; @@ -17,7 +17,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state = new BZip2State(); // L: 13 } - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("BZip2Decompressor_decompress") public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) { synchronized(BZip2Decompressor_state) { // L: 20 @@ -29,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.field4636 = 0; // L: 29 + BZip2Decompressor_state.field4715 = 0; // L: 29 BZip2Decompressor_decompress(BZip2Decompressor_state); // L: 30 var1 -= BZip2Decompressor_state.outputLength; // L: 31 BZip2Decompressor_state.inputArray = null; // L: 32 @@ -38,21 +38,21 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lpr;)V" + descriptor = "(Lpy;)V" ) - static void method7902(BZip2State var0) { + static void method7758(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 = GrandExchangeOffer.BZip2Decompressor_block; // L: 44 - int var7 = var0.field4643; // L: 45 + int[] var6 = class6.BZip2Decompressor_block; // L: 44 + int var7 = var0.field4714; // L: 45 byte[] var8 = var0.outputArray; // L: 46 int var9 = var0.next_out; // L: 47 int var10 = var0.outputLength; // L: 48 - int var12 = var0.field4661 + 1; // L: 50 + int var12 = var0.field4720 + 1; // L: 50 label70: while (true) { @@ -148,25 +148,25 @@ public final class BZip2Decompressor { break; // L: 73 } - int var13 = var0.field4636; // L: 133 - var0.field4636 += var10 - var10; // L: 134 - if (var0.field4636 < var13) { // L: 135 + int var13 = var0.field4715; // L: 133 + var0.field4715 += var10 - var10; // L: 134 + if (var0.field4715 < 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 - GrandExchangeOffer.BZip2Decompressor_block = var6; // L: 140 - var0.field4643 = var7; // L: 141 + class6.BZip2Decompressor_block = var6; // L: 140 + var0.field4714 = var7; // L: 141 var0.outputArray = var8; // L: 142 var0.next_out = var9; // L: 143 var0.outputLength = var10; // L: 144 } // L: 145 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpr;)V" + descriptor = "(Lpy;)V" ) @Export("BZip2Decompressor_decompress") static void BZip2Decompressor_decompress(BZip2State var0) { @@ -192,9 +192,9 @@ public final class BZip2Decompressor { int[] var23 = null; // L: 170 int[] var24 = null; // L: 171 int[] var25 = null; // L: 172 - var0.blockSize100k = -1776360451; // L: 173 - if (GrandExchangeOffer.BZip2Decompressor_block == null) { // L: 174 - GrandExchangeOffer.BZip2Decompressor_block = new int[var0.blockSize100k * -2059250912]; + var0.blockSize100k = 1097769777; // L: 173 + if (class6.BZip2Decompressor_block == null) { // L: 174 + class6.BZip2Decompressor_block = new int[var0.blockSize100k * -1117648736]; } boolean var26 = true; // L: 175 @@ -430,7 +430,7 @@ public final class BZip2Decompressor { } var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; // L: 396 - GrandExchangeOffer.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397 + class6.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397 ++var47; // L: 398 if (var45 == 0) { // L: 399 ++var43; // L: 400 @@ -489,7 +489,7 @@ public final class BZip2Decompressor { var10000 = var0.unzftab; // L: 332 for (var10000[var1 & 255] += var48; var48 > 0; --var48) { // L: 333 336 - GrandExchangeOffer.BZip2Decompressor_block[var47] = var1 & 255; // L: 334 + class6.BZip2Decompressor_block[var47] = var1 & 255; // L: 334 ++var47; // L: 335 } } @@ -509,22 +509,22 @@ public final class BZip2Decompressor { } for (var36 = 0; var36 < var47; ++var36) { // L: 426 - var1 = (byte)(GrandExchangeOffer.BZip2Decompressor_block[var36] & 255); // L: 427 - var10000 = GrandExchangeOffer.BZip2Decompressor_block; // L: 428 + var1 = (byte)(class6.BZip2Decompressor_block[var36] & 255); // L: 427 + var10000 = class6.BZip2Decompressor_block; // L: 428 int var10001 = var0.cftab[var1 & 255]; var10000[var10001] |= var36 << 8; var10002 = var0.cftab[var1 & 255]++; // L: 429 } - var0.field4643 = GrandExchangeOffer.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431 + var0.field4714 = class6.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431 var0.nblocks_used = 0; // L: 432 - var0.field4643 = GrandExchangeOffer.BZip2Decompressor_block[var0.field4643]; // L: 433 - var0.su_ch2 = (byte)(var0.field4643 & 255); // L: 434 - var0.field4643 >>= 8; // L: 436 + var0.field4714 = class6.BZip2Decompressor_block[var0.field4714]; // L: 433 + var0.su_ch2 = (byte)(var0.field4714 & 255); // L: 434 + var0.field4714 >>= 8; // L: 436 ++var0.nblocks_used; // L: 437 - var0.field4661 = var47; // L: 438 - method7902(var0); // L: 439 - if (var0.field4661 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440 + var0.field4720 = var47; // L: 438 + method7758(var0); // L: 439 + if (var0.field4720 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440 var26 = true; break; } @@ -538,27 +538,27 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lpr;)B" + descriptor = "(Lpy;)B" ) @Export("BZip2Decompressor_readNextByte") static byte BZip2Decompressor_readNextByte(BZip2State var0) { return (byte)BZip2Decompressor_readBits(8, var0); // L: 447 } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lpr;)B" + descriptor = "(Lpy;)B" ) @Export("BZip2Decompressor_readNextBit") static byte BZip2Decompressor_readNextBit(BZip2State var0) { return (byte)BZip2Decompressor_readBits(1, var0); // L: 451 } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(ILpr;)I" + descriptor = "(ILpy;)I" ) @Export("BZip2Decompressor_readBits") static int BZip2Decompressor_readBits(int var0, BZip2State var1) { @@ -576,9 +576,9 @@ public final class BZip2Decompressor { return var2; // L: 460 } - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lpr;)V" + descriptor = "(Lpy;)V" ) @Export("makeMaps") static void makeMaps(BZip2State var0) { @@ -593,7 +593,7 @@ public final class BZip2Decompressor { } // L: 479 - @ObfuscatedName("l") + @ObfuscatedName("s") @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 472b949c14..7b56544237 100644 --- a/runescape-client/src/main/java/BZip2State.java +++ b/runescape-client/src/main/java/BZip2State.java @@ -3,169 +3,164 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("pr") +@ObfuscatedName("py") @Implements("BZip2State") public final class BZip2State { - @ObfuscatedName("sg") - @ObfuscatedGetter( - intValue = -1129469843 - ) - static int field4662; - @ObfuscatedName("v") - final int field4655; - @ObfuscatedName("c") - final int field4627; - @ObfuscatedName("i") - final int field4626; - @ObfuscatedName("f") - final int field4633; - @ObfuscatedName("b") - final int field4628; - @ObfuscatedName("n") - final int field4634; - @ObfuscatedName("s") + @ObfuscatedName("o") + final int field4689; + @ObfuscatedName("q") + final int field4684; + @ObfuscatedName("l") + final int field4685; + @ObfuscatedName("k") + final int field4702; + @ObfuscatedName("a") + final int field4687; + @ObfuscatedName("m") + final int field4688; + @ObfuscatedName("p") @Export("inputArray") byte[] inputArray; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1322812601 + intValue = -1006289449 ) @Export("nextByte") int nextByte; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -430087741 + intValue = 213678345 ) @Export("nextBit_unused") int nextBit_unused; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("outputArray") byte[] outputArray; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -175215317 + intValue = -230908601 ) @Export("next_out") int next_out; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1039446447 + intValue = 2001230231 ) @Export("outputLength") int outputLength; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1120084063 + intValue = 541649199 ) - int field4636; - @ObfuscatedName("k") + int field4715; + @ObfuscatedName("b") @Export("out_char") byte out_char; - @ObfuscatedName("d") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 18493607 + intValue = -540019141 ) @Export("su_rNToGo") int su_rNToGo; - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -837008917 + intValue = 790421793 ) @Export("bsBuff") int bsBuff; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -694773855 + intValue = -1354808017 ) @Export("bsLive") int bsLive; - @ObfuscatedName("t") + @ObfuscatedName("n") @Export("blockSize100k") int blockSize100k; - @ObfuscatedName("g") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 482261833 + intValue = 1115223461 ) @Export("originalPointer") int originalPointer; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1004484133 + intValue = 888729529 ) - int field4643; - @ObfuscatedName("a") + int field4714; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1457960971 + intValue = 1393554365 ) @Export("su_ch2") int su_ch2; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("unzftab") int[] unzftab; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 2064048971 + intValue = 1338159051 ) @Export("nblocks_used") int nblocks_used; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("cftab") int[] cftab; - @ObfuscatedName("h") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 180562183 + intValue = -1217769335 ) @Export("nInUse") int nInUse; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("inUse") boolean[] inUse; - @ObfuscatedName("aq") + @ObfuscatedName("ar") @Export("inUse16") boolean[] inUse16; - @ObfuscatedName("aw") + @ObfuscatedName("am") @Export("seqToUnseq") byte[] seqToUnseq; - @ObfuscatedName("am") + @ObfuscatedName("ac") @Export("ll8") byte[] ll8; - @ObfuscatedName("ak") + @ObfuscatedName("ab") @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; - @ObfuscatedName("ao") + @ObfuscatedName("aj") @Export("selector") byte[] selector; - @ObfuscatedName("aj") + @ObfuscatedName("ae") @Export("selectorMtf") byte[] selectorMtf; - @ObfuscatedName("al") + @ObfuscatedName("az") @Export("temp_charArray2d") byte[][] temp_charArray2d; - @ObfuscatedName("av") + @ObfuscatedName("ap") @Export("limit") int[][] limit; - @ObfuscatedName("at") + @ObfuscatedName("as") @Export("base") int[][] base; - @ObfuscatedName("an") + @ObfuscatedName("au") @Export("perm") int[][] perm; - @ObfuscatedName("ay") + @ObfuscatedName("ak") @Export("minLens") int[] minLens; - @ObfuscatedName("ag") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -1169026527 + intValue = -412410727 ) - int field4661; + int field4720; BZip2State() { - this.field4655 = 4096; // L: 4 - this.field4627 = 16; // L: 5 - this.field4626 = 258; // L: 6 - this.field4633 = 6; // L: 7 - this.field4628 = 50; // L: 8 - this.field4634 = 18002; // L: 9 + this.field4689 = 4096; // L: 4 + this.field4684 = 16; // L: 5 + this.field4685 = 258; // L: 6 + this.field4702 = 6; // L: 7 + this.field4687 = 50; // L: 8 + this.field4688 = 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 4825f7ab32..c13f09eafc 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -4,63 +4,60 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ij") +@ObfuscatedName("hc") @Implements("BoundaryObject") public final class BoundaryObject { - @ObfuscatedName("g") - @Export("ByteArrayPool_arrays") - static byte[][][] ByteArrayPool_arrays; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1523942229 + intValue = 1657313425 ) @Export("z") int z; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -361735633 + intValue = -1880399519 ) @Export("x") int x; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 436509427 + intValue = -1024241781 ) @Export("y") int y; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1245875017 + intValue = 291661833 ) @Export("orientationA") int orientationA; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1804141061 + intValue = -40246503 ) @Export("orientationB") int orientationB; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Lgx;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Lgx;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - longValue = -3781054410051402755L + longValue = 5476522096528305987L ) @Export("tag") public long tag; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 2053587143 + intValue = -214248861 ) @Export("flags") int flags; diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index 9233b0598f..23e6dfa3ce 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nm") +@ObfuscatedName("ne") @Implements("Bounds") public class Bounds { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1496433009 + intValue = -2084018151 ) @Export("lowX") public int lowX; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1348899275 + intValue = 1161874723 ) @Export("lowY") public int lowY; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 2132855023 + intValue = -1792451045 ) @Export("highX") public int highX; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1258662357 + intValue = -347299673 ) @Export("highY") public int highY; @@ -35,16 +35,16 @@ public class Bounds { public Bounds(int var1, int var2, int var3, int var4) { this.setLow(var1, var2); // L: 14 this.setHigh(var3, var4); // L: 15 - } + } // L: 16 public Bounds(int var1, int var2) { this(0, 0, var1, var2); // L: 10 } // L: 11 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "691768070" + descriptor = "(IIB)V", + garbageValue = "76" ) @Export("setLow") public void setLow(int var1, int var2) { @@ -52,10 +52,10 @@ public class Bounds { this.lowY = var2; // L: 20 } // L: 21 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1684494436" + garbageValue = "-2014864213" ) @Export("setHigh") public void setHigh(int var1, int var2) { @@ -63,40 +63,40 @@ public class Bounds { this.highY = var2; // L: 25 } // L: 26 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "2065555787" + garbageValue = "1837557842" ) - public boolean method6944(int var1, int var2) { - return var1 >= this.lowX && var1 < this.lowX + this.highX && var2 >= this.lowY && var2 < this.highY + this.lowY; // L: 29 + public boolean method6742(int var1, int var2) { + return var1 >= this.lowX && var1 < this.highX + this.lowX && var2 >= this.lowY && var2 < this.lowY + this.highY; // L: 29 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lnm;Lnm;I)V", - garbageValue = "1872281468" + descriptor = "(Lne;Lne;I)V", + garbageValue = "683766141" ) - public void method6945(Bounds var1, Bounds var2) { - this.method6946(var1, var2); // L: 37 - this.method6947(var1, var2); // L: 38 + public void method6758(Bounds var1, Bounds var2) { + this.method6739(var1, var2); // L: 37 + this.method6746(var1, var2); // L: 38 } // L: 39 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lnm;Lnm;S)V", - garbageValue = "3154" + descriptor = "(Lne;Lne;B)V", + garbageValue = "-80" ) - void method6946(Bounds var1, Bounds var2) { + void method6739(Bounds var1, Bounds var2) { var2.lowX = this.lowX; // L: 42 var2.highX = this.highX; // L: 43 if (this.lowX < var1.lowX) { // L: 44 - var2.highX = (var2.highX * 1363895823 - (var1.lowX * 1363895823 - this.lowX * 1363895823)) * 2132855023; // L: 45 + var2.highX = (var2.highX * -1176876013 - (var1.lowX * -1176876013 - this.lowX * -1176876013)) * -1792451045; // L: 45 var2.lowX = var1.lowX; // L: 46 } - if (var2.method6965() > var1.method6965()) { // L: 48 - var2.highX -= var2.method6965() - var1.method6965(); // L: 49 + if (var2.method6747() > var1.method6747()) { // L: 48 + var2.highX -= var2.method6747() - var1.method6747(); // L: 49 } if (var2.highX < 0) { // L: 51 @@ -105,21 +105,21 @@ public class Bounds { } // L: 52 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lnm;Lnm;B)V", - garbageValue = "0" + descriptor = "(Lne;Lne;B)V", + garbageValue = "83" ) - void method6947(Bounds var1, Bounds var2) { + void method6746(Bounds var1, Bounds var2) { var2.lowY = this.lowY; // L: 55 var2.highY = this.highY; // L: 56 if (this.lowY < var1.lowY) { // L: 57 - var2.highY = (var2.highY * 446318461 - (var1.lowY * 446318461 - this.lowY * 446318461)) * 1258662357; // L: 58 + var2.highY = (var2.highY * -1533081833 - (var1.lowY * -1533081833 - this.lowY * -1533081833)) * -347299673; // L: 58 var2.lowY = var1.lowY; // L: 59 } - if (var2.method6949() > var1.method6949()) { // L: 61 - var2.highY -= var2.method6949() - var1.method6949(); // L: 62 + if (var2.method6745() > var1.method6745()) { // L: 61 + var2.highY -= var2.method6745() - var1.method6745(); // L: 62 } if (var2.highY < 0) { // L: 64 @@ -128,33 +128,25 @@ public class Bounds { } // L: 65 - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "44" - ) - int method6965() { - return this.highX + this.lowX; // L: 68 - } - - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1934877561" + garbageValue = "1397499342" ) - int method6949() { - return this.highY + this.lowY; // L: 72 + int method6747() { + return this.lowX + this.highX; // L: 68 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1908652212" + ) + int method6745() { + return this.lowY + this.highY; // L: 72 } public String toString() { return null; // L: 33 } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Lln;I)V", - garbageValue = "1725122550" - ) - public static void method6969(AbstractArchive var0) { - } // L: 16 } diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index d3ee3ab041..9cad1d1246 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -4,24 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nf") +@ObfuscatedName("ns") @Implements("Buddy") public class Buddy extends User { - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1194347475 + intValue = 1598252079 ) @Export("world") public int world; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1261040891 + intValue = 960063137 ) @Export("int2") public int int2; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1639181057 + intValue = -497613841 ) @Export("rank") public int rank; @@ -30,10 +30,10 @@ public class Buddy extends User { this.world = -1; // L: 4 } // L: 8 - @ObfuscatedName("ay") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-7" + descriptor = "(III)V", + garbageValue = "-1257664324" ) @Export("set") void set(int var1, int var2) { @@ -41,20 +41,20 @@ public class Buddy extends User { this.int2 = var2; // L: 12 } // L: 13 - @ObfuscatedName("ag") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "49" + descriptor = "(I)I", + garbageValue = "975020511" ) @Export("getWorld") public int getWorld() { return this.world; // L: 16 } - @ObfuscatedName("ah") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2071809224" + descriptor = "(B)Z", + garbageValue = "-87" ) @Export("hasWorld") public boolean hasWorld() { diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java index 3fdbf0e3f0..bd49888e6f 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -1,12 +1,24 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("dx") @Implements("BuddyRankComparator") public class BuddyRankComparator extends AbstractUserComparator { - @ObfuscatedName("v") + @ObfuscatedName("mk") + @ObfuscatedGetter( + intValue = 1073207223 + ) + @Export("menuX") + static int menuX; + @ObfuscatedName("pi") + @ObfuscatedSignature( + descriptor = "[Lki;" + ) + static Widget[] field1408; + @ObfuscatedName("o") @Export("reversed") final boolean reversed; @@ -14,10 +26,10 @@ public class BuddyRankComparator extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnf;Lnf;I)I", - garbageValue = "-2004445607" + descriptor = "(Lns;Lns;I)I", + garbageValue = "84512734" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -29,25 +41,16 @@ public class BuddyRankComparator extends AbstractUserComparator { } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;ZI)[B", - garbageValue = "606932016" + descriptor = "(I)[Ljg;", + garbageValue = "-369068324" ) - public static byte[] method2633(Object var0, boolean var1) { - if (var0 == null) { // L: 21 - return null; - } else if (var0 instanceof byte[]) { // L: 22 - byte[] var3 = (byte[])((byte[])var0); // L: 23 - return var1 ? SoundSystem.method764(var3) : var3; // L: 24 - } else if (var0 instanceof AbstractByteArrayCopier) { // L: 27 - AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 28 - return var2.get(); // L: 29 - } else { - throw new IllegalArgumentException(); // L: 31 - } + @Export("ServerPacket_values") + public static ServerPacket[] ServerPacket_values() { + return new ServerPacket[]{ServerPacket.field3166, ServerPacket.field3085, ServerPacket.field3152, ServerPacket.field3087, ServerPacket.field3088, ServerPacket.field3170, ServerPacket.field3090, ServerPacket.field3179, ServerPacket.field3149, ServerPacket.field3140, ServerPacket.field3093, ServerPacket.field3112, ServerPacket.field3096, ServerPacket.field3092, ServerPacket.field3089, ServerPacket.field3099, ServerPacket.field3100, ServerPacket.field3101, ServerPacket.field3102, ServerPacket.field3103, ServerPacket.field3187, ServerPacket.field3105, ServerPacket.field3106, ServerPacket.field3107, ServerPacket.field3108, ServerPacket.field3109, ServerPacket.field3139, ServerPacket.field3111, ServerPacket.field3182, ServerPacket.field3084, ServerPacket.field3183, ServerPacket.field3115, ServerPacket.field3091, ServerPacket.field3117, ServerPacket.field3118, ServerPacket.field3119, ServerPacket.field3120, ServerPacket.field3121, ServerPacket.field3122, ServerPacket.field3123, ServerPacket.field3161, ServerPacket.field3125, ServerPacket.field3124, ServerPacket.field3127, ServerPacket.field3154, ServerPacket.field3129, ServerPacket.field3130, ServerPacket.field3131, ServerPacket.field3188, ServerPacket.field3133, ServerPacket.field3142, ServerPacket.field3110, ServerPacket.field3114, ServerPacket.field3137, ServerPacket.field3094, ServerPacket.field3190, ServerPacket.field3126, ServerPacket.field3141, ServerPacket.field3180, ServerPacket.field3143, ServerPacket.field3144, ServerPacket.field3153, ServerPacket.field3146, ServerPacket.field3116, ServerPacket.field3148, ServerPacket.field3097, ServerPacket.field3150, ServerPacket.field3151, ServerPacket.field3134, ServerPacket.field3147, ServerPacket.field3162, ServerPacket.field3155, ServerPacket.field3156, ServerPacket.field3157, ServerPacket.field3158, ServerPacket.field3159, ServerPacket.field3160, ServerPacket.field3098, ServerPacket.field3113, ServerPacket.field3163, ServerPacket.field3164, ServerPacket.field3165, ServerPacket.field3104, ServerPacket.field3167, ServerPacket.field3168, ServerPacket.field3169, ServerPacket.field3135, ServerPacket.field3171, ServerPacket.field3172, ServerPacket.field3173, ServerPacket.field3174, ServerPacket.field3175, ServerPacket.field3176, ServerPacket.field3177, ServerPacket.field3132, ServerPacket.field3086, ServerPacket.field3145, ServerPacket.field3181, ServerPacket.field3095, ServerPacket.field3186, ServerPacket.field3184, ServerPacket.field3185, ServerPacket.field3178, ServerPacket.field3136}; // L: 113 } } diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index 23068f4902..3a938a334d 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -5,21 +5,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pi") +@ObfuscatedName("px") @Implements("Buffer") public class Buffer extends Node { - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("crc32Table") static int[] crc32Table; - @ObfuscatedName("p") + @ObfuscatedName("c") @Export("crc64Table") static long[] crc64Table; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("array") public byte[] array; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -546512181 + intValue = -271291039 ) @Export("offset") public int offset; @@ -48,7 +48,7 @@ public class Buffer extends Node { long var0 = (long)var2; // L: 37 for (int var3 = 0; var3 < 8; ++var3) { // L: 38 - if ((var0 & 1L) == 1L) { // L: 39 + if (1L == (var0 & 1L)) { // L: 39 var0 = var0 >>> 1 ^ -3932672073523589310L; } else { var0 >>>= 1; // L: 40 @@ -61,1040 +61,1079 @@ public class Buffer extends Node { } // L: 44 public Buffer(int var1) { - this.array = ArchiveDiskActionHandler.ByteArrayPool_getArray(var1); // L: 56 - this.offset = 0; // L: 57 - } // L: 58 + this.array = class116.ByteArrayPool_getArray(var1); // L: 60 + this.offset = 0; // L: 61 + } // L: 62 public Buffer(byte[] var1) { - this.array = var1; // L: 61 - this.offset = 0; // L: 62 - } // L: 63 + this.array = var1; // L: 65 + this.offset = 0; // L: 66 + } // L: 67 - @ObfuscatedName("ag") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "1135524166" ) @Export("releaseArray") public void releaseArray() { - if (this.array != null) { // L: 66 - UserComparator10.ByteArrayPool_release(this.array); + if (this.array != null) { // L: 70 + class168.ByteArrayPool_release(this.array); } - this.array = null; // L: 67 - } // L: 68 + this.array = null; // L: 71 + } // L: 72 - @ObfuscatedName("ah") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1544678095" + descriptor = "(IS)V", + garbageValue = "-14279" ) @Export("writeByte") public void writeByte(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 71 - } // L: 72 - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1590048829" - ) - @Export("writeShort") - public void writeShort(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 75 - this.array[++this.offset - 1] = (byte)var1; // L: 76 - } // L: 77 - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1263357679" - ) - @Export("writeMedium") - public void writeMedium(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 80 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 81 - this.array[++this.offset - 1] = (byte)var1; // L: 82 - } // L: 83 - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "88" - ) - @Export("writeInt") - public void writeInt(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 86 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 87 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 88 - this.array[++this.offset - 1] = (byte)var1; // L: 89 - } // L: 90 - - @ObfuscatedName("af") - @Export("writeLongMedium") - public void writeLongMedium(long var1) { - this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 93 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 94 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 95 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 96 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 97 - this.array[++this.offset - 1] = (byte)((int)var1); // L: 98 - } // L: 99 - - @ObfuscatedName("ad") - @Export("writeLong") - public void writeLong(long var1) { - this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); // L: 102 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 48)); // L: 103 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 104 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 105 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 106 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 107 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 108 - this.array[++this.offset - 1] = (byte)((int)var1); // L: 109 - } // L: 110 + this.array[++this.offset - 1] = (byte)var1; // L: 75 + } // L: 76 @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-903291935" + descriptor = "(IB)V", + garbageValue = "106" ) - @Export("writeBoolean") - public void writeBoolean(boolean var1) { - this.writeByte(var1 ? 1 : 0); // L: 113 - } // L: 114 + @Export("writeShort") + public void writeShort(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 79 + this.array[++this.offset - 1] = (byte)var1; // L: 80 + } // L: 81 - @ObfuscatedName("ar") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-90" + descriptor = "(II)V", + garbageValue = "2051138228" ) - @Export("writeStringCp1252NullTerminated") - public void writeStringCp1252NullTerminated(String var1) { - int var2 = var1.indexOf(0); // L: 121 - if (var2 >= 0) { // L: 122 - throw new IllegalArgumentException(""); - } else { - this.offset += class101.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 123 - this.array[++this.offset - 1] = 0; // L: 124 - } - } // L: 125 - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1893718137" - ) - @Export("writeStringCp1252NullCircumfixed") - public void writeStringCp1252NullCircumfixed(String var1) { - int var2 = var1.indexOf(0); // L: 128 - if (var2 >= 0) { // L: 129 - throw new IllegalArgumentException(""); - } else { - this.array[++this.offset - 1] = 0; // L: 130 - this.offset += class101.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 131 - this.array[++this.offset - 1] = 0; // L: 132 - } - } // L: 133 - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)V", - garbageValue = "-1267419989" - ) - @Export("writeCESU8") - public void writeCESU8(CharSequence var1) { - int var3 = var1.length(); // L: 138 - int var4 = 0; // L: 139 - - for (int var5 = 0; var5 < var3; ++var5) { // L: 140 - char var6 = var1.charAt(var5); // L: 141 - if (var6 <= 127) { // L: 142 - ++var4; - } else if (var6 <= 2047) { // L: 143 - var4 += 2; - } else { - var4 += 3; // L: 144 - } - } - - this.array[++this.offset - 1] = 0; // L: 149 - this.writeVarInt(var4); // L: 150 - this.offset += class163.method3321(this.array, this.offset, var1); // L: 151 - } // L: 152 - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "-80" - ) - @Export("writeBytes") - public void writeBytes(byte[] var1, int var2, int var3) { - for (int var4 = var2; var4 < var3 + var2; ++var4) { // L: 155 - this.array[++this.offset - 1] = var1[var4]; - } - - } // L: 156 + @Export("writeMedium") + public void writeMedium(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 84 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 85 + this.array[++this.offset - 1] = (byte)var1; // L: 86 + } // L: 87 @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-2134475265" - ) - public void method7668(Buffer var1) { - this.writeBytes(var1.array, 0, var1.offset); // L: 159 - } // L: 160 - - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "62076396" - ) - @Export("writeLengthInt") - public void writeLengthInt(int var1) { - if (var1 < 0) { // L: 163 - throw new IllegalArgumentException(); // L: 164 - } else { - this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); // L: 166 - this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); // L: 167 - this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 168 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 169 - } - } // L: 170 - - @ObfuscatedName("bm") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "100" + garbageValue = "-28" ) - @Export("writeLengthShort") - public void writeLengthShort(int var1) { - if (var1 >= 0 && var1 <= 65535) { // L: 173 - this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 176 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 177 - } else { - throw new IllegalArgumentException(); // L: 174 - } - } // L: 178 + @Export("writeInt") + public void writeInt(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 90 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 91 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 92 + this.array[++this.offset - 1] = (byte)var1; // L: 93 + } // L: 94 + + @ObfuscatedName("ax") + @Export("writeLongMedium") + public void writeLongMedium(long var1) { + this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 97 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 98 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 99 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 100 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 101 + this.array[++this.offset - 1] = (byte)((int)var1); // L: 102 + } // L: 103 + + @ObfuscatedName("at") + @Export("writeLong") + public void writeLong(long var1) { + this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); // L: 106 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 48)); // L: 107 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 108 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 109 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 110 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 111 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 112 + this.array[++this.offset - 1] = (byte)((int)var1); // L: 113 + } // L: 114 @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "853951489" + descriptor = "(ZB)V", + garbageValue = "88" ) - public void method7774(int var1) { - if (var1 >= 0 && var1 <= 255) { // L: 181 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 184 - } else { - throw new IllegalArgumentException(); // L: 182 - } - } // L: 185 + @Export("writeBoolean") + public void writeBoolean(boolean var1) { + this.writeByte(var1 ? 1 : 0); // L: 117 + } // L: 118 @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "343524965" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "43" ) - @Export("writeSmartByteShort") - public void writeSmartByteShort(int var1) { - if (var1 >= 0 && var1 < 128) { // L: 188 - this.writeByte(var1); // L: 189 - } else if (var1 >= 0 && var1 < 32768) { // L: 192 - this.writeShort(var1 + 32768); // L: 193 + @Export("writeStringCp1252NullTerminated") + public void writeStringCp1252NullTerminated(String var1) { + int var2 = var1.indexOf(0); // L: 125 + if (var2 >= 0) { // L: 126 + throw new IllegalArgumentException(""); } else { - throw new IllegalArgumentException(); // L: 196 + this.offset += class194.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 127 + this.array[++this.offset - 1] = 0; // L: 128 } - } // L: 190 194 + } // L: 129 @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(IB)V", + descriptor = "(Ljava/lang/String;B)V", garbageValue = "1" ) - @Export("writeVarInt") - public void writeVarInt(int var1) { - if ((var1 & -128) != 0) { // L: 200 - if ((var1 & -16384) != 0) { // L: 201 - if ((var1 & -2097152) != 0) { // L: 202 - if ((var1 & -268435456) != 0) { // L: 203 - this.writeByte(var1 >>> 28 | 128); - } - - this.writeByte(var1 >>> 21 | 128); // L: 204 - } - - this.writeByte(var1 >>> 14 | 128); // L: 206 - } - - this.writeByte(var1 >>> 7 | 128); // L: 208 + @Export("writeStringCp1252NullCircumfixed") + public void writeStringCp1252NullCircumfixed(String var1) { + int var2 = var1.indexOf(0); // L: 132 + if (var2 >= 0) { // L: 133 + throw new IllegalArgumentException(""); + } else { + this.array[++this.offset - 1] = 0; // L: 134 + this.offset += class194.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 135 + this.array[++this.offset - 1] = 0; // L: 136 } - - this.writeByte(var1 & 127); // L: 210 - } // L: 211 - - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1994981915" - ) - @Export("readUnsignedByte") - public int readUnsignedByte() { - return this.array[++this.offset - 1] & 255; // L: 214 - } - - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "-1736471016" - ) - @Export("readByte") - public byte readByte() { - return this.array[++this.offset - 1]; // L: 218 - } - - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "7" - ) - @Export("readUnsignedShort") - public int readUnsignedShort() { - this.offset += 2; // L: 222 - return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 223 - } - - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1776803608" - ) - @Export("readShort") - public int readShort() { - this.offset += 2; // L: 227 - int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 228 - if (var1 > 32767) { // L: 229 - var1 -= 65536; - } - - return var1; // L: 230 - } - - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-858402285" - ) - @Export("readMedium") - public int readMedium() { - this.offset += 3; // L: 234 - return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 235 - } - - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "464100313" - ) - @Export("readInt") - public int readInt() { - this.offset += 4; // L: 239 - 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: 240 - } - - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "(B)J", - garbageValue = "-124" - ) - @Export("readLong") - public long readLong() { - long var1 = (long)this.readInt() & 4294967295L; // L: 244 - long var3 = (long)this.readInt() & 4294967295L; // L: 245 - return var3 + (var1 << 32); // L: 246 - } - - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "(B)F", - garbageValue = "116" - ) - public float method7681() { - return Float.intBitsToFloat(this.readInt()); // L: 250 - } - - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "-14486" - ) - @Export("readBoolean") - public boolean readBoolean() { - return (this.readUnsignedByte() & 1) == 1; // L: 254 - } + } // L: 137 @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "758249077" + descriptor = "(Ljava/lang/CharSequence;I)V", + garbageValue = "2009878537" ) - @Export("readStringCp1252NullTerminatedOrNull") - public String readStringCp1252NullTerminatedOrNull() { - if (this.array[this.offset] == 0) { // L: 258 - ++this.offset; // L: 259 - return null; // L: 260 - } else { - return this.readStringCp1252NullTerminated(); // L: 262 - } - } + @Export("writeCESU8") + public void writeCESU8(CharSequence var1) { + int var3 = var1.length(); // L: 142 + int var4 = 0; // L: 143 - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "355305426" - ) - @Export("readStringCp1252NullTerminated") - public String readStringCp1252NullTerminated() { - int var1 = this.offset; // L: 266 - - while (this.array[++this.offset - 1] != 0) { // L: 267 - } - - int var2 = this.offset - var1 - 1; // L: 268 - return var2 == 0 ? "" : class118.decodeStringCp1252(this.array, var1, var2); // L: 269 270 - } - - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1425609826" - ) - @Export("readStringCp1252NullCircumfixed") - public String readStringCp1252NullCircumfixed() { - byte var1 = this.array[++this.offset - 1]; // L: 274 - if (var1 != 0) { // L: 275 - throw new IllegalStateException(""); - } else { - int var2 = this.offset; // L: 276 - - while (this.array[++this.offset - 1] != 0) { // L: 277 + int var5; + for (var5 = 0; var5 < var3; ++var5) { // L: 144 + char var12 = var1.charAt(var5); // L: 145 + if (var12 <= 127) { // L: 146 + ++var4; + } else if (var12 <= 2047) { // L: 147 + var4 += 2; + } else { + var4 += 3; // L: 148 } - - int var3 = this.offset - var2 - 1; // L: 278 - return var3 == 0 ? "" : class118.decodeStringCp1252(this.array, var2, var3); // L: 279 280 } - } + + this.array[++this.offset - 1] = 0; // L: 153 + this.writeVarInt(var4); // L: 154 + var4 = this.offset * -2117273951; // L: 155 + byte[] var6 = this.array; // L: 157 + int var7 = this.offset; // L: 158 + int var8 = var1.length(); // L: 160 + int var9 = var7; // L: 161 + + for (int var10 = 0; var10 < var8; ++var10) { // L: 162 + char var11 = var1.charAt(var10); // L: 163 + if (var11 <= 127) { // L: 164 + var6[var9++] = (byte)var11; // L: 165 + } else if (var11 <= 2047) { // L: 167 + var6[var9++] = (byte)(192 | var11 >> 6); // L: 168 + var6[var9++] = (byte)(128 | var11 & '?'); // L: 169 + } else { + var6[var9++] = (byte)(224 | var11 >> '\f'); // L: 172 + var6[var9++] = (byte)(128 | var11 >> 6 & 63); // L: 173 + var6[var9++] = (byte)(128 | var11 & '?'); // L: 174 + } + } + + var5 = var9 - var7; // L: 177 + this.offset = (var5 * -2117273951 + var4) * -271291039; // L: 179 + } // L: 180 + + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "([BIII)V", + garbageValue = "-1941001293" + ) + @Export("writeBytes") + public void writeBytes(byte[] var1, int var2, int var3) { + for (int var4 = var2; var4 < var3 + var2; ++var4) { // L: 183 + this.array[++this.offset - 1] = var1[var4]; + } + + } // L: 184 @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-365286290" + descriptor = "(Lpx;B)V", + garbageValue = "-95" ) - @Export("readCESU8") - public String readCESU8() { - byte var1 = this.array[++this.offset - 1]; // L: 284 - if (var1 != 0) { // L: 285 - throw new IllegalStateException(""); - } else { - int var2 = this.readVarInt(); // L: 286 - if (var2 + this.offset > this.array.length) { // L: 287 - throw new IllegalStateException(""); - } else { - byte[] var4 = this.array; // L: 289 - int var5 = this.offset; // L: 290 - char[] var6 = new char[var2]; // L: 292 - int var7 = 0; // L: 293 - int var8 = var5; // L: 294 + public void method7530(Buffer var1) { + this.writeBytes(var1.array, 0, var1.offset); // L: 187 + } // L: 188 - int var11; - for (int var9 = var5 + var2; var8 < var9; var6[var7++] = (char)var11) { // L: 295 296 327 - int var10 = var4[var8++] & 255; // L: 297 - if (var10 < 128) { // L: 299 - if (var10 == 0) { // L: 300 - var11 = 65533; - } else { - var11 = var10; // L: 301 - } - } else if (var10 < 192) { // L: 303 - var11 = 65533; - } else if (var10 < 224) { // L: 304 - if (var8 < var9 && (var4[var8] & 192) == 128) { // L: 305 - var11 = (var10 & 31) << 6 | var4[var8++] & 63; // L: 306 - if (var11 < 128) { // L: 307 - var11 = 65533; - } - } else { - var11 = 65533; // L: 309 - } - } else if (var10 < 240) { // L: 311 - if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { // L: 312 - var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 313 - if (var11 < 2048) { // L: 314 - var11 = 65533; - } - } else { - var11 = 65533; // L: 316 - } - } else if (var10 < 248) { // L: 318 - if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { // L: 319 - var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 320 - if (var11 >= 65536 && var11 <= 1114111) { // L: 321 - var11 = 65533; // L: 322 - } else { - var11 = 65533; - } - } else { - var11 = 65533; // L: 324 - } - } else { - var11 = 65533; // L: 326 + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "36" + ) + @Export("writeLengthInt") + public void writeLengthInt(int var1) { + if (var1 < 0) { // L: 191 + throw new IllegalArgumentException(); // L: 192 + } else { + this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); // L: 194 + this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); // L: 195 + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 196 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 197 + } + } // L: 198 + + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "22" + ) + @Export("writeLengthShort") + public void writeLengthShort(int var1) { + if (var1 >= 0 && var1 <= 65535) { // L: 201 + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 204 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 205 + } else { + throw new IllegalArgumentException(); // L: 202 + } + } // L: 206 + + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "2069892482" + ) + public void method7740(int var1) { + if (var1 >= 0 && var1 <= 255) { // L: 209 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 212 + } else { + throw new IllegalArgumentException(); // L: 210 + } + } // L: 213 + + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-2057774028" + ) + @Export("writeSmartByteShort") + public void writeSmartByteShort(int var1) { + if (var1 >= 0 && var1 < 128) { // L: 216 + this.writeByte(var1); // L: 217 + } else if (var1 >= 0 && var1 < 32768) { // L: 220 + this.writeShort(var1 + 32768); // L: 221 + } else { + throw new IllegalArgumentException(); // L: 224 + } + } // L: 218 222 + + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1356313085" + ) + @Export("writeVarInt") + public void writeVarInt(int var1) { + if ((var1 & -128) != 0) { // L: 228 + if ((var1 & -16384) != 0) { // L: 229 + if ((var1 & -2097152) != 0) { // L: 230 + if ((var1 & -268435456) != 0) { // L: 231 + this.writeByte(var1 >>> 28 | 128); } + + this.writeByte(var1 >>> 21 | 128); // L: 232 } - String var3 = new String(var6, 0, var7); // L: 329 - this.offset += var2; // L: 332 - return var3; // L: 333 + this.writeByte(var1 >>> 14 | 128); // L: 234 } - } - } - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "686872158" - ) - @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: 337 + this.writeByte(var1 >>> 7 | 128); // L: 236 } - } // L: 338 + this.writeByte(var1 & 127); // L: 238 + } // L: 239 - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" - ) - @Export("readShortSmart") - public int readShortSmart() { - int var1 = this.array[this.offset] & 255; // L: 341 - return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 342 343 - } - - @ObfuscatedName("bi") + @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2128397658" + garbageValue = "1732070682" ) - @Export("readUShortSmart") - public int readUShortSmart() { - int var1 = this.array[this.offset] & 255; // L: 347 - return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 348 349 + @Export("readUnsignedByte") + public int readUnsignedByte() { + return this.array[++this.offset - 1] & 255; // L: 242 } @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "(I)B", + garbageValue = "438739223" + ) + @Export("readByte") + public byte readByte() { + return this.array[++this.offset - 1]; // L: 246 + } + + @ObfuscatedName("bq") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "47" ) - public int method7743() { - int var1 = 0; // L: 353 + @Export("readUnsignedShort") + public int readUnsignedShort() { + this.offset += 2; // L: 250 + return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 251 + } - int var2; - for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 354 355 357 - var1 += 32767; // L: 356 + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "17" + ) + @Export("readShort") + public int readShort() { + this.offset += 2; // L: 255 + int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 256 + if (var1 > 32767) { // L: 257 + var1 -= 65536; } - var1 += var2; // L: 359 - return var1; // L: 360 + return var1; // L: 258 } - @ObfuscatedName("bz") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-701209540" + descriptor = "(B)I", + garbageValue = "66" ) - public int method7758() { - return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 364 365 + @Export("readMedium") + public int readMedium() { + this.offset += 3; // L: 262 + return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 263 } - @ObfuscatedName("bv") + @ObfuscatedName("bm") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2072600495" + garbageValue = "-1472148837" ) - public int method7692() { - if (this.array[this.offset] < 0) { // L: 369 - return this.readInt() & Integer.MAX_VALUE; + @Export("readInt") + public int readInt() { + this.offset += 4; // L: 267 + 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: 268 + } + + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "(I)J", + garbageValue = "207582901" + ) + @Export("readLong") + public long readLong() { + long var1 = (long)this.readInt() & 4294967295L; // L: 272 + long var3 = (long)this.readInt() & 4294967295L; // L: 273 + return (var1 << 32) + var3; // L: 274 + } + + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "(B)F", + garbageValue = "47" + ) + public float method7570() { + return Float.intBitsToFloat(this.readInt()); // L: 278 + } + + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1840829970" + ) + @Export("readBoolean") + public boolean readBoolean() { + return (this.readUnsignedByte() & 1) == 1; // L: 282 + } + + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-593040508" + ) + @Export("readStringCp1252NullTerminatedOrNull") + public String readStringCp1252NullTerminatedOrNull() { + if (this.array[this.offset] == 0) { // L: 286 + ++this.offset; // L: 287 + return null; // L: 288 } else { - int var1 = this.readUnsignedShort(); // L: 370 - return var1 == 32767 ? -1 : var1; // L: 371 + return this.readStringCp1252NullTerminated(); // L: 290 } } + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1081385068" + ) + @Export("readStringCp1252NullTerminated") + public String readStringCp1252NullTerminated() { + int var1 = this.offset; // L: 294 + + while (this.array[++this.offset - 1] != 0) { // L: 295 + } + + int var2 = this.offset - var1 - 1; // L: 296 + return var2 == 0 ? "" : EnumComposition.decodeStringCp1252(this.array, var1, var2); // L: 297 298 + } + + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-1" + ) + @Export("readStringCp1252NullCircumfixed") + public String readStringCp1252NullCircumfixed() { + byte var1 = this.array[++this.offset - 1]; // L: 302 + if (var1 != 0) { // L: 303 + throw new IllegalStateException(""); + } else { + int var2 = this.offset; // L: 304 + + while (this.array[++this.offset - 1] != 0) { // L: 305 + } + + int var3 = this.offset - var2 - 1; // L: 306 + return var3 == 0 ? "" : EnumComposition.decodeStringCp1252(this.array, var2, var3); // L: 307 308 + } + } + + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "824150460" + ) + @Export("readCESU8") + public String readCESU8() { + byte var1 = this.array[++this.offset - 1]; // L: 312 + if (var1 != 0) { // L: 313 + throw new IllegalStateException(""); + } else { + int var2 = this.readVarInt(); // L: 314 + if (var2 + this.offset > this.array.length) { // L: 315 + throw new IllegalStateException(""); + } else { + byte[] var4 = this.array; // L: 317 + int var5 = this.offset; // L: 318 + char[] var6 = new char[var2]; // L: 320 + int var7 = 0; // L: 321 + int var8 = var5; // L: 322 + + int var11; + for (int var9 = var5 + var2; var8 < var9; var6[var7++] = (char)var11) { // L: 323 324 355 + int var10 = var4[var8++] & 255; // L: 325 + if (var10 < 128) { // L: 327 + if (var10 == 0) { // L: 328 + var11 = 65533; + } else { + var11 = var10; // L: 329 + } + } else if (var10 < 192) { // L: 331 + var11 = 65533; + } else if (var10 < 224) { // L: 332 + if (var8 < var9 && (var4[var8] & 192) == 128) { // L: 333 + var11 = (var10 & 31) << 6 | var4[var8++] & 63; // L: 334 + if (var11 < 128) { // L: 335 + var11 = 65533; + } + } else { + var11 = 65533; // L: 337 + } + } else if (var10 < 240) { // L: 339 + if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { // L: 340 + var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 341 + if (var11 < 2048) { // L: 342 + var11 = 65533; + } + } else { + var11 = 65533; // L: 344 + } + } else if (var10 < 248) { // L: 346 + if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { // L: 347 + var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 348 + if (var11 >= 65536 && var11 <= 1114111) { // L: 349 + var11 = 65533; // L: 350 + } else { + var11 = 65533; + } + } else { + var11 = 65533; // L: 352 + } + } else { + var11 = 65533; // L: 354 + } + } + + String var3 = new String(var6, 0, var7); // L: 357 + this.offset += var2; // L: 360 + return var3; // L: 361 + } + } + } + + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "([BIII)V", + garbageValue = "2112522108" + ) + @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: 365 + } + + } // L: 366 + + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1489286544" + ) + @Export("readShortSmart") + public int readShortSmart() { + int var1 = this.array[this.offset] & 255; // L: 369 + return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 370 371 + } + + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-467639247" + ) + @Export("readUShortSmart") + public int readUShortSmart() { + int var1 = this.array[this.offset] & 255; // L: 375 + return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 376 377 + } + @ObfuscatedName("cm") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "511637186" + garbageValue = "-1361013085" ) - @Export("readVarInt") - public int readVarInt() { - byte var1 = this.array[++this.offset - 1]; // L: 376 + public int method7531() { + int var1 = 0; // L: 381 int var2; - for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 377 378 380 - var2 = (var2 | var1 & 127) << 7; // L: 379 + for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 382 383 385 + var1 += 32767; // L: 384 } - return var2 | var1; // L: 382 + var1 += var2; // L: 387 + return var1; // L: 388 } - @ObfuscatedName("cc") - @ObfuscatedSignature( - descriptor = "([IB)V", - garbageValue = "90" - ) - @Export("xteaEncryptAll") - public void xteaEncryptAll(int[] var1) { - int var2 = this.offset / 8; // L: 386 - this.offset = 0; // L: 387 - - for (int var3 = 0; var3 < var2; ++var3) { // L: 388 - int var4 = this.readInt(); // L: 389 - int var5 = this.readInt(); // L: 390 - int var6 = 0; // L: 391 - int var7 = -1640531527; // L: 392 - - for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 393 394 397 - var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 395 - var6 += var7; // L: 396 - } - - this.offset -= 8; // L: 399 - this.writeInt(var4); // L: 400 - this.writeInt(var5); // L: 401 - } - - } // L: 403 - - @ObfuscatedName("ch") - @ObfuscatedSignature( - descriptor = "([II)V", - garbageValue = "-693426643" - ) - @Export("xteaDecryptAll") - public void xteaDecryptAll(int[] var1) { - int var2 = this.offset / 8; // L: 406 - this.offset = 0; // L: 407 - - for (int var3 = 0; var3 < var2; ++var3) { // L: 408 - int var4 = this.readInt(); // L: 409 - int var5 = this.readInt(); // L: 410 - int var6 = -957401312; // L: 411 - int var7 = -1640531527; // L: 412 - - for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 413 414 417 - var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 415 - var6 -= var7; // L: 416 - } - - this.offset -= 8; // L: 419 - this.writeInt(var4); // L: 420 - this.writeInt(var5); // L: 421 - } - - } // L: 423 - - @ObfuscatedName("cf") - @ObfuscatedSignature( - descriptor = "([IIII)V", - garbageValue = "1422040268" - ) - @Export("xteaEncrypt") - public void xteaEncrypt(int[] var1, int var2, int var3) { - int var4 = this.offset; // L: 426 - this.offset = var2; // L: 427 - int var5 = (var3 - var2) / 8; // L: 428 - - for (int var6 = 0; var6 < var5; ++var6) { // L: 429 - int var7 = this.readInt(); // L: 430 - int var8 = this.readInt(); // L: 431 - int var9 = 0; // L: 432 - int var10 = -1640531527; // L: 433 - - for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 434 435 438 - var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 436 - var9 += var10; // L: 437 - } - - this.offset -= 8; // L: 440 - this.writeInt(var7); // L: 441 - this.writeInt(var8); // L: 442 - } - - this.offset = var4; // L: 444 - } // L: 445 - - @ObfuscatedName("cv") - @ObfuscatedSignature( - descriptor = "([IIII)V", - garbageValue = "1959682043" - ) - @Export("xteaDecrypt") - public void xteaDecrypt(int[] var1, int var2, int var3) { - int var4 = this.offset; // L: 448 - this.offset = var2; // L: 449 - int var5 = (var3 - var2) / 8; // L: 450 - - for (int var6 = 0; var6 < var5; ++var6) { // L: 451 - int var7 = this.readInt(); // L: 452 - int var8 = this.readInt(); // L: 453 - int var9 = -957401312; // L: 454 - int var10 = -1640531527; // L: 455 - - for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 456 457 460 - var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 458 - var9 -= var10; // L: 459 - } - - this.offset -= 8; // L: 462 - this.writeInt(var7); // L: 463 - this.writeInt(var8); // L: 464 - } - - this.offset = var4; // L: 466 - } // L: 467 - - @ObfuscatedName("cs") - @ObfuscatedSignature( - descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", - garbageValue = "-1970274775" - ) - @Export("encryptRsa") - public void encryptRsa(BigInteger var1, BigInteger var2) { - int var3 = this.offset; // L: 470 - this.offset = 0; // L: 471 - byte[] var4 = new byte[var3]; // L: 472 - this.readBytes(var4, 0, var3); // L: 473 - BigInteger var5 = new BigInteger(var4); // L: 474 - BigInteger var6 = var5.modPow(var1, var2); // L: 475 - byte[] var7 = var6.toByteArray(); // L: 476 - this.offset = 0; // L: 477 - this.writeShort(var7.length); // L: 478 - this.writeBytes(var7, 0, var7.length); // L: 479 - } // L: 480 - - @ObfuscatedName("cz") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "87" - ) - @Export("writeCrc") - public int writeCrc(int var1) { - byte[] var3 = this.array; // L: 484 - int var4 = this.offset; // L: 485 - int var5 = -1; // L: 487 - - for (int var6 = var1; var6 < var4; ++var6) { // L: 488 - var5 = var5 >>> 8 ^ crc32Table[(var5 ^ var3[var6]) & 255]; // L: 489 - } - - var5 = ~var5; // L: 491 - this.writeInt(var5); // L: 495 - return var5; // L: 496 - } - - @ObfuscatedName("ct") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "378770832" - ) - @Export("checkCrc") - public boolean checkCrc() { - this.offset -= 4; // L: 500 - int var1 = class144.method3082(this.array, 0, this.offset); // L: 501 - int var2 = this.readInt(); // L: 502 - return var1 == var2; // L: 503 - } - - @ObfuscatedName("cb") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2049661918" - ) - public void method7701(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 508 - } // L: 509 - - @ObfuscatedName("cp") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-126" - ) - public void method7804(int var1) { - this.array[++this.offset - 1] = (byte)(0 - var1); // L: 512 - } // L: 513 - - @ObfuscatedName("co") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1969740861" - ) - public void method7703(int var1) { - this.array[++this.offset - 1] = (byte)(128 - var1); // L: 516 - } // L: 517 - @ObfuscatedName("ca") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-498861947" + garbageValue = "-1463794005" ) - public int method7875() { - return this.array[++this.offset - 1] - 128 & 255; // L: 520 + public int method7627() { + return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 392 393 } @ObfuscatedName("ci") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-2" - ) - public int method7773() { - return 0 - this.array[++this.offset - 1] & 255; // L: 524 - } - - @ObfuscatedName("cy") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "924383522" + garbageValue = "-1489274357" ) - public int method7742() { - return 128 - this.array[++this.offset - 1] & 255; // L: 528 - } - - @ObfuscatedName("cr") - @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "-224847897" - ) - public byte method7707() { - return (byte)(this.array[++this.offset - 1] - 128); // L: 532 - } - - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "-92497393" - ) - public byte method7708() { - return (byte)(0 - this.array[++this.offset - 1]); // L: 536 - } - - @ObfuscatedName("cn") - @ObfuscatedSignature( - descriptor = "(B)B", - garbageValue = "2" - ) - public byte method7885() { - return (byte)(128 - this.array[++this.offset - 1]); // L: 540 - } - - @ObfuscatedName("cu") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-108" - ) - public void method7710(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 544 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 545 - } // L: 546 - - @ObfuscatedName("cg") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1271844587" - ) - public void method7711(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 549 - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 550 - } // L: 551 - - @ObfuscatedName("cj") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-38" - ) - public void method7712(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 554 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 555 - } // L: 556 - - @ObfuscatedName("ce") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1842864203" - ) - public int method7713() { - this.offset += 2; // L: 559 - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 560 - } - - @ObfuscatedName("cl") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2017846356" - ) - public int method7714() { - this.offset += 2; // L: 564 - return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 565 - } - - @ObfuscatedName("ck") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-8127" - ) - public int method7715() { - this.offset += 2; // L: 569 - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 570 - } - - @ObfuscatedName("cd") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "24" - ) - public int method7716() { - this.offset += 2; // L: 574 - int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 575 - if (var1 > 32767) { // L: 576 - var1 -= 65536; + public int method7532() { + if (this.array[this.offset] < 0) { // L: 397 + return this.readInt() & Integer.MAX_VALUE; + } else { + int var1 = this.readUnsignedShort(); // L: 398 + return var1 == 32767 ? -1 : var1; // L: 399 } - - return var1; // L: 577 - } - - @ObfuscatedName("cw") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-14" - ) - public int method7717() { - this.offset += 2; // L: 581 - int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 582 - if (var1 > 32767) { // L: 583 - var1 -= 65536; - } - - return var1; // L: 584 } @ObfuscatedName("cx") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1014855244" + descriptor = "(B)I", + garbageValue = "80" ) - public void method7680(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 588 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 589 - this.array[++this.offset - 1] = (byte)var1; // L: 590 - } // L: 591 + @Export("readVarInt") + public int readVarInt() { + byte var1 = this.array[++this.offset - 1]; // L: 404 - @ObfuscatedName("dr") + int var2; + for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 405 406 408 + var2 = (var2 | var1 & 127) << 7; // L: 407 + } + + return var2 | var1; // L: 410 + } + + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "([IB)V", + garbageValue = "1" + ) + @Export("xteaEncryptAll") + public void xteaEncryptAll(int[] var1) { + int var2 = this.offset / 8; // L: 414 + this.offset = 0; // L: 415 + + for (int var3 = 0; var3 < var2; ++var3) { // L: 416 + int var4 = this.readInt(); // L: 417 + int var5 = this.readInt(); // L: 418 + int var6 = 0; // L: 419 + int var7 = -1640531527; // L: 420 + + for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 421 422 425 + var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 423 + var6 += var7; // L: 424 + } + + this.offset -= 8; // L: 427 + this.writeInt(var4); // L: 428 + this.writeInt(var5); // L: 429 + } + + } // L: 431 + + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "([II)V", + garbageValue = "946112408" + ) + @Export("xteaDecryptAll") + public void xteaDecryptAll(int[] var1) { + int var2 = this.offset / 8; // L: 434 + this.offset = 0; // L: 435 + + for (int var3 = 0; var3 < var2; ++var3) { // L: 436 + int var4 = this.readInt(); // L: 437 + int var5 = this.readInt(); // L: 438 + int var6 = -957401312; // L: 439 + int var7 = -1640531527; // L: 440 + + for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 441 442 445 + var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 443 + var6 -= var7; // L: 444 + } + + this.offset -= 8; // L: 447 + this.writeInt(var4); // L: 448 + this.writeInt(var5); // L: 449 + } + + } // L: 451 + + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "([IIII)V", + garbageValue = "-2082307716" + ) + @Export("xteaEncrypt") + public void xteaEncrypt(int[] var1, int var2, int var3) { + int var4 = this.offset; // L: 454 + this.offset = var2; // L: 455 + int var5 = (var3 - var2) / 8; // L: 456 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 457 + int var7 = this.readInt(); // L: 458 + int var8 = this.readInt(); // L: 459 + int var9 = 0; // L: 460 + int var10 = -1640531527; // L: 461 + + for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 462 463 466 + var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 464 + var9 += var10; // L: 465 + } + + this.offset -= 8; // L: 468 + this.writeInt(var7); // L: 469 + this.writeInt(var8); // L: 470 + } + + this.offset = var4; // L: 472 + } // L: 473 + + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "([IIIB)V", + garbageValue = "-102" + ) + @Export("xteaDecrypt") + public void xteaDecrypt(int[] var1, int var2, int var3) { + int var4 = this.offset; // L: 476 + this.offset = var2; // L: 477 + int var5 = (var3 - var2) / 8; // L: 478 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 479 + int var7 = this.readInt(); // L: 480 + int var8 = this.readInt(); // L: 481 + int var9 = -957401312; // L: 482 + int var10 = -1640531527; // L: 483 + + for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 484 485 488 + var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 486 + var9 -= var10; // L: 487 + } + + this.offset -= 8; // L: 490 + this.writeInt(var7); // L: 491 + this.writeInt(var8); // L: 492 + } + + this.offset = var4; // L: 494 + } // L: 495 + + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", + garbageValue = "-384695033" + ) + @Export("encryptRsa") + public void encryptRsa(BigInteger var1, BigInteger var2) { + int var3 = this.offset; // L: 498 + this.offset = 0; // L: 499 + byte[] var4 = new byte[var3]; // L: 500 + this.readBytes(var4, 0, var3); // L: 501 + BigInteger var5 = new BigInteger(var4); // L: 502 + BigInteger var6 = var5.modPow(var1, var2); // L: 503 + byte[] var7 = var6.toByteArray(); // L: 504 + this.offset = 0; // L: 505 + this.writeShort(var7.length); // L: 506 + this.writeBytes(var7, 0, var7.length); // L: 507 + } // L: 508 + + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "-21" + ) + @Export("writeCrc") + public int writeCrc(int var1) { + int var2 = Clock.method3249(this.array, var1, this.offset); // L: 511 + this.writeInt(var2); // L: 512 + return var2; // L: 513 + } + + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "58" + ) + @Export("checkCrc") + public boolean checkCrc() { + this.offset -= 4; // L: 517 + int var1 = Clock.method3249(this.array, 0, this.offset); // L: 518 + int var2 = this.readInt(); // L: 519 + return var1 == var2; // L: 520 + } + + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1876057688" + ) + public void method7687(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 525 + } // L: 526 + + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1275499645" + ) + public void method7542(int var1) { + this.array[++this.offset - 1] = (byte)(0 - var1); // L: 529 + } // L: 530 + + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1692588218" + ) + public void method7596(int var1) { + this.array[++this.offset - 1] = (byte)(128 - var1); // L: 533 + } // L: 534 + + @ObfuscatedName("cu") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "71565534" + garbageValue = "-248110695" ) - public int method7752() { - this.offset += 3; // L: 594 - return (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 1] & 255) << 16); // L: 595 + public int method7593() { + return this.array[++this.offset - 1] - 128 & 255; // L: 537 + } + + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1212667249" + ) + public int method7545() { + return 0 - this.array[++this.offset - 1] & 255; // L: 541 + } + + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "2131850798" + ) + public int method7546() { + return 128 - this.array[++this.offset - 1] & 255; // L: 545 + } + + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "(I)B", + garbageValue = "1103987135" + ) + public byte method7547() { + return (byte)(this.array[++this.offset - 1] - 128); // L: 549 + } + + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "(B)B", + garbageValue = "1" + ) + public byte method7548() { + return (byte)(0 - this.array[++this.offset - 1]); // L: 553 + } + + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "(B)B", + garbageValue = "-70" + ) + public byte method7549() { + return (byte)(128 - this.array[++this.offset - 1]); // L: 557 + } + + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1933917266" + ) + public void method7550(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 561 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 562 + } // L: 563 + + @ObfuscatedName("dc") + @ObfuscatedSignature( + descriptor = "(IS)V", + garbageValue = "-8848" + ) + public void method7551(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 566 + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 567 + } // L: 568 + + @ObfuscatedName("dp") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1549973680" + ) + public void method7641(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 571 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 572 + } // L: 573 + + @ObfuscatedName("dg") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-329336731" + ) + public int method7716() { + this.offset += 2; // L: 576 + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 577 + } + + @ObfuscatedName("dy") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "125" + ) + public int method7554() { + this.offset += 2; // L: 581 + return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 582 + } + + @ObfuscatedName("dh") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "0" + ) + public int method7576() { + this.offset += 2; // L: 586 + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 587 } @ObfuscatedName("dj") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-210330381" + descriptor = "(S)I", + garbageValue = "-14964" ) - public int method7793() { - this.offset += 3; // L: 599 - return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); // L: 600 - } + public int method7556() { + this.offset += 2; // L: 591 + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 592 + if (var1 > 32767) { // L: 593 + var1 -= 65536; + } - @ObfuscatedName("dd") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1393724585" - ) - public void method7721(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 604 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 605 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 606 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 607 - } // L: 608 - - @ObfuscatedName("dg") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "52552279" - ) - @Export("writeIntME") - public void writeIntME(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 611 - this.array[++this.offset - 1] = (byte)var1; // L: 612 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 613 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 614 - } // L: 615 - - @ObfuscatedName("de") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "31" - ) - public void method7723(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 618 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 619 - this.array[++this.offset - 1] = (byte)var1; // L: 620 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 621 - } // L: 622 - - @ObfuscatedName("dp") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-664437798" - ) - public int method7705() { - this.offset += 4; // L: 625 - 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: 626 + return var1; // L: 594 } @ObfuscatedName("dx") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "859716194" + descriptor = "(S)I", + garbageValue = "5507" ) - public int method7827() { - this.offset += 4; // L: 630 - 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: 631 + public int method7522() { + this.offset += 2; // L: 598 + int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 599 + if (var1 > 32767) { // L: 600 + var1 -= 65536; + } + + return var1; // L: 601 + } + + @ObfuscatedName("dd") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-545549715" + ) + public int method7558() { + this.offset += 2; // L: 605 + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 606 + if (var1 > 32767) { // L: 607 + var1 -= 65536; + } + + return var1; // L: 608 + } + + @ObfuscatedName("do") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "65533" + ) + public void method7559(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 612 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 613 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 614 + } // L: 615 + + @ObfuscatedName("di") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "497671822" + ) + public int method7544() { + this.offset += 3; // L: 618 + return (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 1] & 255) << 16); // L: 619 + } + + @ObfuscatedName("de") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "278130601" + ) + public int method7561() { + this.offset += 3; // L: 623 + return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 2] & 255); // L: 624 + } + + @ObfuscatedName("db") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "29" + ) + public int method7503() { + this.offset += 3; // L: 628 + return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); // L: 629 + } + + @ObfuscatedName("dn") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "1" + ) + public void method7563(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 633 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 634 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 635 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 636 + } // L: 637 + + @ObfuscatedName("dz") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-864588772" + ) + @Export("writeIntME") + public void writeIntME(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 640 + this.array[++this.offset - 1] = (byte)var1; // L: 641 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 642 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 643 + } // L: 644 + + @ObfuscatedName("dl") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1980166371" + ) + public void method7565(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 647 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 648 + this.array[++this.offset - 1] = (byte)var1; // L: 649 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 650 + } // L: 651 + + @ObfuscatedName("da") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "421037189" + ) + public int method7701() { + this.offset += 4; // L: 654 + 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: 655 + } + + @ObfuscatedName("dv") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1322409525" + ) + public int method7567() { + this.offset += 4; // L: 659 + 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: 660 + } + + @ObfuscatedName("dr") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-19" + ) + public int method7568() { + this.offset += 4; // L: 664 + 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: 665 } @ObfuscatedName("ds") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1883588599" - ) - public int method7837() { - this.offset += 4; // L: 635 - 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: 636 - } - - @ObfuscatedName("dc") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1655401346" + garbageValue = "-1520989243" ) - public void method7814(byte[] var1, int var2, int var3) { - for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { // L: 640 - var1[var4] = this.array[++this.offset - 1]; + public void method7569(byte[] var1, int var2, int var3) { + for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { + var1[var4] = this.array[++this.offset - 1]; // L: 669 } - } // L: 641 + } // L: 670 } diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index 7531536607..07deb8839d 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -6,72 +6,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pb") +@ObfuscatedName("pz") @Implements("BufferedFile") public class BufferedFile { - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lph;" + descriptor = "Lpu;" ) @Export("accessFile") AccessFile accessFile; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("readBuffer") byte[] readBuffer; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = -8920442284336145207L + longValue = 4178581375858547737L ) @Export("readBufferOffset") long readBufferOffset; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 959546987 + intValue = 1786515893 ) @Export("readBufferLength") int readBufferLength; - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("writeBuffer") byte[] writeBuffer; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - longValue = -5995632714871070967L + longValue = 6839484550665134849L ) @Export("writeBufferOffset") long writeBufferOffset; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -694187419 + intValue = -701786655 ) @Export("writeBufferLength") int writeBufferLength; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - longValue = -7698547287886108579L + longValue = -2293352918490760827L ) @Export("offset") long offset; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - longValue = -6174188026311387211L + longValue = 7360496597180127129L ) @Export("fileLength") long fileLength; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - longValue = 2714224379906109785L + longValue = -2587246494180126439L ) @Export("length") long length; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = -8095417685979246741L + longValue = -8363977910986430751L ) @Export("fileOffset") long fileOffset; @ObfuscatedSignature( - descriptor = "(Lph;II)V" + descriptor = "(Lpu;II)V" ) public BufferedFile(AccessFile var1, int var2, int var3) throws IOException { this.readBufferOffset = -1L; // L: 9 @@ -84,10 +84,10 @@ public class BufferedFile { this.offset = 0L; // L: 24 } // L: 25 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "78" + descriptor = "(I)V", + garbageValue = "983004264" ) @Export("close") public void close() throws IOException { @@ -95,7 +95,7 @@ public class BufferedFile { this.accessFile.close(); // L: 29 } // L: 30 - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("seek") public void seek(long var1) throws IOException { if (var1 < 0L) { // L: 33 @@ -105,30 +105,30 @@ public class BufferedFile { } } // L: 35 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "-776750742" + descriptor = "(S)J", + garbageValue = "185" ) @Export("length") public long length() { return this.length; // L: 38 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "1551073346" + garbageValue = "-2124163169" ) @Export("readFully") public void readFully(byte[] var1) throws IOException { this.read(var1, 0, var1.length); // L: 42 } // L: 43 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "0" + descriptor = "([BIII)V", + garbageValue = "2088441068" ) @Export("read") public void read(byte[] var1, int var2, int var3) throws IOException { @@ -137,7 +137,7 @@ public class BufferedFile { throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length); } - if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 48 + if (this.writeBufferOffset != -1L && 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 @@ -146,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; @@ -206,9 +206,9 @@ public class BufferedFile { var13 = var4; // L: 101 } - if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= var4 + (long)var7) { // L: 103 - var10 = (long)this.writeBufferLength + this.writeBufferOffset; // L: 104 - } else if ((long)var7 + var4 > this.writeBufferOffset && var4 + (long)var7 <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 106 + if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= (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 = var4 + (long)var7; // L: 107 } @@ -231,10 +231,10 @@ public class BufferedFile { } } // L: 125 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "4" + descriptor = "(I)V", + garbageValue = "-1238511464" ) @Export("load") void load() throws IOException { @@ -261,23 +261,23 @@ public class BufferedFile { } // L: 142 - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-1226704883" + garbageValue = "-1049933636" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { try { if ((long)var3 + this.offset > this.length) { // L: 146 - this.length = (long)var3 + this.offset; + this.length = this.offset + (long)var3; } if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { // L: 147 this.flush(); // L: 148 } - if (-1L != this.writeBufferOffset && (long)var3 + this.offset > (long)this.writeBuffer.length + this.writeBufferOffset) { // L: 150 + if (this.writeBufferOffset != -1L && (long)var3 + this.offset > 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 @@ -301,7 +301,7 @@ public class BufferedFile { } } else { - if (this.fileOffset != this.offset) { // L: 160 + if (this.offset != this.fileOffset) { // L: 160 this.accessFile.seek(this.offset); // L: 161 this.fileOffset = this.offset; // L: 162 } @@ -316,14 +316,14 @@ public class BufferedFile { long var6 = -1L; // L: 168 if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { // L: 169 var9 = this.offset; // L: 170 - } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) { // L: 172 + } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) { // L: 172 var9 = this.readBufferOffset; // L: 173 } - if (this.offset + (long)var3 > this.readBufferOffset && this.offset + (long)var3 <= (long)this.readBufferLength + this.readBufferOffset) { // L: 175 + if ((long)var3 + this.offset > this.readBufferOffset && (long)var3 + this.offset <= (long)this.readBufferLength + this.readBufferOffset) { // L: 175 var6 = (long)var3 + this.offset; // L: 176 } else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && (long)this.readBufferLength + this.readBufferOffset <= (long)var3 + this.offset) { // L: 178 - var6 = this.readBufferOffset + (long)this.readBufferLength; // L: 179 + var6 = (long)this.readBufferLength + this.readBufferOffset; // L: 179 } if (var9 > -1L && var6 > var9) { // L: 181 @@ -339,10 +339,10 @@ public class BufferedFile { } } // L: 186 193 200 - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "352436768" + garbageValue = "-692867927" ) @Export("flush") void flush() throws IOException { @@ -353,23 +353,23 @@ public class BufferedFile { } this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); // L: 208 - this.fileOffset += (long)this.writeBufferLength * 1276428477523820545L; // L: 209 + this.fileOffset += (long)this.writeBufferLength * 714010520226627585L; // 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 < (long)this.writeBufferLength + this.writeBufferOffset) { // L: 216 + } 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 && (long)this.writeBufferLength + this.writeBufferOffset <= (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 && this.readBufferOffset + (long)this.readBufferLength <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 222 - var3 = (long)this.readBufferLength + this.readBufferOffset; // L: 223 + 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 18af7b219f..81ac185db5 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -5,30 +5,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("no") +@ObfuscatedName("ni") @Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { @ObfuscatedName("o") - @Export("Tiles_hue") - static int[] Tiles_hue; - @ObfuscatedName("ei") - @ObfuscatedSignature( - descriptor = "Llx;" - ) - @Export("archive3") - static Archive archive3; - @ObfuscatedName("v") @Export("socket") Socket socket; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lnx;" + descriptor = "Lnp;" ) @Export("source") BufferedSource source; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Lno;" ) @Export("sink") BufferedSink sink; @@ -43,74 +34,74 @@ public class BufferedNetSocket extends AbstractSocket { this.sink = new BufferedSink(this.socket.getOutputStream(), var3); // L: 18 } // L: 19 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-13138" + descriptor = "(I)V", + garbageValue = "731891927" ) @Export("close") public void close() { - this.sink.close(); // L: 42 + this.sink.close(); // L: 48 try { - this.socket.close(); // L: 44 - } catch (IOException var2) { // L: 46 + this.socket.close(); // L: 50 + } catch (IOException var2) { // L: 52 } - this.source.close(); // L: 47 - } // L: 48 + this.source.close(); // L: 53 + } // L: 54 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-891040314" + descriptor = "(B)I", + garbageValue = "18" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { - return this.source.readUnsignedByte(); // L: 30 + return this.source.readUnsignedByte(); // L: 33 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "46" + descriptor = "(I)I", + garbageValue = "-1429957580" ) @Export("available") public int available() throws IOException { - return this.source.available(); // L: 26 + return this.source.available(); // L: 28 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "27" + descriptor = "(II)Z", + garbageValue = "-15219997" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { - return this.source.isAvailable(var1); // L: 22 + return this.source.isAvailable(var1); // L: 23 } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "-118" + descriptor = "([BIII)I", + garbageValue = "-642682113" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { - return this.source.read(var1, var2, var3); // L: 34 + return this.source.read(var1, var2, var3); // L: 38 } - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-1359342670" + garbageValue = "257086671" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { - this.sink.write(var1, var2, var3); // L: 38 - } // L: 39 + this.sink.write(var1, var2, var3); // L: 43 + } // L: 44 protected void finalize() { - this.close(); // L: 51 - } // L: 52 + this.close(); // L: 58 + } // L: 59 } diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index 9a1129a4c5..cbae31e008 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -5,219 +5,196 @@ 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("nd") +@ObfuscatedName("no") @Implements("BufferedSink") public class BufferedSink implements Runnable { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("thread") Thread thread; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 661494899 + intValue = -424160887 ) @Export("capacity") int capacity; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("buffer") byte[] buffer; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1189133375 + intValue = -1137203181 ) @Export("position") int position; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 542048211 + intValue = -649579149 ) @Export("limit") int limit; - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("exception") IOException exception; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("closed") boolean closed; BufferedSink(OutputStream var1, int var2) { - this.position = 0; // L: 186 - this.limit = 0; // L: 187 - this.outputStream = var1; // L: 192 - this.capacity = var2 + 1; // L: 193 - this.buffer = new byte[this.capacity]; // L: 194 - this.thread = new Thread(this); // L: 195 - this.thread.setDaemon(true); // L: 196 - this.thread.start(); // L: 197 - } // L: 198 + this.position = 0; // L: 193 + this.limit = 0; // L: 194 + this.outputStream = var1; // L: 199 + this.capacity = var2 + 1; // L: 200 + this.buffer = new byte[this.capacity]; // L: 201 + this.thread = new Thread(this); // L: 202 + this.thread.setDaemon(true); // L: 203 + this.thread.start(); // L: 204 + } // L: 205 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-268247836" + garbageValue = "2078615402" ) @Export("isClosed") boolean isClosed() { - if (this.closed) { // L: 201 + if (this.closed) { // L: 208 try { - this.outputStream.close(); // L: 203 + this.outputStream.close(); // L: 210 if (this.exception == null) { - this.exception = new IOException(""); // L: 204 + this.exception = new IOException(""); // L: 211 } - } catch (IOException var2) { // L: 206 - if (this.exception == null) { // L: 207 + } catch (IOException var2) { // L: 213 + if (this.exception == null) { // L: 214 this.exception = new IOException(var2); } } - return true; // L: 209 + return true; // L: 216 } else { - return false; // L: 211 + return false; // L: 218 } } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1071414878" + garbageValue = "1828248430" ) @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 - if (this.exception != null) { // L: 263 + if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 268 + synchronized(this) { // L: 269 + if (this.exception != null) { // L: 270 throw new IOException(this.exception.toString()); } else { int var5; - if (this.position <= this.limit) { // L: 265 + if (this.position <= this.limit) { // L: 272 var5 = this.capacity - this.limit + this.position - 1; } else { - var5 = this.position - this.limit - 1; // L: 266 + var5 = this.position - this.limit - 1; // L: 273 } - if (var5 < var3) { // L: 267 + if (var5 < var3) { // L: 274 throw new IOException(""); } else { - if (var3 + this.limit <= this.capacity) { // L: 268 - System.arraycopy(var1, var2, this.buffer, this.limit, var3); // L: 269 + if (var3 + this.limit <= this.capacity) { // L: 275 + System.arraycopy(var1, var2, this.buffer, this.limit, var3); // L: 276 } else { - int var6 = this.capacity - this.limit; // L: 272 - System.arraycopy(var1, var2, this.buffer, this.limit, var6); // L: 273 - System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); // L: 274 + int var6 = this.capacity - this.limit; // L: 279 + System.arraycopy(var1, var2, this.buffer, this.limit, var6); // L: 280 + System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); // L: 281 } - this.limit = (var3 + this.limit) % this.capacity; // L: 276 - this.notifyAll(); // L: 277 + this.limit = (var3 + this.limit) % this.capacity; // L: 283 + this.notifyAll(); // L: 284 } } } } else { throw new IOException(); } - } // L: 279 + } // L: 286 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1649898800" + garbageValue = "-1738399063" ) @Export("close") void close() { - synchronized(this) { // L: 282 - this.closed = true; // L: 283 - this.notifyAll(); // L: 284 - } // L: 285 + synchronized(this) { // L: 289 + this.closed = true; // L: 290 + this.notifyAll(); // L: 291 + } // L: 292 try { - this.thread.join(); // L: 287 - } catch (InterruptedException var3) { // L: 289 + this.thread.join(); // L: 294 + } catch (InterruptedException var3) { // L: 296 } - } // L: 290 + } // L: 297 public void run() { do { int var1; - synchronized(this) { // L: 217 + synchronized(this) { // L: 224 while (true) { - if (this.exception != null) { // L: 219 + if (this.exception != null) { // L: 226 return; } - if (this.position <= this.limit) { // L: 220 + if (this.position <= this.limit) { // L: 227 var1 = this.limit - this.position; } else { - var1 = this.capacity - this.position + this.limit; // L: 221 + var1 = this.capacity - this.position + this.limit; // L: 228 } - if (var1 > 0) { // L: 222 + if (var1 > 0) { // L: 229 break; } try { - this.outputStream.flush(); // L: 224 - } catch (IOException var11) { // L: 226 - this.exception = var11; // L: 227 - return; // L: 228 + this.outputStream.flush(); // L: 231 + } catch (IOException var11) { // L: 233 + this.exception = var11; // L: 234 + return; // L: 235 } - if (this.isClosed()) { // L: 230 + if (this.isClosed()) { // L: 237 return; } try { - this.wait(); // L: 232 - } catch (InterruptedException var12) { // L: 234 + this.wait(); // L: 239 + } catch (InterruptedException var12) { // L: 241 } } } try { - if (var1 + this.position <= this.capacity) { // L: 238 - this.outputStream.write(this.buffer, this.position, var1); // L: 239 + if (var1 + this.position <= this.capacity) { // L: 245 + this.outputStream.write(this.buffer, this.position, var1); // L: 246 } else { - int var7 = this.capacity - this.position; // L: 242 - this.outputStream.write(this.buffer, this.position, var7); // L: 243 - this.outputStream.write(this.buffer, 0, var1 - var7); // L: 244 + int var7 = this.capacity - this.position; // L: 249 + this.outputStream.write(this.buffer, this.position, var7); // L: 250 + this.outputStream.write(this.buffer, 0, var1 - var7); // L: 251 } - } catch (IOException var10) { // L: 247 + } catch (IOException var10) { // L: 254 IOException var2 = var10; - synchronized(this) { // L: 248 - this.exception = var2; // L: 249 - return; // L: 250 + synchronized(this) { // L: 255 + this.exception = var2; // L: 256 + return; // L: 257 } } - synchronized(this) { // L: 253 - this.position = (var1 + this.position) % this.capacity; // L: 254 - } // L: 255 - } while(!this.isClosed()); // L: 256 + synchronized(this) { // L: 260 + this.position = (var1 + this.position) % this.capacity; // L: 261 + } // L: 262 + } while(!this.isClosed()); // L: 263 } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "402033310" - ) - static int method6911(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.LOGOUT) { // L: 3821 - Client.logoutTimer = 250; // L: 3822 - return 1; // L: 3823 - } else if (var0 != 5631 && var0 != 5633) { // L: 3825 - if (var0 == 5632) { // L: 3829 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 26; // L: 3830 - return 1; // L: 3831 - } else { - return 2; // L: 3833 - } - } else { - class122.Interpreter_stringStackSize -= 2; // L: 3826 - return 1; // L: 3827 - } - } } diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index de2780829c..fd465135b1 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -7,78 +7,87 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nx") +@ObfuscatedName("np") @Implements("BufferedSource") public class BufferedSource implements Runnable { - @ObfuscatedName("v") + @ObfuscatedName("uf") + @ObfuscatedSignature( + descriptor = "Lbd;" + ) + @Export("friendSystem") + public static FriendSystem friendSystem; + @ObfuscatedName("j") + @Export("userHomeDirectory") + static String userHomeDirectory; + @ObfuscatedName("o") @Export("thread") Thread thread; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1631784043 + intValue = 1611590211 ) @Export("capacity") int capacity; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("buffer") byte[] buffer; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1349825787 + intValue = 1886855287 ) @Export("position") int position; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1219370145 + intValue = 360959185 ) @Export("limit") int limit; - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("exception") IOException exception; BufferedSource(InputStream var1, int var2) { - this.position = 0; - this.limit = 0; - this.inputStream = var1; - this.capacity = var2 + 1; - this.buffer = new byte[this.capacity]; // L: 66 - this.thread = new Thread(this); - this.thread.setDaemon(true); - this.thread.start(); - } // L: 70 + this.position = 0; // L: 66 + this.limit = 0; // L: 67 + this.inputStream = var1; // L: 71 + this.capacity = var2 + 1; // L: 72 + this.buffer = new byte[this.capacity]; // L: 73 + this.thread = new Thread(this); // L: 74 + this.thread.setDaemon(true); // L: 75 + this.thread.start(); // L: 76 + } // L: 77 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "0" + descriptor = "(II)Z", + garbageValue = "-916314557" ) @Export("isAvailable") boolean isAvailable(int var1) throws IOException { - if (var1 == 0) { + if (var1 == 0) { // L: 113 return true; - } else if (var1 > 0 && var1 < this.capacity) { // L: 107 - synchronized(this) { + } else if (var1 > 0 && var1 < this.capacity) { // L: 114 + synchronized(this) { // L: 115 int var3; - if (this.position <= this.limit) { + if (this.position <= this.limit) { // L: 117 var3 = this.limit - this.position; } else { - var3 = this.capacity - this.position + this.limit; // L: 111 + var3 = this.capacity - this.position + this.limit; // L: 118 } - if (var3 < var1) { - if (this.exception != null) { + if (var3 < var1) { // L: 119 + if (this.exception != null) { // L: 120 throw new IOException(this.exception.toString()); } else { - this.notifyAll(); - return false; // L: 115 + this.notifyAll(); // L: 121 + return false; // L: 122 } } else { - return true; + return true; // L: 124 } } } else { @@ -86,87 +95,87 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "412570779" + garbageValue = "377483853" ) @Export("available") int available() throws IOException { - synchronized(this) { + synchronized(this) { // L: 129 int var2; - if (this.position <= this.limit) { + if (this.position <= this.limit) { // L: 131 var2 = this.limit - this.position; } else { - var2 = this.capacity - this.position + this.limit; + var2 = this.capacity - this.position + this.limit; // L: 132 } - if (var2 <= 0 && this.exception != null) { // L: 126 - throw new IOException(this.exception.toString()); + if (var2 <= 0 && this.exception != null) { // L: 133 + throw new IOException(this.exception.toString()); // L: 134 } else { - this.notifyAll(); - return var2; // L: 130 + this.notifyAll(); // L: 136 + return var2; // L: 137 } } } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1010089751" + descriptor = "(B)I", + garbageValue = "-18" ) @Export("readUnsignedByte") int readUnsignedByte() throws IOException { - synchronized(this) { - if (this.position == this.limit) { - if (this.exception != null) { + synchronized(this) { // L: 142 + if (this.limit == this.position) { // L: 143 + if (this.exception != null) { // L: 144 throw new IOException(this.exception.toString()); } else { - return -1; // L: 138 + return -1; // L: 145 } } else { - int var2 = this.buffer[this.position] & 255; - this.position = (this.position + 1) % this.capacity; - this.notifyAll(); // L: 142 - return var2; + int var2 = this.buffer[this.position] & 255; // L: 147 + this.position = (this.position + 1) % this.capacity; // L: 148 + this.notifyAll(); // L: 149 + return var2; // L: 150 } } } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "-2005340605" + garbageValue = "-720858367" ) @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { - if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { - synchronized(this) { + if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 155 + synchronized(this) { // L: 156 int var5; - if (this.position <= this.limit) { // L: 151 + if (this.position <= this.limit) { // L: 158 var5 = this.limit - this.position; } else { - var5 = this.capacity - this.position + this.limit; + var5 = this.capacity - this.position + this.limit; // L: 159 } - if (var3 > var5) { + if (var3 > var5) { // L: 160 var3 = var5; } - if (var3 == 0 && this.exception != null) { + if (var3 == 0 && this.exception != null) { // L: 161 throw new IOException(this.exception.toString()); } else { - if (var3 + this.position <= this.capacity) { // L: 155 - System.arraycopy(this.buffer, this.position, var1, var2, var3); + if (var3 + this.position <= this.capacity) { // L: 162 + System.arraycopy(this.buffer, this.position, var1, var2, var3); // L: 163 } else { - int var6 = this.capacity - this.position; // L: 159 - System.arraycopy(this.buffer, this.position, var1, var2, var6); - System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6); + int var6 = this.capacity - this.position; // L: 166 + System.arraycopy(this.buffer, this.position, var1, var2, var6); // L: 167 + System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6); // L: 168 } - this.position = (var3 + this.position) % this.capacity; // L: 163 - this.notifyAll(); // L: 164 - return var3; + this.position = (var3 + this.position) % this.capacity; // L: 170 + this.notifyAll(); // L: 171 + return var3; // L: 172 } } } else { @@ -174,380 +183,108 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "202162946" + garbageValue = "-1309478376" ) @Export("close") void close() { - synchronized(this) { // L: 170 + synchronized(this) { // L: 177 if (this.exception == null) { - this.exception = new IOException(""); + this.exception = new IOException(""); // L: 178 } - this.notifyAll(); + this.notifyAll(); // L: 179 } try { - this.thread.join(); // L: 175 - } catch (InterruptedException var3) { // L: 177 + this.thread.join(); // L: 182 + } catch (InterruptedException var3) { // L: 184 } - } // L: 178 + } // L: 185 public void run() { while (true) { int var1; - synchronized(this) { // L: 75 + synchronized(this) { // L: 82 while (true) { - if (this.exception != null) { + if (this.exception != null) { // L: 84 return; } - if (this.position == 0) { + if (this.position == 0) { // L: 85 var1 = this.capacity - this.limit - 1; - } else if (this.position <= this.limit) { // L: 79 + } else if (this.position <= this.limit) { // L: 86 var1 = this.capacity - this.limit; } else { - var1 = this.position - this.limit - 1; + var1 = this.position - this.limit - 1; // L: 87 } - if (var1 > 0) { + if (var1 > 0) { // L: 88 break; } try { - this.wait(); // L: 83 - } catch (InterruptedException var10) { + this.wait(); // L: 90 + } catch (InterruptedException var10) { // L: 92 } } } int var7; try { - var7 = this.inputStream.read(this.buffer, this.limit, var1); + var7 = this.inputStream.read(this.buffer, this.limit, var1); // L: 97 if (var7 == -1) { - throw new EOFException(); // L: 91 + throw new EOFException(); // L: 98 } - } catch (IOException var11) { + } catch (IOException var11) { // L: 100 IOException var3 = var11; - synchronized(this) { - this.exception = var3; // L: 95 - return; + synchronized(this) { // L: 101 + this.exception = var3; // L: 102 + return; // L: 103 } } - synchronized(this) { // L: 99 - this.limit = (var7 + this.limit) % this.capacity; - } + synchronized(this) { // L: 106 + this.limit = (var7 + this.limit) % this.capacity; // L: 107 + } // L: 108 } } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Llo;II)Ljd;", - garbageValue = "1218587295" + descriptor = "(CI)Z", + garbageValue = "-1918735565" ) - public static PacketBufferNode method6908(int var0, String var1, Language var2, int var3) { - PacketBufferNode var4 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2918, Client.packetWriter.isaacCipher); // L: 17 - var4.packetBuffer.writeByte(0); // L: 18 - int var5 = var4.packetBuffer.offset; // L: 19 - var4.packetBuffer.writeByte(var0); // L: 20 - String var6 = var1.toLowerCase(); // L: 21 - byte var7 = 0; // L: 22 - if (var6.startsWith("yellow:")) { // L: 23 - var7 = 0; // L: 24 - var1 = var1.substring("yellow:".length()); // L: 25 - } else if (var6.startsWith("red:")) { // L: 27 - var7 = 1; // L: 28 - var1 = var1.substring("red:".length()); // L: 29 - } else if (var6.startsWith("green:")) { // L: 31 - var7 = 2; // L: 32 - var1 = var1.substring("green:".length()); // L: 33 - } else if (var6.startsWith("cyan:")) { // L: 35 - var7 = 3; // L: 36 - var1 = var1.substring("cyan:".length()); // L: 37 - } else if (var6.startsWith("purple:")) { // L: 39 - var7 = 4; // L: 40 - var1 = var1.substring("purple:".length()); // L: 41 - } else if (var6.startsWith("white:")) { // L: 43 - var7 = 5; // L: 44 - var1 = var1.substring("white:".length()); // L: 45 - } else if (var6.startsWith("flash1:")) { // L: 47 - var7 = 6; // L: 48 - var1 = var1.substring("flash1:".length()); // L: 49 - } else if (var6.startsWith("flash2:")) { // L: 51 - var7 = 7; // L: 52 - var1 = var1.substring("flash2:".length()); // L: 53 - } else if (var6.startsWith("flash3:")) { // L: 55 - var7 = 8; // L: 56 - var1 = var1.substring("flash3:".length()); // L: 57 - } else if (var6.startsWith("glow1:")) { // L: 59 - var7 = 9; // L: 60 - var1 = var1.substring("glow1:".length()); // L: 61 - } else if (var6.startsWith("glow2:")) { // L: 63 - var7 = 10; // L: 64 - var1 = var1.substring("glow2:".length()); // L: 65 - } else if (var6.startsWith("glow3:")) { // L: 67 - var7 = 11; // L: 68 - var1 = var1.substring("glow3:".length()); // L: 69 - } else if (var2 != Language.Language_EN) { // L: 71 - if (var6.startsWith("yellow:")) { // L: 72 - var7 = 0; // L: 73 - var1 = var1.substring("yellow:".length()); // L: 74 - } else if (var6.startsWith("red:")) { // L: 76 - var7 = 1; // L: 77 - var1 = var1.substring("red:".length()); // L: 78 - } else if (var6.startsWith("green:")) { // L: 80 - var7 = 2; // L: 81 - var1 = var1.substring("green:".length()); // L: 82 - } else if (var6.startsWith("cyan:")) { // L: 84 - var7 = 3; // L: 85 - var1 = var1.substring("cyan:".length()); // L: 86 - } else if (var6.startsWith("purple:")) { // L: 88 - var7 = 4; // L: 89 - var1 = var1.substring("purple:".length()); // L: 90 - } else if (var6.startsWith("white:")) { // L: 92 - var7 = 5; // L: 93 - var1 = var1.substring("white:".length()); // L: 94 - } else if (var6.startsWith("flash1:")) { // L: 96 - var7 = 6; // L: 97 - var1 = var1.substring("flash1:".length()); // L: 98 - } else if (var6.startsWith("flash2:")) { // L: 100 - var7 = 7; // L: 101 - var1 = var1.substring("flash2:".length()); // L: 102 - } else if (var6.startsWith("flash3:")) { // L: 104 - var7 = 8; // L: 105 - var1 = var1.substring("flash3:".length()); // L: 106 - } else if (var6.startsWith("glow1:")) { // L: 108 - var7 = 9; // L: 109 - var1 = var1.substring("glow1:".length()); // L: 110 - } else if (var6.startsWith("glow2:")) { // L: 112 - var7 = 10; // L: 113 - var1 = var1.substring("glow2:".length()); // L: 114 - } else if (var6.startsWith("glow3:")) { // L: 116 - var7 = 11; // L: 117 - var1 = var1.substring("glow3:".length()); // L: 118 - } - } - - var6 = var1.toLowerCase(); // L: 121 - byte var8 = 0; // L: 122 - if (var6.startsWith("wave:")) { // L: 123 - var8 = 1; // L: 124 - var1 = var1.substring("wave:".length()); // L: 125 - } else if (var6.startsWith("wave2:")) { // L: 127 - var8 = 2; // L: 128 - var1 = var1.substring("wave2:".length()); // L: 129 - } else if (var6.startsWith("shake:")) { // L: 131 - var8 = 3; // L: 132 - var1 = var1.substring("shake:".length()); // L: 133 - } else if (var6.startsWith("scroll:")) { // L: 135 - var8 = 4; // L: 136 - var1 = var1.substring("scroll:".length()); // L: 137 - } else if (var6.startsWith("slide:")) { // L: 139 - var8 = 5; // L: 140 - var1 = var1.substring("slide:".length()); // L: 141 - } else if (var2 != Language.Language_EN) { // L: 143 - if (var6.startsWith("wave:")) { // L: 144 - var8 = 1; // L: 145 - var1 = var1.substring("wave:".length()); // L: 146 - } else if (var6.startsWith("wave2:")) { // L: 148 - var8 = 2; // L: 149 - var1 = var1.substring("wave2:".length()); // L: 150 - } else if (var6.startsWith("shake:")) { // L: 152 - var8 = 3; // L: 153 - var1 = var1.substring("shake:".length()); // L: 154 - } else if (var6.startsWith("scroll:")) { // L: 156 - var8 = 4; // L: 157 - var1 = var1.substring("scroll:".length()); // L: 158 - } else if (var6.startsWith("slide:")) { // L: 160 - var8 = 5; // L: 161 - var1 = var1.substring("slide:".length()); // L: 162 - } - } - - var4.packetBuffer.writeByte(var7); // L: 165 - var4.packetBuffer.writeByte(var8); // L: 166 - class282.method5489(var4.packetBuffer, var1); // L: 167 - if (var0 == class296.field3492.rsOrdinal()) { // L: 168 - var4.packetBuffer.writeByte(var3); // L: 169 - } - - var4.packetBuffer.method7774(var4.packetBuffer.offset - var5); // L: 171 - return var4; // L: 172 - } - - @ObfuscatedName("jb") - @ObfuscatedSignature( - descriptor = "(Lky;II)I", - garbageValue = "-965040804" - ) - static final int method6907(Widget var0, int var1) { - if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 10924 - try { - int[] var2 = var0.cs1Instructions[var1]; // L: 10926 - int var3 = 0; // L: 10927 - int var4 = 0; // L: 10928 - byte var5 = 0; // L: 10929 - - while (true) { - int var6 = var2[var4++]; // L: 10931 - int var7 = 0; // L: 10932 - byte var8 = 0; // L: 10933 - if (var6 == 0) { // L: 10934 - return var3; - } - - if (var6 == 1) { // L: 10935 - var7 = Client.currentLevels[var2[var4++]]; - } - - if (var6 == 2) { // L: 10936 - var7 = Client.levels[var2[var4++]]; - } - - if (var6 == 3) { // L: 10937 - var7 = Client.experience[var2[var4++]]; - } - - int var9; - Widget var10; - int var11; - int var12; - if (var6 == 4) { // L: 10938 - var9 = var2[var4++] << 16; // L: 10939 - var9 += var2[var4++]; // L: 10940 - var10 = class127.getWidget(var9); // L: 10941 - var11 = var2[var4++]; // L: 10942 - if (var11 != -1 && (!class19.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10943 - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10944 - if (var11 + 1 == var10.itemIds[var12]) { // L: 10945 - var7 += var10.itemQuantities[var12]; - } - } - } - } - - if (var6 == 5) { // L: 10949 - var7 = Varps.Varps_main[var2[var4++]]; - } - - if (var6 == 6) { // L: 10950 - var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; - } - - if (var6 == 7) { // L: 10951 - var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; - } - - if (var6 == 8) { // L: 10952 - var7 = GrandExchangeEvents.localPlayer.combatLevel; - } - - if (var6 == 9) { // L: 10953 - for (var9 = 0; var9 < 25; ++var9) { // L: 10954 - if (Skills.Skills_enabled[var9]) { // L: 10955 - var7 += Client.levels[var9]; - } - } - } - - if (var6 == 10) { // L: 10958 - var9 = var2[var4++] << 16; // L: 10959 - var9 += var2[var4++]; // L: 10960 - var10 = class127.getWidget(var9); // L: 10961 - var11 = var2[var4++]; // L: 10962 - if (var11 != -1 && (!class19.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10963 - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10964 - if (var11 + 1 == var10.itemIds[var12]) { // L: 10965 - var7 = 999999999; // L: 10966 - break; // L: 10967 - } - } - } - } - - if (var6 == 11) { // L: 10972 - var7 = Client.runEnergy; - } - - if (var6 == 12) { // L: 10973 - var7 = Client.weight; - } - - if (var6 == 13) { // L: 10974 - var9 = Varps.Varps_main[var2[var4++]]; // L: 10975 - int var13 = var2[var4++]; // L: 10976 - var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 10977 - } - - if (var6 == 14) { // L: 10979 - var9 = var2[var4++]; // L: 10980 - var7 = SecureRandomCallable.getVarbit(var9); // L: 10981 - } - - if (var6 == 15) { // L: 10983 - var8 = 1; - } - - if (var6 == 16) { // L: 10984 - var8 = 2; - } - - if (var6 == 17) { // L: 10985 - var8 = 3; - } - - if (var6 == 18) { // L: 10986 - var7 = (GrandExchangeEvents.localPlayer.x >> 7) + GrandExchangeOfferOwnWorldComparator.baseX; - } - - if (var6 == 19) { // L: 10987 - var7 = (GrandExchangeEvents.localPlayer.y >> 7) + VarcInt.baseY; - } - - if (var6 == 20) { // L: 10988 - var7 = var2[var4++]; - } - - if (var8 == 0) { // L: 10989 - if (var5 == 0) { // L: 10990 - var3 += var7; - } - - if (var5 == 1) { // L: 10991 - var3 -= var7; - } - - if (var5 == 2 && var7 != 0) { // L: 10992 - var3 /= var7; - } - - if (var5 == 3) { // L: 10993 - var3 *= var7; - } - - var5 = 0; // L: 10994 - } else { - var5 = var8; // L: 10996 - } - } - } catch (Exception var14) { // L: 10999 - return -1; // L: 11000 - } + static final boolean method6702(char var0) { + if (Character.isISOControl(var0)) { // L: 16 + return false; + } else if (class78.isAlphaNumeric(var0)) { // L: 17 + return true; } else { - return -2; - } - } + char[] var1 = class424.field4621; // L: 19 - @ObfuscatedName("mn") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1931509382" - ) - static boolean method6889() { - return class131.clientPreferences.method2249() >= Client.field617; // L: 12661 + 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; + } + } + + var1 = class424.field4623; // L: 26 + + for (var2 = 0; var2 < var1.length; ++var2) { // L: 27 + var3 = var1[var2]; // L: 28 + if (var0 == var3) { // L: 29 + return true; + } + } + + return false; // L: 32 + } } } diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java index 525aa19ec9..dbd0a3076f 100644 --- a/runescape-client/src/main/java/ByteArrayNode.java +++ b/runescape-client/src/main/java/ByteArrayNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ol") +@ObfuscatedName("oc") @Implements("ByteArrayNode") public class ByteArrayNode extends Node { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("byteArray") public byte[] byteArray; diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index 22145e2fa6..8b6ec000fa 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -6,94 +6,98 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("my") +@ObfuscatedName("mk") @Implements("ByteArrayPool") public class ByteArrayPool { - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 2043697785 + intValue = -88837057 ) @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1060831441 + intValue = 1039424223 ) @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1175962597 + intValue = 1336676741 ) @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1771611339 + intValue = -1169134273 ) - static int field4163; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -321282309 - ) - static int field4159; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -178630953 - ) - static int field4160; + static int field4217; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -308081175 + intValue = -957559945 ) - static int field4161; - @ObfuscatedName("p") + static int field4210; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 889627885 + intValue = 1701731071 ) - static int field4152; + static int field4219; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 1660116295 + ) + static int field4220; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 1383703933 + ) + static int field4221; @ObfuscatedName("w") @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; - @ObfuscatedName("k") + @ObfuscatedName("b") @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; - @ObfuscatedName("d") + @ObfuscatedName("t") @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; - @ObfuscatedName("m") - static byte[][] field4162; - @ObfuscatedName("x") - static ArrayList field4167; - @ObfuscatedName("mh") - @ObfuscatedGetter( - intValue = 1658529089 - ) - @Export("menuHeight") - static int menuHeight; + @ObfuscatedName("g") + static byte[][] field4225; + @ObfuscatedName("h") + static ArrayList field4212; static { ByteArrayPool_smallCount = 0; // L: 13 ByteArrayPool_mediumCount = 0; // L: 14 ByteArrayPool_largeCount = 0; // L: 15 - field4163 = 0; // L: 16 - field4159 = 1000; // L: 17 - field4160 = 250; // L: 18 - field4161 = 100; // L: 19 - field4152 = 50; // L: 20 + field4217 = 0; // L: 16 + field4210 = 1000; // L: 17 + field4219 = 250; // L: 18 + field4220 = 100; // L: 19 + field4221 = 50; // L: 20 ByteArrayPool_small = new byte[1000][]; // L: 21 ByteArrayPool_medium = new byte[250][]; // L: 22 ByteArrayPool_large = new byte[100][]; // L: 23 - field4162 = new byte[50][]; // L: 24 - field4167 = new ArrayList(); // L: 28 - Login.method1960(); // L: 31 + field4225 = new byte[50][]; + field4212 = new ArrayList(); // L: 28 + LoginScreenAnimation.method2217(); // L: 31 new HashMap(); } // L: 36 - @ObfuscatedName("i") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IZB)[B", - garbageValue = "-82" + descriptor = "(IB)F", + garbageValue = "1" + ) + public static float method6364(int var0) { + var0 &= 16383; // L: 24 + return (float)(6.283185307179586D * (double)((float)var0 / 16384.0F)); // L: 25 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IZI)[B", + garbageValue = "957663499" ) @Export("ByteArrayPool_getArrayBool") static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { @@ -128,20 +132,20 @@ public class ByteArrayPool { if (var0 != 30000) { // L: 85 if (var0 < 30000) { } - } else if (field4163 > 0) { - var4 = field4162[--field4163]; // L: 86 - field4162[field4163] = null; // L: 87 + } else if (field4217 > 0) { + var4 = field4225[--field4217]; // L: 86 + field4225[field4217] = null; // L: 87 return var4; // L: 88 } - if (BoundaryObject.ByteArrayPool_arrays != null) { // L: 90 - for (int var2 = 0; var2 < FloorOverlayDefinition.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 91 - if (FloorOverlayDefinition.ByteArrayPool_alternativeSizes[var2] != var0) { // L: 92 - if (var0 < FloorOverlayDefinition.ByteArrayPool_alternativeSizes[var2]) { + if (class131.ByteArrayPool_arrays != null) { // L: 90 + for (int var2 = 0; var2 < FileSystem.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 91 + if (FileSystem.ByteArrayPool_alternativeSizes[var2] != var0) { // L: 92 + if (var0 < FileSystem.ByteArrayPool_alternativeSizes[var2]) { } - } else if (class128.ByteArrayPool_altSizeArrayCounts[var2] > 0) { - byte[] var3 = BoundaryObject.ByteArrayPool_arrays[var2][--class128.ByteArrayPool_altSizeArrayCounts[var2]]; // L: 93 - BoundaryObject.ByteArrayPool_arrays[var2][class128.ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 94 + } else if (GrandExchangeEvents.ByteArrayPool_altSizeArrayCounts[var2] > 0) { + byte[] var3 = class131.ByteArrayPool_arrays[var2][--GrandExchangeEvents.ByteArrayPool_altSizeArrayCounts[var2]]; // L: 93 + class131.ByteArrayPool_arrays[var2][GrandExchangeEvents.ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 94 return var3; // L: 95 } } @@ -150,19 +154,37 @@ public class ByteArrayPool { return new byte[var0]; // L: 108 } - @ObfuscatedName("it") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1492106780" + descriptor = "(I)Lqr;", + garbageValue = "1594784812" ) - @Export("addCancelMenuEntry") - static void addCancelMenuEntry() { - Client.menuOptionsCount = 0; // L: 8607 - Client.isMenuOpen = false; // L: 8608 - Client.menuActions[0] = "Cancel"; // L: 8610 - Client.menuTargets[0] = ""; // L: 8611 - Client.menuOpcodes[0] = 1006; // L: 8612 - Client.menuShiftClick[0] = false; // L: 8613 - Client.menuOptionsCount = 1; // L: 8614 - } // L: 8615 + static SpritePixels method6365() { + SpritePixels var0 = new SpritePixels(); // L: 149 + var0.width = class453.SpriteBuffer_spriteWidth; // L: 150 + var0.height = class453.SpriteBuffer_spriteHeight; // L: 151 + var0.xOffset = class453.SpriteBuffer_xOffsets[0]; // L: 152 + var0.yOffset = class453.SpriteBuffer_yOffsets[0]; // L: 153 + var0.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[0]; // L: 154 + var0.subHeight = class453.SpriteBuffer_spriteHeights[0]; // L: 155 + int var1 = var0.subHeight * var0.subWidth; // L: 156 + byte[] var2 = class127.SpriteBuffer_pixels[0]; // L: 157 + var0.pixels = new int[var1]; // L: 158 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 159 + var0.pixels[var3] = Decimator.SpriteBuffer_spritePalette[var2[var3] & 255]; + } + + VarcInt.method3325(); // L: 160 + return var0; // L: 161 + } + + @ObfuscatedName("hi") + @ObfuscatedSignature( + descriptor = "(Lcx;II)V", + garbageValue = "-376973471" + ) + static final void method6357(Actor var0, int var1) { + AbstractWorldMapIcon.worldToScreen(var0.x, var0.y, var1); // L: 5456 + } // L: 5457 } diff --git a/runescape-client/src/main/java/Calendar.java b/runescape-client/src/main/java/Calendar.java index 41fa7ccd10..8d67bf46b5 100644 --- a/runescape-client/src/main/java/Calendar.java +++ b/runescape-client/src/main/java/Calendar.java @@ -3,24 +3,20 @@ 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("ja") +@ObfuscatedName("jz") @Implements("Calendar") public class Calendar { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("MONTH_NAMES_ENGLISH_GERMAN") public static final String[][] MONTH_NAMES_ENGLISH_GERMAN; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("DAYS_OF_THE_WEEK") public static final String[] DAYS_OF_THE_WEEK; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("Calendar_calendar") public static java.util.Calendar Calendar_calendar; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lex;" - ) - static ClanSettings field3269; 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: 8 @@ -29,110 +25,164 @@ public class Calendar { Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); // L: 23 } // L: 24 - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IILgt;Lgv;I)Z", - garbageValue = "-692039603" + descriptor = "(II)Lfc;", + garbageValue = "-1123951030" ) - public static final boolean method5507(int var0, int var1, RouteStrategy var2, CollisionMap var3) { - int var4 = var0; // L: 111 - int var5 = var1; // L: 112 - byte var6 = 64; // L: 113 - byte var7 = 64; // L: 114 - int var8 = var0 - var6; // L: 115 - int var9 = var1 - var7; // L: 116 - class194.directions[var6][var7] = 99; // L: 117 - class194.distances[var6][var7] = 0; // L: 118 - byte var10 = 0; // L: 119 - int var11 = 0; // L: 120 - class194.bufferX[var10] = var0; // L: 121 - byte var10001 = var10; - int var18 = var10 + 1; - class194.bufferY[var10001] = var1; // L: 122 - int[][] var12 = var3.flags; // L: 123 - - while (var18 != var11) { // L: 124 - var4 = class194.bufferX[var11]; // L: 125 - var5 = class194.bufferY[var11]; // L: 126 - var11 = var11 + 1 & 4095; // L: 127 - int var16 = var4 - var8; // L: 128 - int var17 = var5 - var9; // L: 129 - int var13 = var4 - var3.xInset; // L: 130 - int var14 = var5 - var3.yInset; // L: 131 - if (var2.hasArrived(2, var4, var5, var3)) { // L: 132 - HealthBarUpdate.field1189 = var4; // L: 133 - StructComposition.field1988 = var5; // L: 134 - return true; // L: 135 + @Export("getEnum") + public static EnumComposition getEnum(int var0) { + EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 25 + if (var1 != null) { // L: 26 + return var1; + } else { + byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); // L: 27 + var1 = new EnumComposition(); // L: 28 + if (var2 != null) { // L: 29 + var1.decode(new Buffer(var2)); } - int var15 = class194.distances[var16][var17] + 1; // L: 137 - if (var16 > 0 && class194.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { // L: 138 139 140 141 - class194.bufferX[var18] = var4 - 1; // L: 142 - class194.bufferY[var18] = var5; // L: 143 - var18 = var18 + 1 & 4095; // L: 144 - class194.directions[var16 - 1][var17] = 2; // L: 145 - class194.distances[var16 - 1][var17] = var15; // L: 146 - } + EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 30 + return var1; // L: 31 + } + } - if (var16 < 126 && class194.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { // L: 148 149 150 151 - class194.bufferX[var18] = var4 + 1; // L: 152 - class194.bufferY[var18] = var5; // L: 153 - var18 = var18 + 1 & 4095; // L: 154 - class194.directions[var16 + 1][var17] = 8; // L: 155 - class194.distances[var16 + 1][var17] = var15; // L: 156 - } - - if (var17 > 0 && class194.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { // L: 158 159 160 161 - class194.bufferX[var18] = var4; // L: 162 - class194.bufferY[var18] = var5 - 1; // L: 163 - var18 = var18 + 1 & 4095; // L: 164 - class194.directions[var16][var17 - 1] = 1; // L: 165 - class194.distances[var16][var17 - 1] = var15; // L: 166 - } - - if (var17 < 126 && class194.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { // L: 168 169 170 171 - class194.bufferX[var18] = var4; // L: 172 - class194.bufferY[var18] = var5 + 1; // L: 173 - var18 = var18 + 1 & 4095; // L: 174 - class194.directions[var16][var17 + 1] = 4; // L: 175 - class194.distances[var16][var17 + 1] = var15; // L: 176 - } - - if (var16 > 0 && var17 > 0 && class194.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: 178 179 180 181 182 - class194.bufferX[var18] = var4 - 1; // L: 183 - class194.bufferY[var18] = var5 - 1; // L: 184 - var18 = var18 + 1 & 4095; // L: 185 - class194.directions[var16 - 1][var17 - 1] = 3; // L: 186 - class194.distances[var16 - 1][var17 - 1] = var15; // L: 187 - } - - if (var16 < 126 && var17 > 0 && class194.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: 189 190 191 192 193 - class194.bufferX[var18] = var4 + 1; // L: 194 - class194.bufferY[var18] = var5 - 1; // L: 195 - var18 = var18 + 1 & 4095; // L: 196 - class194.directions[var16 + 1][var17 - 1] = 9; // L: 197 - class194.distances[var16 + 1][var17 - 1] = var15; // L: 198 - } - - if (var16 > 0 && var17 < 126 && class194.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: 200 201 202 203 204 - class194.bufferX[var18] = var4 - 1; // L: 205 - class194.bufferY[var18] = var5 + 1; // L: 206 - var18 = var18 + 1 & 4095; // L: 207 - class194.directions[var16 - 1][var17 + 1] = 6; // L: 208 - class194.distances[var16 - 1][var17 + 1] = var15; // L: 209 - } - - if (var16 < 126 && var17 < 126 && class194.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: 211 212 213 214 215 - class194.bufferX[var18] = var4 + 1; // L: 216 - class194.bufferY[var18] = var5 + 1; // L: 217 - var18 = var18 + 1 & 4095; // L: 218 - class194.directions[var16 + 1][var17 + 1] = 12; // L: 219 - class194.distances[var16 + 1][var17 + 1] = var15; // L: 220 - } + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(ILbb;ZB)I", + garbageValue = "73" + ) + static int method5349(int var0, Script var1, boolean var2) { + boolean var3 = true; // L: 858 + Widget var4; + if (var0 >= 2000) { // L: 860 + var0 -= 1000; // L: 861 + var4 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 862 + var3 = false; // L: 863 + } else { + var4 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 865 } - HealthBarUpdate.field1189 = var4; // L: 223 - StructComposition.field1988 = var5; // L: 224 - return false; // L: 225 + int var11; + if (var0 == ScriptOpcodes.CC_SETOP) { // L: 866 + var11 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] - 1; // L: 867 + if (var11 >= 0 && var11 <= 9) { // L: 868 + var4.setAction(var11, Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]); // L: 872 + return 1; // L: 873 + } else { + --class9.Interpreter_stringStackSize; // L: 869 + return 1; // L: 870 + } + } else { + int var6; + if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 875 + class12.Interpreter_intStackSize -= 2; // L: 876 + var11 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 877 + var6 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 878 + var4.parent = ApproximateRouteStrategy.getWidgetChild(var11, var6); // L: 879 + return 1; // L: 880 + } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 882 + var4.isScrollBar = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 883 + return 1; // L: 884 + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 886 + var4.dragZoneSize = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 887 + return 1; // L: 888 + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 890 + var4.dragThreshold = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 891 + return 1; // L: 892 + } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 894 + var4.dataText = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 895 + return 1; // L: 896 + } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 898 + var4.spellActionName = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 899 + return 1; // L: 900 + } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 902 + var4.actions = null; // L: 903 + return 1; // L: 904 + } else if (var0 == 1308) { // L: 906 + var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 907 + return 1; // L: 908 + } else if (var0 == 1309) { // L: 910 + --class12.Interpreter_intStackSize; // L: 911 + return 1; // L: 912 + } else { + int var7; + byte[] var8; + if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 914 + byte var5; + if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 944 + class12.Interpreter_intStackSize -= 2; // L: 945 + var5 = 10; // L: 946 + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]}; // L: 947 + byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]}; // L: 948 + class363.Widget_setKey(var4, var5, var8, var9); // L: 949 + return 1; // L: 950 + } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 952 + class12.Interpreter_intStackSize -= 3; // L: 953 + var11 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] - 1; // L: 954 + var6 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 955 + var7 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 956 + if (var11 >= 0 && var11 <= 9) { // L: 957 + class152.Widget_setKeyRate(var4, var11, var6, var7); // L: 960 + return 1; // L: 961 + } else { + throw new RuntimeException(); // L: 958 + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 963 + var5 = 10; // L: 964 + var6 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 965 + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 966 + class152.Widget_setKeyRate(var4, var5, var6, var7); // L: 967 + return 1; // L: 968 + } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 970 + --class12.Interpreter_intStackSize; // L: 971 + var11 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] - 1; // L: 972 + if (var11 >= 0 && var11 <= 9) { // L: 973 + Script.Widget_setKeyIgnoreHeld(var4, var11); // L: 976 + return 1; // L: 977 + } else { + throw new RuntimeException(); // L: 974 + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 979 + var5 = 10; // L: 980 + Script.Widget_setKeyIgnoreHeld(var4, var5); // L: 981 + return 1; // L: 982 + } else { + return 2; // L: 984 + } + } else { + byte[] var10 = null; // L: 915 + var8 = null; // L: 916 + if (var3) { // L: 917 + class12.Interpreter_intStackSize -= 10; // L: 918 + + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + class12.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 920 921 + } + + if (var7 > 0) { // L: 923 + var10 = new byte[var7 / 2]; // L: 924 + var8 = new byte[var7 / 2]; // L: 925 + + for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 926 + var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class12.Interpreter_intStackSize]; // L: 927 + var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class12.Interpreter_intStackSize + 1]; // L: 928 + } + } + } else { + class12.Interpreter_intStackSize -= 2; // L: 933 + var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]}; // L: 934 + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]}; // L: 935 + } + + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] - 1; // L: 937 + if (var7 >= 0 && var7 <= 9) { // L: 938 + class363.Widget_setKey(var4, var7, var10, var8); // L: 941 + return 1; // L: 942 + } else { + throw new RuntimeException(); // L: 939 + } + } + } + } } } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index b4f6e840f1..8bdb7fc180 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -5,16 +5,16 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("h") +@ObfuscatedName("u") @Implements("Canvas") public final class Canvas extends java.awt.Canvas { - @ObfuscatedName("im") + @ObfuscatedName("lf") @ObfuscatedSignature( - descriptor = "Lqi;" + descriptor = "Lki;" ) - @Export("redHintArrowSprite") - static SpritePixels redHintArrowSprite; - @ObfuscatedName("v") + @Export("dragInventoryWidget") + static Widget dragInventoryWidget; + @ObfuscatedName("o") @Export("component") Component component; @@ -30,21 +30,23 @@ public final class Canvas extends java.awt.Canvas { this.component.paint(var1); // L: 19 } // L: 20 - @ObfuscatedName("v") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lln;I)V", - garbageValue = "-1197200273" + descriptor = "(Ljava/lang/CharSequence;II)I", + garbageValue = "-989845700" ) - public static void method357(AbstractArchive var0) { - EnumComposition.EnumDefinition_archive = var0; // L: 25 - } // L: 26 + public static int method344(CharSequence var0, int var1) { + return class202.method4016(var0, var1, true); // L: 72 + } - @ObfuscatedName("o") + @ObfuscatedName("lr") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "209833748" + descriptor = "(IB)V", + garbageValue = "-35" ) - static final void method359(String var0) { - class149.method3138("Please remove " + var0 + " from your ignore list first"); // L: 106 - } // L: 107 + static void method347(int var0) { + if (var0 != Client.loginState) { // L: 12714 + Client.loginState = var0; // L: 12715 + } + } // L: 12716 } diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index 5108c6980b..d94ed19f39 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -3,111 +3,175 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; -@ObfuscatedName("bp") +@ObfuscatedName("by") @Implements("ChatChannel") public class ChatChannel { @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -2004549905 + ) + static int field973; + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "[Lbe;" + descriptor = "Lne;" + ) + static Bounds field976; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lne;" + ) + static Bounds field977; + @ObfuscatedName("hl") + @ObfuscatedSignature( + descriptor = "Lmx;" + ) + @Export("fontBold12") + static Font fontBold12; + @ObfuscatedName("ii") + @ObfuscatedSignature( + descriptor = "[Lqr;" + ) + @Export("headIconPrayerSprites") + static SpritePixels[] headIconPrayerSprites; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "[Lbo;" ) @Export("messages") Message[] messages; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 417639835 + intValue = -247324107 ) @Export("count") int count; ChatChannel() { - this.messages = new Message[100]; // L: 95 - } // L: 98 + this.messages = new Message[100]; // L: 72 + } // L: 75 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbe;", - garbageValue = "1370316995" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbo;", + garbageValue = "54" ) @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { - Message var5 = this.messages[99]; // L: 101 + Message var5 = this.messages[99]; // L: 78 - for (int var6 = this.count; var6 > 0; --var6) { // L: 102 - if (var6 != 100) { // L: 103 - this.messages[var6] = this.messages[var6 - 1]; // L: 104 + for (int var6 = this.count; var6 > 0; --var6) { // L: 79 + if (var6 != 100) { // L: 80 + this.messages[var6] = this.messages[var6 - 1]; // L: 81 } } - if (var5 == null) { // L: 106 + if (var5 == null) { // L: 83 var5 = new Message(var1, var2, var4, var3); } else { - var5.remove(); // L: 108 - var5.removeDual(); // L: 109 - var5.set(var1, var2, var4, var3); // L: 110 + var5.remove(); // L: 85 + var5.removeDual(); // L: 86 + var5.set(var1, var2, var4, var3); // L: 87 } - this.messages[0] = var5; // L: 112 - if (this.count < 100) { // L: 113 + this.messages[0] = var5; // L: 89 + if (this.count < 100) { // L: 90 ++this.count; } - return var5; // L: 114 + return var5; // L: 91 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IB)Lbe;", - garbageValue = "-53" + descriptor = "(II)Lbo;", + garbageValue = "-345084723" ) @Export("getMessage") Message getMessage(int var1) { - return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 118 119 + return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 95 96 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "5" + descriptor = "(I)I", + garbageValue = "-2082093822" ) @Export("size") int size() { - return this.count; // L: 123 + return this.count; // L: 100 } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1242212689" + descriptor = "(IB)Z", + garbageValue = "-17" ) - @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 + public static boolean method1968(int var0) { + return var0 >= WorldMapDecorationType.field3562.id && var0 <= WorldMapDecorationType.field3577.id; // L: 47 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lorg/json/JSONObject;Ljava/lang/String;I)[F", + garbageValue = "-1029057430" + ) + static float[] method1965(JSONObject var0, String var1) throws JSONException { + float[] var2 = new float[4]; // L: 279 + + try { + JSONArray var3 = var0.getJSONArray(var1); // L: 281 + var2[0] = (float)var3.optDouble(0, 0.0D); // L: 282 + var2[1] = (float)var3.optDouble(1, 0.0D); // L: 283 + var2[2] = (float)var3.optDouble(2, 1.0D); // L: 284 + var2[3] = (float)var3.optDouble(3, 1.0D); // L: 285 + } catch (JSONException var4) { // L: 287 + var2[0] = 0.0F; // L: 288 + var2[1] = 0.0F; // L: 289 + var2[2] = 1.0F; // L: 290 + var2[3] = 1.0F; // L: 291 } - if (var4.ids.length <= var1) { // L: 44 - int[] var5 = new int[var1 + 1]; // L: 45 - int[] var6 = new int[var1 + 1]; // L: 46 + return var2; // L: 293 + } - 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("ju") + @ObfuscatedSignature( + descriptor = "(Lki;III)V", + garbageValue = "-1619686813" + ) + @Export("alignWidgetPosition") + static void alignWidgetPosition(Widget var0, int var1, int var2) { + if (var0.xAlignment == 0) { // L: 10816 + var0.x = var0.rawX; + } else if (var0.xAlignment == 1) { // L: 10817 + var0.x = var0.rawX + (var1 - var0.width) / 2; + } else if (var0.xAlignment == 2) { // L: 10818 + var0.x = var1 - var0.width - var0.rawX; + } else if (var0.xAlignment == 3) { // L: 10819 + var0.x = var0.rawX * var1 >> 14; + } else if (var0.xAlignment == 4) { // L: 10820 + var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2; + } else { + var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 10821 } - var4.ids[var1] = var2; // L: 58 - var4.quantities[var1] = var3; // L: 59 - } // L: 60 + if (var0.yAlignment == 0) { // L: 10822 + var0.y = var0.rawY; + } else if (var0.yAlignment == 1) { // L: 10823 + var0.y = (var2 - var0.height) / 2 + var0.rawY; + } else if (var0.yAlignment == 2) { // L: 10824 + var0.y = var2 - var0.height - var0.rawY; + } else if (var0.yAlignment == 3) { + var0.y = var2 * var0.rawY >> 14; // L: 10825 + } else if (var0.yAlignment == 4) { // L: 10826 + var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14); + } else { + var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 10827 + } + + } // L: 10828 } diff --git a/runescape-client/src/main/java/ClanChannel.java b/runescape-client/src/main/java/ClanChannel.java index 3cc3c28718..9950d5c07d 100644 --- a/runescape-client/src/main/java/ClanChannel.java +++ b/runescape-client/src/main/java/ClanChannel.java @@ -7,504 +7,165 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ea") +@ObfuscatedName("et") @Implements("ClanChannel") public class ClanChannel extends Node { - @ObfuscatedName("v") - boolean field1653; - @ObfuscatedName("c") - boolean field1658; - @ObfuscatedName("i") + @ObfuscatedName("o") + boolean field1712; + @ObfuscatedName("q") + boolean field1705; + @ObfuscatedName("l") @Export("members") public List members; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("sortedMembers") int[] sortedMembers; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - longValue = -6213414464527549047L + longValue = 1835319440432000381L ) - long field1656; - @ObfuscatedName("n") + long field1709; + @ObfuscatedName("m") @Export("name") public String name; + @ObfuscatedName("p") + public byte field1711; @ObfuscatedName("s") - public byte field1654; - @ObfuscatedName("l") - public byte field1659; + public byte field1706; static { new BitSet(65536); // L: 22 } // L: 23 @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpx;)V" ) public ClanChannel(Buffer var1) { - this.field1658 = true; // L: 13 + this.field1705 = true; // L: 13 this.name = null; // L: 17 - this.method3117(var1); - } + this.method3010(var1); // L: 26 + } // L: 27 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)[I", - garbageValue = "-75" + garbageValue = "57" ) @Export("getSortedMembers") public int[] getSortedMembers() { - if (this.sortedMembers == null) { + if (this.sortedMembers == null) { // L: 30 String[] var1 = new String[this.members.size()]; // L: 31 - this.sortedMembers = new int[this.members.size()]; + this.sortedMembers = new int[this.members.size()]; // L: 32 - for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) { // L: 35 - var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method8243(); + for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) { // L: 33 35 + var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method8148(); // L: 34 } - int[] var3 = this.sortedMembers; // L: 37 - class433.method7605(var1, var3, 0, var1.length - 1); // L: 39 + class113.method2625(var1, this.sortedMembers); // L: 37 } - return this.sortedMembers; // L: 42 + return this.sortedMembers; // L: 39 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lec;B)V", - garbageValue = "6" + descriptor = "(Lem;I)V", + garbageValue = "42890757" ) @Export("addMember") void addMember(ClanChannelMember var1) { - this.members.add(var1); // L: 46 - this.sortedMembers = null; // L: 47 - } // L: 48 + this.members.add(var1); // L: 43 + this.sortedMembers = null; // L: 44 + } // L: 45 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-911825702" + garbageValue = "2089960192" ) @Export("removeMember") void removeMember(int var1) { - this.members.remove(var1); // L: 51 - this.sortedMembers = null; // L: 52 - } // L: 53 + this.members.remove(var1); // L: 48 + this.sortedMembers = null; // L: 49 + } // L: 50 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-251884744" + descriptor = "(B)I", + garbageValue = "41" ) - public int method3119() { - return this.members.size(); // L: 56 + public int method3005() { + return this.members.size(); // L: 53 } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)I", - garbageValue = "75" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "1345436984" ) - public int method3116(String var1) { - if (!this.field1658) { // L: 60 + public int method3023(String var1) { + if (!this.field1705) { // L: 57 throw new RuntimeException("Displaynames not available"); } else { - for (int var2 = 0; var2 < this.members.size(); ++var2) { // L: 61 + for (int var2 = 0; var2 < this.members.size(); ++var2) { // L: 58 if (((ClanChannelMember)this.members.get(var2)).username.getName().equalsIgnoreCase(var1)) { - return var2; // L: 62 + return var2; // L: 59 } } - return -1; // L: 64 + return -1; // L: 61 } } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lpi;S)V", - garbageValue = "-10005" + descriptor = "(Lpx;I)V", + garbageValue = "-423085826" ) - void method3117(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 68 - if ((var2 & 1) != 0) { // L: 69 - this.field1653 = true; + void method3010(Buffer var1) { + int var2 = var1.readUnsignedByte(); // L: 65 + if ((var2 & 1) != 0) { // L: 66 + this.field1712 = true; } - if ((var2 & 2) != 0) { // L: 70 - this.field1658 = true; + if ((var2 & 2) != 0) { // L: 67 + this.field1705 = true; } - int var3 = 2; // L: 71 - if ((var2 & 4) != 0) { // L: 72 + int var3 = 2; // L: 68 + if ((var2 & 4) != 0) { // L: 69 var3 = var1.readUnsignedByte(); } - super.key = var1.readLong(); // L: 73 - this.field1656 = var1.readLong(); // L: 74 - this.name = var1.readStringCp1252NullTerminated(); // L: 75 - var1.readBoolean(); // L: 76 - this.field1659 = var1.readByte(); // L: 77 - this.field1654 = var1.readByte(); // L: 78 - int var4 = var1.readUnsignedShort(); // L: 79 - if (var4 > 0) { // L: 80 - this.members = new ArrayList(var4); // L: 81 + super.key = var1.readLong(); // L: 70 + this.field1709 = var1.readLong(); // L: 71 + this.name = var1.readStringCp1252NullTerminated(); // L: 72 + var1.readBoolean(); // L: 73 + this.field1706 = var1.readByte(); // L: 74 + this.field1711 = var1.readByte(); // L: 75 + int var4 = var1.readUnsignedShort(); // L: 76 + if (var4 > 0) { // L: 77 + this.members = new ArrayList(var4); // L: 78 - for (int var5 = 0; var5 < var4; ++var5) { // L: 82 - ClanChannelMember var6 = new ClanChannelMember(); // L: 83 - if (this.field1653) { // L: 84 - var1.readLong(); // L: 85 + for (int var5 = 0; var5 < var4; ++var5) { // L: 79 + ClanChannelMember var6 = new ClanChannelMember(); // L: 80 + if (this.field1712) { // L: 81 + var1.readLong(); // L: 82 } - if (this.field1658) { // L: 87 + if (this.field1705) { // L: 84 var6.username = new Username(var1.readStringCp1252NullTerminated()); } - var6.rank = var1.readByte(); // L: 88 - var6.world = var1.readUnsignedShort(); // L: 89 - if (var3 >= 3) { // L: 90 - var1.readBoolean(); // L: 91 + var6.rank = var1.readByte(); // L: 85 + var6.world = var1.readUnsignedShort(); // L: 86 + if (var3 >= 3) { // L: 87 + var1.readBoolean(); // L: 88 } - this.members.add(var5, var6); // L: 94 + this.members.add(var5, var6); // L: 91 } } - } // L: 97 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IB)Lbd;", - garbageValue = "-23" - ) - @Export("getScript") - static Script getScript(int var0) { - Script var1 = (Script)Script.Script_cached.get((long)var0); // L: 26 - if (var1 != null) { // L: 27 - return var1; - } else { - byte[] var2 = class152.archive12.takeFile(var0, 0); // L: 28 - if (var2 == null) { // L: 29 - return null; // L: 30 - } else { - var1 = PcmPlayer.newScript(var2); // L: 32 - Script.Script_cached.put(var1, (long)var0); // L: 33 - return var1; // L: 34 - } - } - } - - @ObfuscatedName("ha") - @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "-1683816578" - ) - @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: 7800 - if (Client.isLowDetail && var0 != class18.Client_plane) { // L: 7801 - return; - } - - long var7 = 0L; // L: 7802 - boolean var9 = true; // L: 7803 - boolean var10 = false; // L: 7804 - boolean var11 = false; // L: 7805 - if (var1 == 0) { // L: 7806 - var7 = ArchiveLoader.scene.getBoundaryObjectTag(var0, var2, var3); - } - - if (var1 == 1) { // L: 7807 - var7 = ArchiveLoader.scene.getWallDecorationTag(var0, var2, var3); - } - - if (var1 == 2) { // L: 7808 - var7 = ArchiveLoader.scene.getGameObjectTag(var0, var2, var3); - } - - if (var1 == 3) { // L: 7809 - var7 = ArchiveLoader.scene.getFloorDecorationTag(var0, var2, var3); - } - - int var12; - if (var7 != 0L) { // L: 7810 - var12 = ArchiveLoader.scene.getObjectFlags(var0, var2, var3, var7); // L: 7811 - int var38 = FileSystem.Entity_unpackID(var7); // L: 7812 - int var39 = var12 & 31; // L: 7813 - int var40 = var12 >> 6 & 3; // L: 7814 - ObjectComposition var13; - if (var1 == 0) { // L: 7815 - ArchiveLoader.scene.removeBoundaryObject(var0, var2, var3); // L: 7816 - var13 = class146.getObjectDefinition(var38); // L: 7817 - if (var13.interactType != 0) { // L: 7818 - Client.collisionMaps[var0].method3853(var2, var3, var39, var40, var13.boolean1); - } - } - - if (var1 == 1) { // L: 7820 - ArchiveLoader.scene.removeWallDecoration(var0, var2, var3); - } - - if (var1 == 2) { // L: 7821 - ArchiveLoader.scene.removeGameObject(var0, var2, var3); // L: 7822 - var13 = class146.getObjectDefinition(var38); // L: 7823 - if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 7824 - return; - } - - if (var13.interactType != 0) { // L: 7825 - Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var40, var13.boolean1); - } - } - - if (var1 == 3) { // L: 7827 - ArchiveLoader.scene.removeFloorDecoration(var0, var2, var3); // L: 7828 - var13 = class146.getObjectDefinition(var38); // L: 7829 - if (var13.interactType == 1) { // L: 7830 - Client.collisionMaps[var0].method3847(var2, var3); - } - } - } - - if (var4 >= 0) { // L: 7833 - var12 = var0; // L: 7834 - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 7835 - var12 = var0 + 1; - } - - Scene var41 = ArchiveLoader.scene; // L: 7836 - CollisionMap var14 = Client.collisionMaps[var0]; // L: 7837 - ObjectComposition var15 = class146.getObjectDefinition(var4); // L: 7839 - int var16; - int var17; - if (var5 != 1 && var5 != 3) { // L: 7842 - var16 = var15.sizeX; // L: 7847 - var17 = var15.sizeY; // L: 7848 - } else { - var16 = var15.sizeY; // L: 7843 - var17 = var15.sizeX; // L: 7844 - } - - int var18; - int var19; - if (var16 + var2 <= 104) { // L: 7854 - var18 = (var16 >> 1) + var2; // L: 7855 - var19 = var2 + (var16 + 1 >> 1); // L: 7856 - } else { - var18 = var2; // L: 7859 - var19 = var2 + 1; // L: 7860 - } - - int var20; - int var21; - if (var3 + var17 <= 104) { // L: 7862 - var20 = var3 + (var17 >> 1); // L: 7863 - var21 = var3 + (var17 + 1 >> 1); // L: 7864 - } else { - var20 = var3; // L: 7867 - var21 = var3 + 1; // L: 7868 - } - - int[][] var22 = Tiles.Tiles_heights[var12]; // L: 7870 - int var23 = var22[var19][var20] + var22[var18][var20] + var22[var18][var21] + var22[var19][var21] >> 2; // L: 7871 - int var24 = (var2 << 7) + (var16 << 6); // L: 7872 - int var25 = (var3 << 7) + (var17 << 6); // L: 7873 - long var26 = GameObject.calculateTag(var2, var3, 2, var15.int1 == 0, var4); // L: 7874 - int var28 = (var5 << 6) + var6; // L: 7875 - if (var15.int3 == 1) { // L: 7876 - var28 += 256; - } - - Object var36; - if (var6 == 22) { // L: 7877 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7879 - var36 = var15.getModel(22, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7880 - } - - var41.newFloorDecoration(var0, var2, var3, var23, (Renderable)var36, var26, var28); // L: 7881 - if (var15.interactType == 1) { // L: 7882 - var14.setBlockedByFloorDec(var2, var3); - } - } else if (var6 != 10 && var6 != 11) { // L: 7885 - if (var6 >= 12) { // L: 7893 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7895 - var36 = var15.getModel(var6, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7896 - } - - var41.method4882(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7897 - if (var15.interactType != 0) { // L: 7898 - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); - } - } else if (var6 == 0) { // L: 7901 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7903 - var36 = var15.getModel(0, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7904 - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field990[var5], 0, var26, var28); // L: 7905 - if (var15.interactType != 0) { // L: 7906 - var14.method3872(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 1) { // L: 7909 - if (var15.animationId == -1 && var15.transforms == null) { - var36 = var15.getModel(1, var5, var22, var24, var23, var25); // L: 7911 - } else { - var36 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7912 - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field989[var5], 0, var26, var28); // L: 7913 - if (var15.interactType != 0) { // L: 7914 - var14.method3872(var2, var3, var6, var5, var15.boolean1); - } - } else { - int var29; - if (var6 == 2) { // L: 7917 - var29 = var5 + 1 & 3; // L: 7918 - Object var31; - Object var37; - if (var15.animationId == -1 && var15.transforms == null) { // L: 7921 - var37 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); // L: 7922 - var31 = var15.getModel(2, var29, var22, var24, var23, var25); // L: 7923 - } else { - var37 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7926 - var31 = new DynamicObject(var4, 2, var29, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7927 - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var37, (Renderable)var31, Tiles.field990[var5], Tiles.field990[var29], var26, var28); // L: 7929 - if (var15.interactType != 0) { // L: 7930 - var14.method3872(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 3) { // L: 7933 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7935 - var36 = var15.getModel(3, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7936 - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field989[var5], 0, var26, var28); // L: 7937 - if (var15.interactType != 0) { // L: 7938 - var14.method3872(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 9) { // L: 7941 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7943 - var36 = var15.getModel(var6, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7944 - } - - var41.method4882(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7945 - if (var15.interactType != 0) { // L: 7946 - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); - } - } else if (var6 == 4) { // L: 7949 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7951 - var36 = var15.getModel(4, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7952 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field990[var5], 0, 0, 0, var26, var28); // L: 7953 - } else { - long var30; - Object var32; - if (var6 == 5) { // L: 7956 - var29 = 16; // L: 7957 - var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7958 - if (0L != var30) { // L: 7959 - var29 = class146.getObjectDefinition(FileSystem.Entity_unpackID(var30)).int2; - } - - if (var15.animationId == -1 && var15.transforms == null) { // L: 7961 - var32 = var15.getModel(4, var5, var22, var24, var23, var25); - } else { - var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7962 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, Tiles.field990[var5], 0, var29 * Tiles.field992[var5], var29 * Tiles.field993[var5], var26, var28); // L: 7963 - } else if (var6 == 6) { // L: 7966 - var29 = 8; // L: 7967 - var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7968 - if (0L != var30) { // L: 7969 - var29 = class146.getObjectDefinition(FileSystem.Entity_unpackID(var30)).int2 / 2; - } - - if (var15.animationId == -1 && var15.transforms == null) { // L: 7971 - var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); - } else { - var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7972 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, 256, var5, var29 * Tiles.field997[var5], var29 * Tiles.field995[var5], var26, var28); // L: 7973 - } else if (var6 == 7) { // L: 7976 - int var35 = var5 + 2 & 3; // L: 7978 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7979 - var36 = var15.getModel(4, var35 + 4, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 4, var35 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7980 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, 256, var35, 0, 0, var26, var28); // L: 7981 - } else if (var6 == 8) { // L: 7984 - var29 = 8; // L: 7985 - var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7986 - if (var30 != 0L) { // L: 7987 - var29 = class146.getObjectDefinition(FileSystem.Entity_unpackID(var30)).int2 / 2; - } - - int var34 = var5 + 2 & 3; // L: 7990 - Object var33; - if (var15.animationId == -1 && var15.transforms == null) { // L: 7991 - var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); // L: 7992 - var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); // L: 7993 - } else { - var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7996 - var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7997 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)var33, 256, var5, var29 * Tiles.field997[var5], var29 * Tiles.field995[var5], var26, var28); // L: 7999 - } - } - } - } else { - if (var15.animationId == -1 && var15.transforms == null) { // L: 7887 - var36 = var15.getModel(10, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7888 - } - - if (var36 != null) { // L: 7889 - var41.method4882(var0, var2, var3, var23, var16, var17, (Renderable)var36, var6 == 11 ? 256 : 0, var26, var28); - } - - if (var15.interactType != 0) { // L: 7890 - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); - } - } - } - } - - } // L: 8004 - - @ObfuscatedName("lp") - @ObfuscatedSignature( - descriptor = "(IIZB)V", - garbageValue = "61" - ) - static final void method3137(int var0, int var1, boolean var2) { - if (Client.currentClanChannels[var0] != null) { // L: 12436 - if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method3119()) { // L: 12437 - ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 12438 - PacketBufferNode var4 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2967, Client.packetWriter.isaacCipher); // L: 12439 - var4.packetBuffer.writeByte(4 + class425.stringCp1252NullTerminatedByteSize(var3.username.getName())); // L: 12440 - var4.packetBuffer.writeByte(var0); // L: 12441 - var4.packetBuffer.writeShort(var1); // L: 12442 - var4.packetBuffer.writeBoolean(var2); // L: 12443 - var4.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); // L: 12444 - Client.packetWriter.addNode(var4); // L: 12445 - } - } - } // L: 12446 + } // L: 94 } diff --git a/runescape-client/src/main/java/ClanChannelMember.java b/runescape-client/src/main/java/ClanChannelMember.java index 1fd7026f01..69722c6dd2 100644 --- a/runescape-client/src/main/java/ClanChannelMember.java +++ b/runescape-client/src/main/java/ClanChannelMember.java @@ -4,21 +4,27 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ec") +@ObfuscatedName("em") @Implements("ClanChannelMember") public class ClanChannelMember { - @ObfuscatedName("v") + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Llp;" + ) + @Export("musicTrackArchive") + public static AbstractArchive musicTrackArchive; + @ObfuscatedName("o") @Export("rank") public byte rank; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -113610011 + intValue = -594954787 ) @Export("world") public int world; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lqb;" + descriptor = "Lqv;" ) @Export("username") public Username username; @@ -26,53 +32,22 @@ public class ClanChannelMember { ClanChannelMember() { } // L: 10 - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IB)Lfv;", - garbageValue = "111" - ) - public static HealthBarDefinition method2870(int var0) { - HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); // L: 37 - if (var1 != null) { // L: 38 - return var1; - } else { - byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); // L: 39 - var1 = new HealthBarDefinition(); // L: 40 - if (var2 != null) { // L: 41 - var1.decode(new Buffer(var2)); - } - - HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); // L: 42 - return var1; // L: 43 - } - } - @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-704026744" + descriptor = "(IB)I", + garbageValue = "98" ) - public static int method2869(int var0) { - if (var0 > 0) { // L: 182 - return 1; - } else { - return var0 < 0 ? -1 : 0; // L: 183 184 - } + public static int method2819(int var0) { + return ScriptEvent.method2085(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 64 } - @ObfuscatedName("fc") + @ObfuscatedName("gc") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(B)I", + garbageValue = "-113" ) - static final void method2868() { - if (Client.logoutTimer > 0) { // L: 2967 - ItemLayer.logOut(); // L: 2968 - } else { - Client.timer.method6562(); // L: 2971 - Decimator.updateGameState(40); // L: 2972 - ModeWhere.field4073 = Client.packetWriter.getSocket(); // L: 2973 - Client.packetWriter.removeSocket(); // L: 2974 - } - } // L: 2969 2975 + @Export("getWindowedMode") + static int getWindowedMode() { + return Client.isResizable ? 2 : 1; // L: 4341 + } } diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index c5e2fc7045..26647c883e 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ne") +@ObfuscatedName("nm") @Implements("ClanMate") public class ClanMate extends Buddy { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnq;" ) @Export("friend") TriBool friend; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnq;" ) @Export("ignored") TriBool ignored; @@ -24,20 +24,20 @@ public class ClanMate extends Buddy { this.ignored = TriBool.TriBool_unknown; // L: 7 } // L: 9 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "131518086" + garbageValue = "-990800587" ) @Export("clearIsFriend") void clearIsFriend() { this.friend = TriBool.TriBool_unknown; // L: 12 } // L: 13 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1955315992" + garbageValue = "-107862662" ) @Export("isFriend") public final boolean isFriend() { @@ -48,30 +48,30 @@ public class ClanMate extends Buddy { return this.friend == TriBool.TriBool_true; // L: 19 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1874980316" + garbageValue = "1082249344" ) @Export("fillIsFriend") void fillIsFriend() { - this.friend = Decimator.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23 + this.friend = BufferedSource.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23 } // L: 24 - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-23167" + descriptor = "(B)V", + garbageValue = "25" ) @Export("clearIsIgnored") void clearIsIgnored() { this.ignored = TriBool.TriBool_unknown; // L: 27 } // L: 28 - @ObfuscatedName("q") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" + descriptor = "(I)Z", + garbageValue = "2107172617" ) @Export("isIgnored") public final boolean isIgnored() { @@ -82,527 +82,13 @@ public class ClanMate extends Buddy { return this.ignored == TriBool.TriBool_true; // L: 34 } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "374210417" + descriptor = "(B)V", + garbageValue = "-45" ) @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = Decimator.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38 + this.ignored = BufferedSource.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38 } // L: 39 - - @ObfuscatedName("hg") - @ObfuscatedSignature( - descriptor = "(Ljp;I)V", - garbageValue = "1119895393" - ) - static final void method6700(class263 var0) { - PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 7425 - int var2; - int var3; - int var4; - int var5; - int var6; - int var7; - int var8; - if (class263.field3012 == var0) { // L: 7426 - var2 = var1.method7742(); // L: 7427 - var3 = (var2 >> 4 & 7) + PlayerComposition.field3307; // L: 7428 - var4 = (var2 & 7) + class29.field181; // L: 7429 - var5 = var1.readUnsignedByte(); // L: 7430 - var6 = var5 >> 2; // L: 7431 - var7 = var5 & 3; // L: 7432 - var8 = Client.field748[var6]; // L: 7433 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7434 - GrandExchangeOfferWorldComparator.updatePendingSpawn(class18.Client_plane, var3, var4, var8, -1, var6, var7, 0, -1); // L: 7435 - } - - } else { - int var9; - int var10; - if (class263.field3006 == var0) { // L: 7439 - var2 = var1.method7742(); // L: 7440 - var3 = var1.method7875(); // L: 7441 - var4 = (var3 >> 4 & 7) + PlayerComposition.field3307; // L: 7442 - var5 = (var3 & 7) + class29.field181; // L: 7443 - var6 = var1.method7742(); // L: 7444 - var7 = var6 >> 4 & 15; // L: 7445 - var8 = var6 & 7; // L: 7446 - var9 = var1.method7713(); // L: 7447 - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7448 - var10 = var7 + 1; // L: 7449 - if (GrandExchangeEvents.localPlayer.pathX[0] >= var4 - var10 && GrandExchangeEvents.localPlayer.pathX[0] <= var10 + var4 && GrandExchangeEvents.localPlayer.pathY[0] >= var5 - var10 && GrandExchangeEvents.localPlayer.pathY[0] <= var10 + var5 && class131.clientPreferences.method2270() != 0 && var8 > 0 && Client.soundEffectCount < 50) { // L: 7450 7451 - Client.soundEffectIds[Client.soundEffectCount] = var9; // L: 7452 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; // L: 7453 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 7454 - Client.soundEffects[Client.soundEffectCount] = null; // L: 7455 - Client.soundLocations[Client.soundEffectCount] = var7 + (var5 << 8) + (var4 << 16); // L: 7456 - ++Client.soundEffectCount; // L: 7457 - } - } - } - - TileItem var31; - if (class263.field3009 == var0) { // L: 7462 - var2 = var1.method7875(); // L: 7463 - var3 = (var2 >> 4 & 7) + PlayerComposition.field3307; // L: 7464 - var4 = (var2 & 7) + class29.field181; // L: 7465 - var5 = var1.method7714(); // L: 7466 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7467 - NodeDeque var36 = Client.groundItems[class18.Client_plane][var3][var4]; // L: 7468 - if (var36 != null) { // L: 7469 - for (var31 = (TileItem)var36.last(); var31 != null; var31 = (TileItem)var36.previous()) { // L: 7470 7471 7476 - if ((var5 & 32767) == var31.id) { // L: 7472 - var31.remove(); // L: 7473 - break; - } - } - - if (var36.last() == null) { // L: 7478 - Client.groundItems[class18.Client_plane][var3][var4] = null; - } - - UserComparator3.updateItemPile(var3, var4); // L: 7479 - } - } - - } else { - int var11; - int var12; - int var13; - int var14; - if (class263.field3004 == var0) { // L: 7484 - byte var37 = var1.readByte(); // L: 7485 - var3 = var1.readUnsignedShort(); // L: 7486 - byte var38 = var1.method7707(); // L: 7487 - byte var39 = var1.readByte(); // L: 7488 - var6 = var1.method7715(); // L: 7489 - byte var40 = var1.method7707(); // L: 7490 - var8 = var1.method7714(); // L: 7491 - var9 = var1.method7773(); // L: 7492 - var10 = var9 >> 2; // L: 7493 - var11 = var9 & 3; // L: 7494 - var12 = Client.field748[var10]; // L: 7495 - var13 = var1.method7773(); // L: 7496 - var14 = (var13 >> 4 & 7) + PlayerComposition.field3307; // L: 7497 - int var15 = (var13 & 7) + class29.field181; // L: 7498 - int var16 = var1.method7714(); // L: 7499 - Player var17; - if (var3 == Client.localPlayerIndex) { // L: 7501 - var17 = GrandExchangeEvents.localPlayer; - } else { - var17 = Client.players[var3]; // L: 7502 - } - - if (var17 != null) { // L: 7503 - ObjectComposition var18 = class146.getObjectDefinition(var8); // L: 7504 - int var19; - int var20; - if (var11 != 1 && var11 != 3) { // L: 7507 - var19 = var18.sizeX; // L: 7512 - var20 = var18.sizeY; // L: 7513 - } else { - var19 = var18.sizeY; // L: 7508 - var20 = var18.sizeX; // L: 7509 - } - - int var21 = var14 + (var19 >> 1); // L: 7515 - int var22 = var14 + (var19 + 1 >> 1); // L: 7516 - int var23 = var15 + (var20 >> 1); // L: 7517 - int var24 = var15 + (var20 + 1 >> 1); // L: 7518 - int[][] var25 = Tiles.Tiles_heights[class18.Client_plane]; // L: 7519 - int var26 = var25[var21][var24] + var25[var22][var23] + var25[var21][var23] + var25[var22][var24] >> 2; // L: 7520 - int var27 = (var14 << 7) + (var19 << 6); // L: 7521 - int var28 = (var15 << 7) + (var20 << 6); // L: 7522 - Model var29 = var18.getModel(var10, var11, var25, var27, var26, var28); // L: 7523 - if (var29 != null) { // L: 7524 - GrandExchangeOfferWorldComparator.updatePendingSpawn(class18.Client_plane, var14, var15, var12, -1, 0, 0, var16 + 1, var6 + 1); // L: 7525 - var17.animationCycleStart = var16 + Client.cycle; // L: 7526 - var17.animationCycleEnd = var6 + Client.cycle; // L: 7527 - var17.model0 = var29; // L: 7528 - var17.field1080 = var19 * 64 + var14 * 128; // L: 7529 - var17.field1082 = var20 * 64 + var15 * 128; // L: 7530 - var17.tileHeight2 = var26; // L: 7531 - byte var30; - if (var38 > var40) { // L: 7532 - var30 = var38; // L: 7533 - var38 = var40; // L: 7534 - var40 = var30; // L: 7535 - } - - if (var39 > var37) { // L: 7537 - var30 = var39; // L: 7538 - var39 = var37; // L: 7539 - var37 = var30; // L: 7540 - } - - var17.minX = var38 + var14; // L: 7542 - var17.maxX = var14 + var40; // L: 7543 - var17.minY = var15 + var39; // L: 7544 - var17.maxY = var37 + var15; // L: 7545 - } - } - } - - if (class263.field3007 == var0) { // L: 7549 - var2 = var1.readUnsignedShort(); // L: 7550 - var3 = var1.readUnsignedByte(); // L: 7551 - var4 = (var3 >> 4 & 7) + PlayerComposition.field3307; // L: 7552 - var5 = (var3 & 7) + class29.field181; // L: 7553 - var6 = var1.method7713(); // L: 7554 - var7 = var1.method7713(); // L: 7555 - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7556 - NodeDeque var46 = Client.groundItems[class18.Client_plane][var4][var5]; // L: 7557 - if (var46 != null) { // L: 7558 - for (TileItem var35 = (TileItem)var46.last(); var35 != null; var35 = (TileItem)var46.previous()) { // L: 7559 7560 7565 - if ((var2 & 32767) == var35.id && var6 == var35.quantity) { // L: 7561 - var35.quantity = var7; // L: 7562 - break; - } - } - - UserComparator3.updateItemPile(var4, var5); // L: 7567 - } - } - - } else if (class263.field3015 == var0) { // L: 7572 - var2 = var1.method7773(); // L: 7573 - var3 = var1.readUnsignedShort(); // L: 7574 - var4 = var1.method7715(); // L: 7575 - var5 = var1.method7875(); // L: 7576 - var6 = (var5 >> 4 & 7) + PlayerComposition.field3307; // L: 7577 - var7 = (var5 & 7) + class29.field181; // L: 7578 - if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { // L: 7579 - var6 = var6 * 128 + 64; // L: 7580 - var7 = var7 * 128 + 64; // L: 7581 - GraphicsObject var34 = new GraphicsObject(var3, class18.Client_plane, var6, var7, WorldMapLabel.getTileHeight(var6, var7, class18.Client_plane) - var2, var4, Client.cycle); // L: 7582 - Client.graphicsObjects.addFirst(var34); // L: 7583 - } - - } else if (class263.field3013 == var0) { // L: 7587 - var2 = var1.method7742(); // L: 7588 - var3 = (var2 >> 4 & 7) + PlayerComposition.field3307; // L: 7589 - var4 = (var2 & 7) + class29.field181; // L: 7590 - var5 = var1.method7742(); // L: 7591 - var6 = var5 >> 2; // L: 7592 - var7 = var5 & 3; // L: 7593 - var8 = Client.field748[var6]; // L: 7594 - var9 = var1.method7714(); // L: 7595 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7596 - GrandExchangeOfferWorldComparator.updatePendingSpawn(class18.Client_plane, var3, var4, var8, var9, var6, var7, 0, -1); // L: 7597 - } - - } else if (class263.field3011 == var0) { // L: 7601 - var2 = var1.method7875() * 4; // L: 7602 - var3 = var1.method7714(); // L: 7603 - var4 = var1.method7717(); // L: 7604 - var5 = var1.method7773(); // L: 7605 - var6 = (var5 >> 4 & 7) + PlayerComposition.field3307; // L: 7606 - var7 = (var5 & 7) + class29.field181; // L: 7607 - var8 = var1.method7714(); // L: 7608 - byte var41 = var1.method7708(); // L: 7609 - var10 = var1.method7742(); // L: 7610 - byte var42 = var1.method7885(); // L: 7611 - var12 = var1.readUnsignedByte() * 4; // L: 7612 - var13 = var1.method7773(); // L: 7613 - var14 = var1.method7714(); // L: 7614 - var9 = var41 + var6; // L: 7615 - var11 = var42 + var7; // L: 7616 - if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104 && var9 >= 0 && var11 >= 0 && var9 < 104 && var11 < 104 && var14 != 65535) { // L: 7617 - var6 = var6 * 128 + 64; // L: 7618 - var7 = var7 * 128 + 64; // L: 7619 - var9 = var9 * 128 + 64; // L: 7620 - var11 = var11 * 128 + 64; // L: 7621 - Projectile var33 = new Projectile(var14, class18.Client_plane, var6, var7, WorldMapLabel.getTileHeight(var6, var7, class18.Client_plane) - var2, var3 + Client.cycle, var8 + Client.cycle, var10, var13, var4, var12); // L: 7622 - var33.setDestination(var9, var11, WorldMapLabel.getTileHeight(var9, var11, class18.Client_plane) - var12, var3 + Client.cycle); // L: 7623 - Client.projectiles.addFirst(var33); // L: 7624 - } - - } else if (class263.field3005 != var0) { // L: 7628 - if (class263.field3008 == var0) { // L: 7674 - var2 = var1.method7714(); // L: 7675 - var3 = var1.readUnsignedByte(); // L: 7676 - var4 = (var3 >> 4 & 7) + PlayerComposition.field3307; // L: 7677 - var5 = (var3 & 7) + class29.field181; // L: 7678 - var6 = var1.method7714(); // L: 7679 - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7680 - var31 = new TileItem(); // L: 7681 - var31.id = var2; // L: 7682 - var31.quantity = var6; // L: 7683 - if (Client.groundItems[class18.Client_plane][var4][var5] == null) { // L: 7684 - Client.groundItems[class18.Client_plane][var4][var5] = new NodeDeque(); - } - - Client.groundItems[class18.Client_plane][var4][var5].addFirst(var31); // L: 7685 - UserComparator3.updateItemPile(var4, var5); // L: 7686 - } - - } - } else { - var2 = var1.method7714(); // L: 7629 - var3 = var1.method7773(); // L: 7630 - var4 = var3 >> 2; // L: 7631 - var5 = var3 & 3; // L: 7632 - var6 = Client.field748[var4]; // L: 7633 - var7 = var1.method7875(); // L: 7634 - var8 = (var7 >> 4 & 7) + PlayerComposition.field3307; // L: 7635 - var9 = (var7 & 7) + class29.field181; // L: 7636 - if (var8 >= 0 && var9 >= 0 && var8 < 103 && var9 < 103) { // L: 7637 - if (var6 == 0) { // L: 7638 - BoundaryObject var32 = ArchiveLoader.scene.method4754(class18.Client_plane, var8, var9); // L: 7639 - if (var32 != null) { // L: 7640 - var11 = FileSystem.Entity_unpackID(var32.tag); // L: 7641 - if (var4 == 2) { // L: 7642 - var32.renderable1 = new DynamicObject(var11, 2, var5 + 4, class18.Client_plane, var8, var9, var2, false, var32.renderable1); // L: 7643 - var32.renderable2 = new DynamicObject(var11, 2, var5 + 1 & 3, class18.Client_plane, var8, var9, var2, false, var32.renderable2); // L: 7644 - } else { - var32.renderable1 = new DynamicObject(var11, var4, var5, class18.Client_plane, var8, var9, var2, false, var32.renderable1); // L: 7646 - } - } - } - - if (var6 == 1) { // L: 7649 - WallDecoration var43 = ArchiveLoader.scene.method4860(class18.Client_plane, var8, var9); // L: 7650 - if (var43 != null) { // L: 7651 - var11 = FileSystem.Entity_unpackID(var43.tag); // L: 7652 - if (var4 != 4 && var4 != 5) { // L: 7653 - if (var4 == 6) { // L: 7654 - var43.renderable1 = new DynamicObject(var11, 4, var5 + 4, class18.Client_plane, var8, var9, var2, false, var43.renderable1); - } else if (var4 == 7) { // L: 7655 - var43.renderable1 = new DynamicObject(var11, 4, (var5 + 2 & 3) + 4, class18.Client_plane, var8, var9, var2, false, var43.renderable1); - } else if (var4 == 8) { // L: 7656 - var43.renderable1 = new DynamicObject(var11, 4, var5 + 4, class18.Client_plane, var8, var9, var2, false, var43.renderable1); // L: 7657 - var43.renderable2 = new DynamicObject(var11, 4, (var5 + 2 & 3) + 4, class18.Client_plane, var8, var9, var2, false, var43.renderable2); // L: 7658 - } - } else { - var43.renderable1 = new DynamicObject(var11, 4, var5, class18.Client_plane, var8, var9, var2, false, var43.renderable1); - } - } - } - - if (var6 == 2) { // L: 7662 - GameObject var44 = ArchiveLoader.scene.getGameObject(class18.Client_plane, var8, var9); // L: 7663 - if (var4 == 11) { // L: 7664 - var4 = 10; - } - - if (var44 != null) { // L: 7665 - var44.renderable = new DynamicObject(FileSystem.Entity_unpackID(var44.tag), var4, var5, class18.Client_plane, var8, var9, var2, false, var44.renderable); - } - } - - if (var6 == 3) { // L: 7667 - FloorDecoration var45 = ArchiveLoader.scene.getFloorDecoration(class18.Client_plane, var8, var9); // L: 7668 - if (var45 != null) { // L: 7669 - var45.renderable = new DynamicObject(FileSystem.Entity_unpackID(var45.tag), 22, var5, class18.Client_plane, var8, var9, var2, false, var45.renderable); - } - } - } - - } - } - } - } // L: 7437 7482 7570 7585 7599 7626 7672 7688 7690 - - @ObfuscatedName("ih") - @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "83" - ) - @Export("addSceneMenuOptions") - static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { - if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 9854 - class21.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 9855 - } - - long var4 = -1L; // L: 9858 - long var6 = -1L; // L: 9859 - - int var8; - for (var8 = 0; var8 < StructComposition.method3618(); ++var8) { // L: 9860 - long var25 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9863 - if (var25 != var6) { // L: 9866 - var6 = var25; // L: 9867 - int var13 = World.method1673(var8); // L: 9868 - long var16 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9872 - int var15 = (int)(var16 >>> 7 & 127L); // L: 9874 - var15 = var15; // L: 9878 - int var29 = FloorDecoration.method4592(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 9881 - int var18 = Frames.method4934(var8); // L: 9884 - if (var29 == 2 && ArchiveLoader.scene.getObjectFlags(class18.Client_plane, var13, var15, var25) >= 0) { // L: 9885 9886 - ObjectComposition var19 = class146.getObjectDefinition(var18); // L: 9887 - if (var19.transforms != null) { // L: 9888 - var19 = var19.transform(); - } - - if (var19 == null) { // L: 9889 - continue; - } - - if (Client.isItemSelected == 1) { // L: 9890 - class21.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator9.colorStartTag(65535) + var19.name, 1, var18, var13, var15); // L: 9891 - } else if (Client.isSpellSelected) { // L: 9894 - if ((class17.selectedSpellFlags & 4) == 4) { // L: 9895 - class21.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator9.colorStartTag(65535) + var19.name, 2, var18, var13, var15); // L: 9896 - } - } else { - String[] var20 = var19.actions; // L: 9901 - if (var20 != null) { // L: 9902 - for (int var21 = 4; var21 >= 0; --var21) { // L: 9903 - if (var20[var21] != null) { // L: 9904 - short var22 = 0; // L: 9905 - if (var21 == 0) { // L: 9906 - var22 = 3; - } - - if (var21 == 1) { // L: 9907 - var22 = 4; - } - - if (var21 == 2) { // L: 9908 - var22 = 5; - } - - if (var21 == 3) { // L: 9909 - var22 = 6; - } - - if (var21 == 4) { // L: 9910 - var22 = 1001; - } - - class21.insertMenuItemNoShift(var20[var21], UserComparator9.colorStartTag(65535) + var19.name, var22, var18, var13, var15); // L: 9911 - } - } - } - - class21.insertMenuItemNoShift("Examine", UserComparator9.colorStartTag(65535) + var19.name, 1002, var19.id, var13, var15); // L: 9916 - } - } - - Player var23; - int var30; - NPC var31; - int var38; - int[] var39; - if (var29 == 1) { // L: 9921 - NPC var34 = Client.npcs[var18]; // L: 9922 - if (var34 == null) { // L: 9923 - continue; - } - - if (var34.definition.size == 1 && (var34.x & 127) == 64 && (var34.y & 127) == 64) { // L: 9924 - for (var30 = 0; var30 < Client.npcCount; ++var30) { // L: 9925 - var31 = Client.npcs[Client.npcIndices[var30]]; // L: 9926 - if (var31 != null && var31 != var34 && var31.definition.size == 1 && var31.x == var34.x && var31.y == var34.y) { // L: 9927 - class12.addNpcToMenu(var31, Client.npcIndices[var30], var13, var15); - } - } - - var30 = Players.Players_count; // L: 9929 - var39 = Players.Players_indices; // L: 9930 - - for (var38 = 0; var38 < var30; ++var38) { // L: 9931 - var23 = Client.players[var39[var38]]; // L: 9932 - if (var23 != null && var23.x == var34.x && var34.y == var23.y) { // L: 9933 - class20.addPlayerToMenu(var23, var39[var38], var13, var15); - } - } - } - - class12.addNpcToMenu(var34, var18, var13, var15); // L: 9936 - } - - if (var29 == 0) { // L: 9938 - Player var35 = Client.players[var18]; // L: 9939 - if (var35 == null) { // L: 9940 - continue; - } - - if ((var35.x & 127) == 64 && (var35.y & 127) == 64) { // L: 9941 - for (var30 = 0; var30 < Client.npcCount; ++var30) { // L: 9942 - var31 = Client.npcs[Client.npcIndices[var30]]; // L: 9943 - if (var31 != null && var31.definition.size == 1 && var31.x == var35.x && var35.y == var31.y) { // L: 9944 - class12.addNpcToMenu(var31, Client.npcIndices[var30], var13, var15); - } - } - - var30 = Players.Players_count; // L: 9946 - var39 = Players.Players_indices; // L: 9947 - - for (var38 = 0; var38 < var30; ++var38) { // L: 9948 - var23 = Client.players[var39[var38]]; // L: 9949 - if (var23 != null && var35 != var23 && var23.x == var35.x && var35.y == var23.y) { // L: 9950 - class20.addPlayerToMenu(var23, var39[var38], var13, var15); - } - } - } - - if (var18 != Client.combatTargetPlayerIndex) { // L: 9953 - class20.addPlayerToMenu(var35, var18, var13, var15); - } else { - var4 = var25; // L: 9954 - } - } - - if (var29 == 3) { // L: 9956 - NodeDeque var37 = Client.groundItems[class18.Client_plane][var13][var15]; // L: 9957 - if (var37 != null) { // L: 9958 - for (TileItem var36 = (TileItem)var37.first(); var36 != null; var36 = (TileItem)var37.next()) { // L: 9959 9960 9993 - ItemComposition var40 = class19.ItemDefinition_get(var36.id); // L: 9961 - if (Client.isItemSelected == 1) { // L: 9962 - class21.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator9.colorStartTag(16748608) + var40.name, 16, var36.id, var13, var15); // L: 9963 - } else if (Client.isSpellSelected) { // L: 9966 - if ((class17.selectedSpellFlags & 1) == 1) { // L: 9967 - class21.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator9.colorStartTag(16748608) + var40.name, 17, var36.id, var13, var15); // L: 9968 - } - } else { - String[] var32 = var40.groundActions; // L: 9973 - - for (int var33 = 4; var33 >= 0; --var33) { // L: 9974 - if (var32 != null && var32[var33] != null) { // L: 9975 - byte var24 = 0; // L: 9976 - if (var33 == 0) { // L: 9977 - var24 = 18; - } - - if (var33 == 1) { // L: 9978 - var24 = 19; - } - - if (var33 == 2) { // L: 9979 - var24 = 20; - } - - if (var33 == 3) { // L: 9980 - var24 = 21; - } - - if (var33 == 4) { // L: 9981 - var24 = 22; - } - - class21.insertMenuItemNoShift(var32[var33], UserComparator9.colorStartTag(16748608) + var40.name, var24, var36.id, var13, var15); // L: 9982 - } else if (var33 == 2) { // L: 9985 - class21.insertMenuItemNoShift("Take", UserComparator9.colorStartTag(16748608) + var40.name, 20, var36.id, var13, var15); // L: 9986 - } - } - - class21.insertMenuItemNoShift("Examine", UserComparator9.colorStartTag(16748608) + var40.name, 1004, var36.id, var13, var15); // L: 9990 - } - } - } - } - } - } - - if (-1L != var4) { // L: 9998 - var8 = (int)(var4 >>> 0 & 127L); // L: 10001 - int var10 = (int)(var4 >>> 7 & 127L); // L: 10006 - Player var12 = Client.players[Client.combatTargetPlayerIndex]; // L: 10009 - class20.addPlayerToMenu(var12, Client.combatTargetPlayerIndex, var8, var10); // L: 10010 - } - - } // L: 10012 } diff --git a/runescape-client/src/main/java/ClanSettings.java b/runescape-client/src/main/java/ClanSettings.java index 6276fad4d1..5cbe6fae4f 100644 --- a/runescape-client/src/main/java/ClanSettings.java +++ b/runescape-client/src/main/java/ClanSettings.java @@ -4,92 +4,92 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ex") +@ObfuscatedName("ek") @Implements("ClanSettings") public class ClanSettings { - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("useHashes") boolean useHashes; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("useNames") boolean useNames; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = -3394018459000773741L + longValue = -887635540627119073L ) - long field1586; - @ObfuscatedName("b") + long field1635; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -401549063 + intValue = 2108379547 ) - int field1583; - @ObfuscatedName("n") + int field1636; + @ObfuscatedName("m") @Export("name") public String name; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 801648797 + intValue = -2134617101 ) - int field1589; - @ObfuscatedName("l") + int field1638; + @ObfuscatedName("s") @Export("allowGuests") public boolean allowGuests; - @ObfuscatedName("q") - public byte field1591; - @ObfuscatedName("o") - public byte field1592; @ObfuscatedName("r") - public byte field1593; - @ObfuscatedName("p") - public byte field1606; + public byte field1633; + @ObfuscatedName("v") + public byte field1641; + @ObfuscatedName("y") + public byte field1642; + @ObfuscatedName("c") + public byte field1648; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -547296945 + intValue = -224195769 ) @Export("memberCount") public int memberCount; - @ObfuscatedName("k") + @ObfuscatedName("b") @Export("memberHashes") long[] memberHashes; - @ObfuscatedName("d") + @ObfuscatedName("t") @Export("memberRanks") public byte[] memberRanks; - @ObfuscatedName("m") + @ObfuscatedName("g") @Export("sortedMembers") int[] sortedMembers; - @ObfuscatedName("u") - int[] field1599; - @ObfuscatedName("t") - public int[] field1600; - @ObfuscatedName("g") - public boolean[] field1601; @ObfuscatedName("x") + int[] field1651; + @ObfuscatedName("n") + public int[] field1649; + @ObfuscatedName("e") + public boolean[] field1650; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1213693909 + intValue = -2063830339 ) @Export("currentOwner") public int currentOwner; - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1803569685 + intValue = 2079411577 ) - public int field1604; - @ObfuscatedName("y") + public int field1652; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 94812735 + intValue = 102858821 ) @Export("bannedMemberCount") public int bannedMemberCount; @ObfuscatedName("j") @Export("bannedMemberHashes") long[] bannedMemberHashes; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("memberNames") public String[] memberNames; - @ObfuscatedName("z") + @ObfuscatedName("i") @Export("bannedMemberNames") public String[] bannedMemberNames; - @ObfuscatedName("h") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "Lpt;" ) @@ -97,23 +97,23 @@ public class ClanSettings { IterableNodeHashTable parameters; @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpx;)V" ) public ClanSettings(Buffer var1) { - this.field1583 = 0; // L: 14 + this.field1636 = 0; // L: 14 this.name = null; // L: 15 - this.field1589 = 0; // L: 16 + this.field1638 = 0; // L: 16 this.currentOwner = -1; // L: 29 - this.field1604 = -1; // L: 30 - this.method2961(var1); // L: 43 + this.field1652 = -1; // L: 30 + this.method2901(var1); // L: 43 } // L: 44 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-82" + garbageValue = "1" ) - void method2953(int var1) { + void method2882(int var1) { if (this.useHashes) { // L: 47 if (this.memberHashes != null) { // L: 48 System.arraycopy(this.memberHashes, 0, this.memberHashes = new long[var1], 0, this.memberCount); @@ -136,32 +136,32 @@ public class ClanSettings { this.memberRanks = new byte[var1]; // L: 56 } - if (this.field1599 != null) { // L: 57 - System.arraycopy(this.field1599, 0, this.field1599 = new int[var1], 0, this.memberCount); + if (this.field1651 != null) { // L: 57 + System.arraycopy(this.field1651, 0, this.field1651 = new int[var1], 0, this.memberCount); } else { - this.field1599 = new int[var1]; // L: 58 + this.field1651 = new int[var1]; // L: 58 } - if (this.field1600 != null) { // L: 59 - System.arraycopy(this.field1600, 0, this.field1600 = new int[var1], 0, this.memberCount); + if (this.field1649 != null) { // L: 59 + System.arraycopy(this.field1649, 0, this.field1649 = new int[var1], 0, this.memberCount); } else { - this.field1600 = new int[var1]; // L: 60 + this.field1649 = new int[var1]; // L: 60 } - if (this.field1601 != null) { // L: 61 - System.arraycopy(this.field1601, 0, this.field1601 = new boolean[var1], 0, this.memberCount); + if (this.field1650 != null) { // L: 61 + System.arraycopy(this.field1650, 0, this.field1650 = new boolean[var1], 0, this.memberCount); } else { - this.field1601 = new boolean[var1]; // L: 62 + this.field1650 = new boolean[var1]; // L: 62 } } // L: 63 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "28" + descriptor = "(II)V", + garbageValue = "1820150927" ) - void method2954(int var1) { + void method2883(int var1) { if (this.useHashes) { // L: 66 if (this.bannedMemberHashes != null) { System.arraycopy(this.bannedMemberHashes, 0, this.bannedMemberHashes = new long[var1], 0, this.bannedMemberCount); // L: 67 @@ -171,8 +171,8 @@ public class ClanSettings { } if (this.useNames) { // L: 70 - if (this.bannedMemberNames != null) { - System.arraycopy(this.bannedMemberNames, 0, this.bannedMemberNames = new String[var1], 0, this.bannedMemberCount); // L: 71 + if (this.bannedMemberNames != null) { // L: 71 + System.arraycopy(this.bannedMemberNames, 0, this.bannedMemberNames = new String[var1], 0, this.bannedMemberCount); } else { this.bannedMemberNames = new String[var1]; // L: 72 } @@ -180,12 +180,12 @@ public class ClanSettings { } // L: 74 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "35363585" + garbageValue = "-2117273951" ) - public int method2955(String var1) { + public int method2884(String var1) { if (var1 != null && var1.length() != 0) { // L: 77 for (int var2 = 0; var2 < this.memberCount; ++var2) { // L: 78 if (this.memberNames[var2].equals(var1)) { // L: 79 @@ -199,20 +199,20 @@ public class ClanSettings { } } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IIII)I", - garbageValue = "-1723451340" + garbageValue = "-126239409" ) - public int method2956(int var1, int var2, int var3) { + public int method2885(int var1, int var2, int var3) { int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; // L: 85 - return (this.field1599[var1] & var4) >>> var2; // L: 86 + return (this.field1651[var1] & var4) >>> var2; // L: 86 } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/Integer;", - garbageValue = "1275001332" + garbageValue = "-1977188561" ) @Export("getTitleGroupValue") public Integer getTitleGroupValue(int var1) { @@ -224,10 +224,10 @@ public class ClanSettings { } } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)[I", - garbageValue = "33" + descriptor = "(I)[I", + garbageValue = "-861135746" ) @Export("getSortedMembers") public int[] getSortedMembers() { @@ -242,199 +242,198 @@ public class ClanSettings { } } - int[] var3 = this.sortedMembers; // L: 105 - class433.method7605(var1, var3, 0, var1.length - 1); // L: 107 + class113.method2625(var1, this.sortedMembers); // L: 105 } - return this.sortedMembers; + return this.sortedMembers; // L: 107 } - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(JLjava/lang/String;II)V", - garbageValue = "1216847947" + garbageValue = "193395684" ) - void method2959(long var1, String var3, int var4) { - if (var3 != null && var3.length() == 0) { // L: 114 + void method2888(long var1, String var3, int var4) { + if (var3 != null && var3.length() == 0) { // L: 111 var3 = null; } - if (var1 > 0L != this.useHashes) { // L: 115 + if (var1 > 0L != this.useHashes) { // L: 112 throw new RuntimeException(""); - } else if (this.useNames != (var3 != null)) { // L: 116 + } else if (this.useNames != (var3 != null)) { // L: 113 throw new RuntimeException(""); } else { - if (var1 > 0L && (this.memberHashes == null || this.memberCount >= this.memberHashes.length) || var3 != null && (this.memberNames == null || this.memberCount >= this.memberNames.length)) { // L: 117 - this.method2953(this.memberCount + 5); + if (var1 > 0L && (this.memberHashes == null || this.memberCount >= this.memberHashes.length) || var3 != null && (this.memberNames == null || this.memberCount >= this.memberNames.length)) { // L: 114 + this.method2882(this.memberCount + 5); } - if (this.memberHashes != null) { // L: 118 + if (this.memberHashes != null) { // L: 115 this.memberHashes[this.memberCount] = var1; } - if (this.memberNames != null) { // L: 119 + if (this.memberNames != null) { // L: 116 this.memberNames[this.memberCount] = var3; } - if (this.currentOwner == -1) { // L: 120 - this.currentOwner = this.memberCount; // L: 121 - this.memberRanks[this.memberCount] = 126; // L: 122 + if (this.currentOwner == -1) { // L: 117 + this.currentOwner = this.memberCount; // L: 118 + this.memberRanks[this.memberCount] = 126; // L: 119 } else { - this.memberRanks[this.memberCount] = 0; // L: 125 + this.memberRanks[this.memberCount] = 0; // L: 122 } - this.field1599[this.memberCount] = 0; // L: 127 - this.field1600[this.memberCount] = var4; // L: 128 - this.field1601[this.memberCount] = false; // L: 129 - ++this.memberCount; // L: 130 - this.sortedMembers = null; // L: 131 + this.field1651[this.memberCount] = 0; // L: 124 + this.field1649[this.memberCount] = var4; // L: 125 + this.field1650[this.memberCount] = false; // L: 126 + ++this.memberCount; // L: 127 + this.sortedMembers = null; // L: 128 } - } // L: 132 + } // L: 129 - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "831178976" + descriptor = "(IB)V", + garbageValue = "41" ) - void method2960(int var1) { - if (var1 >= 0 && var1 < this.memberCount) { // L: 135 - --this.memberCount; // L: 136 - this.sortedMembers = null; // L: 137 - if (this.memberCount == 0) { // L: 138 - this.memberHashes = null; // L: 139 - this.memberNames = null; // L: 140 - this.memberRanks = null; // L: 141 - this.field1599 = null; // L: 142 - this.field1600 = null; // L: 143 - this.field1601 = null; // L: 144 - this.currentOwner = -1; // L: 145 - this.field1604 = -1; // L: 146 + void method2926(int var1) { + if (var1 >= 0 && var1 < this.memberCount) { // L: 132 + --this.memberCount; // L: 133 + this.sortedMembers = null; // L: 134 + if (this.memberCount == 0) { // L: 135 + this.memberHashes = null; // L: 136 + this.memberNames = null; // L: 137 + this.memberRanks = null; // L: 138 + this.field1651 = null; // L: 139 + this.field1649 = null; // L: 140 + this.field1650 = null; // L: 141 + this.currentOwner = -1; // L: 142 + this.field1652 = -1; // L: 143 } else { - System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1); // L: 149 - System.arraycopy(this.field1599, var1 + 1, this.field1599, var1, this.memberCount - var1); // L: 150 - System.arraycopy(this.field1600, var1 + 1, this.field1600, var1, this.memberCount - var1); // L: 151 - System.arraycopy(this.field1601, var1 + 1, this.field1601, var1, this.memberCount - var1); // L: 152 - if (this.memberHashes != null) { // L: 153 + System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1); // L: 146 + System.arraycopy(this.field1651, var1 + 1, this.field1651, var1, this.memberCount - var1); // L: 147 + System.arraycopy(this.field1649, var1 + 1, this.field1649, var1, this.memberCount - var1); // L: 148 + System.arraycopy(this.field1650, var1 + 1, this.field1650, var1, this.memberCount - var1); // L: 149 + if (this.memberHashes != null) { // L: 150 System.arraycopy(this.memberHashes, var1 + 1, this.memberHashes, var1, this.memberCount - var1); } - if (this.memberNames != null) { // L: 154 + if (this.memberNames != null) { // L: 151 System.arraycopy(this.memberNames, var1 + 1, this.memberNames, var1, this.memberCount - var1); } - this.updateOwner(); // L: 155 + this.updateOwner(); // L: 152 } } else { throw new RuntimeException(""); } - } // L: 157 + } // L: 154 - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-131657821" + garbageValue = "-1770256781" ) @Export("updateOwner") void updateOwner() { - if (this.memberCount == 0) { // L: 160 - this.currentOwner = -1; // L: 161 - this.field1604 = -1; // L: 162 + if (this.memberCount == 0) { // L: 157 + this.currentOwner = -1; // L: 158 + this.field1652 = -1; // L: 159 } else { - this.currentOwner = -1; // L: 165 - this.field1604 = -1; // L: 166 - int var1 = 0; // L: 167 - byte var2 = this.memberRanks[0]; // L: 168 + this.currentOwner = -1; // L: 162 + this.field1652 = -1; // L: 163 + int var1 = 0; // L: 164 + byte var2 = this.memberRanks[0]; // L: 165 - for (int var3 = 1; var3 < this.memberCount; ++var3) { // L: 169 - if (this.memberRanks[var3] > var2) { // L: 170 - if (var2 == 125) { // L: 171 - this.field1604 = var1; + for (int var3 = 1; var3 < this.memberCount; ++var3) { // L: 166 + if (this.memberRanks[var3] > var2) { // L: 167 + if (var2 == 125) { // L: 168 + this.field1652 = var1; } - var1 = var3; // L: 172 - var2 = this.memberRanks[var3]; // L: 173 - } else if (this.field1604 == -1 && this.memberRanks[var3] == 125) { // L: 175 - this.field1604 = var3; // L: 176 + var1 = var3; // L: 169 + var2 = this.memberRanks[var3]; // L: 170 + } else if (this.field1652 == -1 && this.memberRanks[var3] == 125) { // L: 172 + this.field1652 = var3; // L: 173 } } - this.currentOwner = var1; // L: 179 - if (this.currentOwner != -1) { // L: 180 + this.currentOwner = var1; // L: 176 + if (this.currentOwner != -1) { // L: 177 this.memberRanks[this.currentOwner] = 126; } } - } // L: 163 181 + } // L: 160 178 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(JLjava/lang/String;B)V", - garbageValue = "17" + garbageValue = "1" ) - void method2996(long var1, String var3) { - if (var3 != null && var3.length() == 0) { // L: 184 + void method2891(long var1, String var3) { + if (var3 != null && var3.length() == 0) { // L: 181 var3 = null; } - if (this.useHashes != var1 > 0L) { // L: 185 + if (var1 > 0L != this.useHashes) { // L: 182 throw new RuntimeException(""); - } else if (var3 != null != this.useNames) { // L: 186 + } else if (var3 != null != this.useNames) { // L: 183 throw new RuntimeException(""); } else { - if (var1 > 0L && (this.bannedMemberHashes == null || this.bannedMemberCount >= this.bannedMemberHashes.length) || var3 != null && (this.bannedMemberNames == null || this.bannedMemberCount >= this.bannedMemberNames.length)) { // L: 187 - this.method2954(this.bannedMemberCount + 5); + if (var1 > 0L && (this.bannedMemberHashes == null || this.bannedMemberCount >= this.bannedMemberHashes.length) || var3 != null && (this.bannedMemberNames == null || this.bannedMemberCount >= this.bannedMemberNames.length)) { // L: 184 + this.method2883(this.bannedMemberCount + 5); } - if (this.bannedMemberHashes != null) { // L: 188 + if (this.bannedMemberHashes != null) { // L: 185 this.bannedMemberHashes[this.bannedMemberCount] = var1; } - if (this.bannedMemberNames != null) { // L: 189 + if (this.bannedMemberNames != null) { // L: 186 this.bannedMemberNames[this.bannedMemberCount] = var3; } - ++this.bannedMemberCount; // L: 190 + ++this.bannedMemberCount; // L: 187 } - } // L: 191 + } // L: 188 - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1100183884" + garbageValue = "-40246503" ) - void method2963(int var1) { - --this.bannedMemberCount; // L: 194 - if (this.bannedMemberCount == 0) { // L: 195 - this.bannedMemberHashes = null; // L: 196 - this.bannedMemberNames = null; // L: 197 + void method2892(int var1) { + --this.bannedMemberCount; // L: 191 + if (this.bannedMemberCount == 0) { // L: 192 + this.bannedMemberHashes = null; // L: 193 + this.bannedMemberNames = null; // L: 194 } else { - if (this.bannedMemberHashes != null) { // L: 200 + if (this.bannedMemberHashes != null) { // L: 197 System.arraycopy(this.bannedMemberHashes, var1 + 1, this.bannedMemberHashes, var1, this.bannedMemberCount - var1); } if (this.bannedMemberNames != null) { - System.arraycopy(this.bannedMemberNames, var1 + 1, this.bannedMemberNames, var1, this.bannedMemberCount - var1); // L: 201 + System.arraycopy(this.bannedMemberNames, var1 + 1, this.bannedMemberNames, var1, this.bannedMemberCount - var1); // L: 198 } } - } // L: 203 + } // L: 200 - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IBB)I", - garbageValue = "-48" + descriptor = "(IBI)I", + garbageValue = "46712984" ) - int method2964(int var1, byte var2) { - if (var2 != 126 && var2 != 127) { // L: 206 - if (this.currentOwner == var1 && (this.field1604 == -1 || this.memberRanks[this.field1604] < 125)) { // L: 207 + int method2930(int var1, byte var2) { + if (var2 != 126 && var2 != 127) { // L: 203 + if (this.currentOwner == var1 && (this.field1652 == -1 || this.memberRanks[this.field1652] < 125)) { // L: 204 return -1; } else if (this.memberRanks[var1] == var2) { - return -1; // L: 208 + return -1; // L: 205 } else { - this.memberRanks[var1] = var2; // L: 209 - this.updateOwner(); // L: 210 - return var1; // L: 211 + this.memberRanks[var1] = var2; // L: 206 + this.updateOwner(); // L: 207 + return var1; // L: 208 } } else { return -1; @@ -444,321 +443,321 @@ public class ClanSettings { @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1731928616" + garbageValue = "-2047746975" ) - boolean method2965(int var1) { - if (this.currentOwner != var1 && this.memberRanks[var1] != 126) { // L: 215 - this.memberRanks[this.currentOwner] = 125; // L: 216 - this.field1604 = this.currentOwner; // L: 217 - this.memberRanks[var1] = 126; // L: 218 - this.currentOwner = var1; // L: 219 - return true; // L: 220 + boolean method2894(int var1) { + if (this.currentOwner != var1 && this.memberRanks[var1] != 126) { // L: 212 + this.memberRanks[this.currentOwner] = 125; // L: 213 + this.field1652 = this.currentOwner; // L: 214 + this.memberRanks[var1] = 126; // L: 215 + this.currentOwner = var1; // L: 216 + return true; // L: 217 } else { return false; } } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(IZI)I", - garbageValue = "1433245156" + garbageValue = "-1302763835" ) - int method3027(int var1, boolean var2) { - if (this.field1601[var1] == var2) { // L: 224 + int method2895(int var1, boolean var2) { + if (this.field1650[var1] == var2) { // L: 221 return -1; } else { - this.field1601[var1] = var2; // L: 225 - return var1; // L: 226 + this.field1650[var1] = var2; // L: 222 + return var1; // L: 223 } } - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(IIIIB)I", - garbageValue = "-122" - ) - int method2967(int var1, int var2, int var3, int var4) { - int var5 = (1 << var3) - 1; // L: 230 - int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 231 - int var7 = var6 ^ var5; // L: 232 - var2 <<= var3; // L: 233 - var2 &= var7; // L: 234 - int var8 = this.field1599[var1]; // L: 235 - if ((var8 & var7) == var2) { - return -1; // L: 236 - } else { - var8 &= ~var7; // L: 237 - this.field1599[var1] = var8 | var2; // L: 238 - return var1; // L: 239 - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-827323017" - ) - boolean method2968(int var1, int var2) { - if (this.parameters != null) { // L: 243 - Node var3 = this.parameters.get((long)var1); // L: 244 - if (var3 != null) { // L: 245 - if (var3 instanceof IntegerNode) { // L: 246 - IntegerNode var4 = (IntegerNode)var3; // L: 247 - if (var2 == var4.integer) { // L: 248 - return false; - } - - var4.integer = var2; // L: 249 - return true; // L: 250 - } - - var3.remove(); // L: 252 - } - } else { - this.parameters = new IterableNodeHashTable(4); // L: 255 - } - - this.parameters.put(new IntegerNode(var2), (long)var1); // L: 256 - return true; // L: 257 - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(IIIIB)Z", - garbageValue = "42" - ) - boolean method2969(int var1, int var2, int var3, int var4) { - int var5 = (1 << var3) - 1; // L: 261 - int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 262 - int var7 = var6 ^ var5; // L: 263 - var2 <<= var3; // L: 264 - var2 &= var7; // L: 265 - if (this.parameters != null) { // L: 266 - Node var8 = this.parameters.get((long)var1); // L: 267 - if (var8 != null) { // L: 268 - if (var8 instanceof IntegerNode) { // L: 269 - IntegerNode var9 = (IntegerNode)var8; // L: 270 - if ((var9.integer & var7) == var2) { // L: 271 - return false; - } - - var9.integer &= ~var7; // L: 272 - var9.integer |= var2; // L: 273 - return true; // L: 274 - } - - var8.remove(); // L: 276 - } - } else { - this.parameters = new IterableNodeHashTable(4); // L: 279 - } - - this.parameters.put(new IntegerNode(var2), (long)var1); // L: 280 - return true; // L: 281 - } - @ObfuscatedName("t") - boolean method2978(int var1, long var2) { - if (this.parameters != null) { // L: 285 - Node var4 = this.parameters.get((long)var1); // L: 286 - if (var4 != null) { // L: 287 - if (var4 instanceof class406) { // L: 288 - class406 var5 = (class406)var4; // L: 289 - if (var2 == var5.field4407) { // L: 290 - return false; - } - - var5.field4407 = var2; // L: 291 - return true; // L: 292 - } - - var4.remove(); // L: 294 - } + @ObfuscatedSignature( + descriptor = "(IIIII)I", + garbageValue = "1423184573" + ) + int method2896(int var1, int var2, int var3, int var4) { + int var5 = (1 << var3) - 1; // L: 227 + int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 228 + int var7 = var6 ^ var5; // L: 229 + var2 <<= var3; // L: 230 + var2 &= var7; // L: 231 + int var8 = this.field1651[var1]; // L: 232 + if ((var8 & var7) == var2) { + return -1; // L: 233 } else { - this.parameters = new IterableNodeHashTable(4); // L: 297 + var8 &= ~var7; // L: 234 + this.field1651[var1] = var8 | var2; // L: 235 + return var1; // L: 236 } - - this.parameters.put(new class406(var2), (long)var1); // L: 298 - return true; // L: 299 } @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)Z", - garbageValue = "49" + descriptor = "(III)Z", + garbageValue = "1693351143" ) - boolean method2971(int var1, String var2) { - if (var2 == null) { // L: 303 - var2 = ""; - } else if (var2.length() > 80) { // L: 304 - var2 = var2.substring(0, 80); - } - - if (this.parameters != null) { // L: 305 - Node var3 = this.parameters.get((long)var1); // L: 306 - if (var3 != null) { // L: 307 - if (var3 instanceof ObjectNode) { // L: 308 - ObjectNode var4 = (ObjectNode)var3; // L: 309 - if (var4.obj instanceof String) { // L: 310 - if (var2.equals(var4.obj)) { // L: 311 - return false; - } - - var4.remove(); // L: 312 - this.parameters.put(new ObjectNode(var2), var4.key); // L: 313 - return true; // L: 314 + boolean method2909(int var1, int var2) { + if (this.parameters != null) { // L: 240 + Node var3 = this.parameters.get((long)var1); // L: 241 + if (var3 != null) { // L: 242 + if (var3 instanceof IntegerNode) { // L: 243 + IntegerNode var4 = (IntegerNode)var3; // L: 244 + if (var2 == var4.integer) { // L: 245 + return false; } + + var4.integer = var2; // L: 246 + return true; // L: 247 } - var3.remove(); // L: 317 + var3.remove(); // L: 249 } } else { - this.parameters = new IterableNodeHashTable(4); // L: 320 + this.parameters = new IterableNodeHashTable(4); // L: 252 } - this.parameters.put(new ObjectNode(var2), (long)var1); // L: 321 - return true; // L: 322 + this.parameters.put(new IntegerNode(var2), (long)var1); // L: 253 + return true; // L: 254 } @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-1262320600" + descriptor = "(IIIIB)Z", + garbageValue = "55" ) - void method2961(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 326 - if (var2 >= 1 && var2 <= 6) { // L: 327 - int var3 = var1.readUnsignedByte(); // L: 328 - if ((var3 & 1) != 0) { // L: 329 + boolean method2898(int var1, int var2, int var3, int var4) { + int var5 = (1 << var3) - 1; // L: 258 + int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 259 + int var7 = var6 ^ var5; // L: 260 + var2 <<= var3; // L: 261 + var2 &= var7; // L: 262 + if (this.parameters != null) { // L: 263 + Node var8 = this.parameters.get((long)var1); // L: 264 + if (var8 != null) { // L: 265 + if (var8 instanceof IntegerNode) { // L: 266 + IntegerNode var9 = (IntegerNode)var8; // L: 267 + if ((var9.integer & var7) == var2) { // L: 268 + return false; + } + + var9.integer &= ~var7; // L: 269 + var9.integer |= var2; // L: 270 + return true; // L: 271 + } + + var8.remove(); // L: 273 + } + } else { + this.parameters = new IterableNodeHashTable(4); // L: 276 + } + + this.parameters.put(new IntegerNode(var2), (long)var1); // L: 277 + return true; // L: 278 + } + + @ObfuscatedName("n") + boolean method2889(int var1, long var2) { + if (this.parameters != null) { // L: 282 + Node var4 = this.parameters.get((long)var1); // L: 283 + if (var4 != null) { // L: 284 + if (var4 instanceof class408) { // L: 285 + class408 var5 = (class408)var4; // L: 286 + if (var2 == var5.field4463) { // L: 287 + return false; + } + + var5.field4463 = var2; // L: 288 + return true; // L: 289 + } + + var4.remove(); // L: 291 + } + } else { + this.parameters = new IterableNodeHashTable(4); // L: 294 + } + + this.parameters.put(new class408(var2), (long)var1); // L: 295 + return true; // L: 296 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;I)Z", + garbageValue = "-1953428658" + ) + boolean method2900(int var1, String var2) { + if (var2 == null) { // L: 300 + var2 = ""; + } else if (var2.length() > 80) { // L: 301 + var2 = var2.substring(0, 80); + } + + if (this.parameters != null) { // L: 302 + Node var3 = this.parameters.get((long)var1); // L: 303 + if (var3 != null) { // L: 304 + if (var3 instanceof ObjectNode) { // L: 305 + ObjectNode var4 = (ObjectNode)var3; // L: 306 + if (var4.obj instanceof String) { // L: 307 + if (var2.equals(var4.obj)) { // L: 308 + return false; + } + + var4.remove(); // L: 309 + this.parameters.put(new ObjectNode(var2), var4.key); // L: 310 + return true; // L: 311 + } + } + + var3.remove(); // L: 314 + } + } else { + this.parameters = new IterableNodeHashTable(4); // L: 317 + } + + this.parameters.put(new ObjectNode(var2), (long)var1); // L: 318 + return true; // L: 319 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Lpx;B)V", + garbageValue = "-122" + ) + void method2901(Buffer var1) { + int var2 = var1.readUnsignedByte(); // L: 323 + if (var2 >= 1 && var2 <= 6) { // L: 324 + int var3 = var1.readUnsignedByte(); // L: 325 + if ((var3 & 1) != 0) { // L: 326 this.useHashes = true; } - if ((var3 & 2) != 0) { // L: 330 + if ((var3 & 2) != 0) { // L: 327 this.useNames = true; } - if (!this.useHashes) { // L: 331 - this.memberHashes = null; // L: 332 - this.bannedMemberHashes = null; // L: 333 + if (!this.useHashes) { // L: 328 + this.memberHashes = null; // L: 329 + this.bannedMemberHashes = null; // L: 330 } - if (!this.useNames) { // L: 335 - this.memberNames = null; // L: 336 - this.bannedMemberNames = null; // L: 337 + if (!this.useNames) { // L: 332 + this.memberNames = null; // L: 333 + this.bannedMemberNames = null; // L: 334 } - this.field1583 = var1.readInt(); // L: 339 - this.field1589 = var1.readInt(); // L: 340 - if (var2 <= 3 && this.field1589 != 0) { // L: 341 - this.field1589 += 16912800; + this.field1636 = var1.readInt(); // L: 336 + this.field1638 = var1.readInt(); // L: 337 + if (var2 <= 3 && this.field1638 != 0) { // L: 338 + this.field1638 += 16912800; } - this.memberCount = var1.readUnsignedShort(); // L: 342 - this.bannedMemberCount = var1.readUnsignedByte(); // L: 343 - this.name = var1.readStringCp1252NullTerminated(); // L: 344 - if (var2 >= 4) { // L: 345 - var1.readInt(); // L: 346 + this.memberCount = var1.readUnsignedShort(); // L: 339 + this.bannedMemberCount = var1.readUnsignedByte(); // L: 340 + this.name = var1.readStringCp1252NullTerminated(); // L: 341 + if (var2 >= 4) { // L: 342 + var1.readInt(); // L: 343 } - this.allowGuests = var1.readUnsignedByte() == 1; // L: 348 - this.field1591 = var1.readByte(); // L: 349 - this.field1592 = var1.readByte(); // L: 350 - this.field1593 = var1.readByte(); // L: 351 - this.field1606 = var1.readByte(); // L: 352 + this.allowGuests = var1.readUnsignedByte() == 1; // L: 345 + this.field1633 = var1.readByte(); // L: 346 + this.field1641 = var1.readByte(); // L: 347 + this.field1642 = var1.readByte(); // L: 348 + this.field1648 = var1.readByte(); // L: 349 int var4; - if (this.memberCount > 0) { // L: 353 - if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) { // L: 354 + if (this.memberCount > 0) { // L: 350 + if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) { // L: 351 this.memberHashes = new long[this.memberCount]; } - if (this.useNames && (this.memberNames == null || this.memberNames.length < this.memberCount)) { // L: 355 + if (this.useNames && (this.memberNames == null || this.memberNames.length < this.memberCount)) { // L: 352 this.memberNames = new String[this.memberCount]; } - if (this.memberRanks == null || this.memberRanks.length < this.memberCount) { // L: 356 + if (this.memberRanks == null || this.memberRanks.length < this.memberCount) { // L: 353 this.memberRanks = new byte[this.memberCount]; } - if (this.field1599 == null || this.field1599.length < this.memberCount) { // L: 357 - this.field1599 = new int[this.memberCount]; + if (this.field1651 == null || this.field1651.length < this.memberCount) { // L: 354 + this.field1651 = new int[this.memberCount]; } - if (this.field1600 == null || this.field1600.length < this.memberCount) { // L: 358 - this.field1600 = new int[this.memberCount]; + if (this.field1649 == null || this.field1649.length < this.memberCount) { // L: 355 + this.field1649 = new int[this.memberCount]; } - if (this.field1601 == null || this.field1601.length < this.memberCount) { // L: 359 - this.field1601 = new boolean[this.memberCount]; + if (this.field1650 == null || this.field1650.length < this.memberCount) { // L: 356 + this.field1650 = new boolean[this.memberCount]; } - for (var4 = 0; var4 < this.memberCount; ++var4) { // L: 360 - if (this.useHashes) { // L: 361 + for (var4 = 0; var4 < this.memberCount; ++var4) { // L: 357 + if (this.useHashes) { // L: 358 this.memberHashes[var4] = var1.readLong(); } - if (this.useNames) { // L: 362 + if (this.useNames) { // L: 359 this.memberNames[var4] = var1.readStringCp1252NullTerminatedOrNull(); } - this.memberRanks[var4] = var1.readByte(); // L: 363 - if (var2 >= 2) { // L: 364 - this.field1599[var4] = var1.readInt(); + this.memberRanks[var4] = var1.readByte(); // L: 360 + if (var2 >= 2) { // L: 361 + this.field1651[var4] = var1.readInt(); } - if (var2 >= 5) { // L: 365 - this.field1600[var4] = var1.readUnsignedShort(); + if (var2 >= 5) { // L: 362 + this.field1649[var4] = var1.readUnsignedShort(); } else { - this.field1600[var4] = 0; // L: 366 + this.field1649[var4] = 0; // L: 363 } - if (var2 >= 6) { // L: 367 - this.field1601[var4] = var1.readUnsignedByte() == 1; + if (var2 >= 6) { // L: 364 + this.field1650[var4] = var1.readUnsignedByte() == 1; } else { - this.field1601[var4] = false; // L: 368 + this.field1650[var4] = false; // L: 365 } } - this.updateOwner(); // L: 370 + this.updateOwner(); // L: 367 } - if (this.bannedMemberCount > 0) { // L: 372 - if (this.useHashes && (this.bannedMemberHashes == null || this.bannedMemberHashes.length < this.bannedMemberCount)) { // L: 373 + if (this.bannedMemberCount > 0) { // L: 369 + if (this.useHashes && (this.bannedMemberHashes == null || this.bannedMemberHashes.length < this.bannedMemberCount)) { // L: 370 this.bannedMemberHashes = new long[this.bannedMemberCount]; } - if (this.useNames && (this.bannedMemberNames == null || this.bannedMemberNames.length < this.bannedMemberCount)) { // L: 374 + if (this.useNames && (this.bannedMemberNames == null || this.bannedMemberNames.length < this.bannedMemberCount)) { // L: 371 this.bannedMemberNames = new String[this.bannedMemberCount]; } - for (var4 = 0; var4 < this.bannedMemberCount; ++var4) { // L: 375 - if (this.useHashes) { // L: 376 + for (var4 = 0; var4 < this.bannedMemberCount; ++var4) { // L: 372 + if (this.useHashes) { // L: 373 this.bannedMemberHashes[var4] = var1.readLong(); } - if (this.useNames) { // L: 377 + if (this.useNames) { // L: 374 this.bannedMemberNames[var4] = var1.readStringCp1252NullTerminatedOrNull(); } } } - if (var2 >= 3) { // L: 380 - var4 = var1.readUnsignedShort(); // L: 381 - if (var4 > 0) { // L: 382 - this.parameters = new IterableNodeHashTable(var4 < 16 ? class67.method1909(var4) : 16); // L: 383 + if (var2 >= 3) { // L: 377 + var4 = var1.readUnsignedShort(); // L: 378 + if (var4 > 0) { // L: 379 + this.parameters = new IterableNodeHashTable(var4 < 16 ? FontName.method7228(var4) : 16); // L: 380 - while (var4-- > 0) { // L: 384 - int var5 = var1.readInt(); // L: 385 - int var6 = var5 & 1073741823; // L: 386 - int var7 = var5 >>> 30; // L: 387 - if (var7 == 0) { // L: 388 - int var12 = var1.readInt(); // L: 389 - this.parameters.put(new IntegerNode(var12), (long)var6); // L: 390 - } else if (var7 == 1) { // L: 392 - long var10 = var1.readLong(); // L: 393 - this.parameters.put(new class406(var10), (long)var6); // L: 394 - } else if (var7 == 2) { // L: 396 - String var8 = var1.readStringCp1252NullTerminated(); // L: 397 - this.parameters.put(new ObjectNode(var8), (long)var6); // L: 398 + while (var4-- > 0) { // L: 381 + int var5 = var1.readInt(); // L: 382 + int var6 = var5 & 1073741823; // L: 383 + int var7 = var5 >>> 30; // L: 384 + if (var7 == 0) { // L: 385 + int var12 = var1.readInt(); // L: 386 + this.parameters.put(new IntegerNode(var12), (long)var6); // L: 387 + } else if (var7 == 1) { // L: 389 + long var10 = var1.readLong(); // L: 390 + this.parameters.put(new class408(var10), (long)var6); // L: 391 + } else if (var7 == 2) { // L: 393 + String var8 = var1.readStringCp1252NullTerminated(); // L: 394 + this.parameters.put(new ObjectNode(var8), (long)var6); // L: 395 } } } @@ -767,67 +766,582 @@ public class ClanSettings { } else { throw new RuntimeException("" + var2); } - } // L: 403 + } // L: 400 - @ObfuscatedName("v") + @ObfuscatedName("fo") @ObfuscatedSignature( - descriptor = "(Lch;B)V", - garbageValue = "28" + descriptor = "(B)V", + garbageValue = "14" ) - @Export("runScriptEvent") - public static void runScriptEvent(ScriptEvent var0) { - Interpreter.runScript(var0, 500000, 475000); // L: 108 - } // L: 109 + @Export("load") + static void load() { + int var19; + if (Client.titleLoadingStage == 0) { // L: 1524 + class175.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 1525 - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1975517919" - ) - static final void method3031() { - class149.method3138("You can't add yourself to your own friend list"); // L: 110 - } // L: 111 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-26" - ) - static final int method3028(int var0, int var1) { - if (var0 == -2) { // L: 942 - return 12345678; - } else if (var0 == -1) { // L: 943 - if (var1 < 2) { // L: 944 - var1 = 2; - } else if (var1 > 126) { // L: 945 - var1 = 126; + for (var19 = 0; var19 < 4; ++var19) { // L: 1526 + Client.collisionMaps[var19] = new CollisionMap(104, 104); } - return var1; // L: 946 + InterfaceParent.sceneMinimapSprite = new SpritePixels(512, 512); // L: 1527 + Login.Login_loadingText = "Starting game engine..."; // L: 1528 + Login.Login_loadingPercent = 5; // L: 1529 + Client.titleLoadingStage = 20; // L: 1530 + } else if (Client.titleLoadingStage == 20) { // L: 1533 + Login.Login_loadingText = "Prepared visibility map"; // L: 1534 + Login.Login_loadingPercent = 10; // L: 1535 + Client.titleLoadingStage = 30; // L: 1536 + } else if (Client.titleLoadingStage == 30) { // L: 1539 + NetSocket.archive0 = WorldMapRegion.newArchive(0, false, true, true); // L: 1540 + Clock.archive1 = WorldMapRegion.newArchive(1, false, true, true); // L: 1541 + class356.archive2 = WorldMapRegion.newArchive(2, true, false, true); // L: 1542 + class194.archive3 = WorldMapRegion.newArchive(3, false, true, true); // L: 1543 + MouseHandler.archive4 = WorldMapRegion.newArchive(4, false, true, true); // L: 1544 + Message.archive5 = WorldMapRegion.newArchive(5, true, true, true); // L: 1545 + AbstractUserComparator.archive6 = WorldMapRegion.newArchive(6, true, true, true); // L: 1546 + InterfaceParent.archive7 = WorldMapRegion.newArchive(7, false, true, true); // L: 1547 + class305.archive8 = WorldMapRegion.newArchive(8, false, true, true); // L: 1548 + TileItem.archive9 = WorldMapRegion.newArchive(9, false, true, true); // L: 1549 + ObjectSound.archive10 = WorldMapRegion.newArchive(10, false, true, true); // L: 1550 + UrlRequest.archive11 = WorldMapRegion.newArchive(11, false, true, true); // L: 1551 + class115.archive12 = WorldMapRegion.newArchive(12, false, true, true); // L: 1552 + class16.archive13 = WorldMapRegion.newArchive(13, true, false, true); // L: 1553 + class101.archive14 = WorldMapRegion.newArchive(14, false, true, true); // L: 1554 + Client.archive15 = WorldMapRegion.newArchive(15, false, true, true); // L: 1555 + class114.archive17 = WorldMapRegion.newArchive(17, true, true, true); // L: 1556 + class92.archive18 = WorldMapRegion.newArchive(18, false, true, true); // L: 1557 + VarpDefinition.archive19 = WorldMapRegion.newArchive(19, false, true, true); // L: 1558 + ItemContainer.archive20 = WorldMapRegion.newArchive(20, false, true, true); // L: 1559 + Login.Login_loadingText = "Connecting to update server"; // L: 1560 + Login.Login_loadingPercent = 20; // L: 1561 + Client.titleLoadingStage = 40; // L: 1562 + } else if (Client.titleLoadingStage == 40) { // L: 1565 + byte var33 = 0; // L: 1566 + var19 = var33 + NetSocket.archive0.percentage() * 4 / 100; // L: 1567 + var19 += Clock.archive1.percentage() * 4 / 100; // L: 1568 + var19 += class356.archive2.percentage() * 2 / 100; // L: 1569 + var19 += class194.archive3.percentage() * 2 / 100; // L: 1570 + var19 += MouseHandler.archive4.percentage() * 6 / 100; // L: 1571 + var19 += Message.archive5.percentage() * 4 / 100; // L: 1572 + var19 += AbstractUserComparator.archive6.percentage() * 2 / 100; // L: 1573 + var19 += InterfaceParent.archive7.percentage() * 56 / 100; // L: 1574 + var19 += class305.archive8.percentage() * 2 / 100; // L: 1575 + var19 += TileItem.archive9.percentage() * 2 / 100; // L: 1576 + var19 += ObjectSound.archive10.percentage() * 2 / 100; // L: 1577 + var19 += UrlRequest.archive11.percentage() * 2 / 100; // L: 1578 + var19 += class115.archive12.percentage() * 2 / 100; // L: 1579 + var19 += class16.archive13.percentage() * 2 / 100; // L: 1580 + var19 += class101.archive14.percentage() * 2 / 100; // L: 1581 + var19 += Client.archive15.percentage() * 2 / 100; // L: 1582 + var19 += VarpDefinition.archive19.percentage() / 100; // L: 1583 + var19 += class92.archive18.percentage() / 100; // L: 1584 + var19 += ItemContainer.archive20.percentage() / 100; // L: 1585 + var19 += class114.archive17.method5624() && class114.archive17.isFullyLoaded() ? 1 : 0; // L: 1586 + if (var19 != 100) { // L: 1587 + if (var19 != 0) { // L: 1588 + Login.Login_loadingText = "Checking for updates - " + var19 + "%"; + } + + Login.Login_loadingPercent = 30; // L: 1589 + } else { + HealthBar.method2335(NetSocket.archive0, "Animations"); // L: 1592 + HealthBar.method2335(Clock.archive1, "Skeletons"); // L: 1593 + HealthBar.method2335(MouseHandler.archive4, "Sound FX"); // L: 1594 + HealthBar.method2335(Message.archive5, "Maps"); // L: 1595 + HealthBar.method2335(AbstractUserComparator.archive6, "Music Tracks"); // L: 1596 + HealthBar.method2335(InterfaceParent.archive7, "Models"); // L: 1597 + HealthBar.method2335(class305.archive8, "Sprites"); // L: 1598 + HealthBar.method2335(UrlRequest.archive11, "Music Jingles"); // L: 1599 + HealthBar.method2335(class101.archive14, "Music Samples"); // L: 1600 + HealthBar.method2335(Client.archive15, "Music Patches"); // L: 1601 + HealthBar.method2335(VarpDefinition.archive19, "World Map"); // L: 1602 + HealthBar.method2335(class92.archive18, "World Map Geography"); // L: 1603 + HealthBar.method2335(ItemContainer.archive20, "World Map Ground"); // L: 1604 + class28.spriteIds = new GraphicsDefaults(); // L: 1605 + class28.spriteIds.decode(class114.archive17); // L: 1606 + Login.Login_loadingText = "Loaded update list"; // L: 1607 + Login.Login_loadingPercent = 30; // L: 1608 + Client.titleLoadingStage = 45; // L: 1609 + } } else { - var1 = (var0 & 127) * var1 / 128; // L: 948 - if (var1 < 2) { // L: 949 - var1 = 2; - } else if (var1 > 126) { // L: 950 - var1 = 126; + Archive var2; + Archive var23; + Archive var30; + if (Client.titleLoadingStage == 45) { // L: 1612 + WorldMapSprite.method4809(22050, !Client.isLowDetail, 2); // L: 1613 + MidiPcmStream var29 = new MidiPcmStream(); // L: 1614 + var29.method5151(9, 128); // L: 1615 + SecureRandomCallable.pcmPlayer0 = class271.method5045(GameEngine.taskHandler, 0, 22050); // L: 1616 + SecureRandomCallable.pcmPlayer0.setStream(var29); // L: 1617 + var30 = Client.archive15; // L: 1618 + var2 = class101.archive14; // L: 1619 + var23 = MouseHandler.archive4; // L: 1620 + class273.musicPatchesArchive = var30; // L: 1622 + class462.musicSamplesArchive = var2; // L: 1623 + class273.soundEffectsArchive = var23; // L: 1624 + class273.midiPcmStream = var29; // L: 1625 + Fonts.pcmPlayer1 = class271.method5045(GameEngine.taskHandler, 1, 2048); // L: 1627 + class122.pcmStreamMixer = new PcmStreamMixer(); // L: 1628 + Fonts.pcmPlayer1.setStream(class122.pcmStreamMixer); // L: 1629 + class403.decimator = new Decimator(22050, PcmPlayer.field300); // L: 1630 + Login.Login_loadingText = "Prepared sound engine"; // L: 1631 + Login.Login_loadingPercent = 35; // L: 1632 + Client.titleLoadingStage = 50; // L: 1633 + MouseHandler.WorldMapElement_fonts = new Fonts(class305.archive8, class16.archive13); // L: 1634 + } else if (Client.titleLoadingStage == 50) { // L: 1637 + var19 = FontName.method7232().length; // L: 1638 + Client.fontsMap = MouseHandler.WorldMapElement_fonts.createMap(FontName.method7232()); // L: 1639 + if (Client.fontsMap.size() < var19) { // L: 1640 + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var19 + "%"; // L: 1641 + Login.Login_loadingPercent = 40; // L: 1642 + } else { + Varcs.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 1645 + class149.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 1646 + ChatChannel.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 1647 + class135.platformInfo = Client.platformInfoProvider.get(); // L: 1648 + Login.Login_loadingText = "Loaded fonts"; // L: 1649 + Login.Login_loadingPercent = 40; // L: 1650 + Client.titleLoadingStage = 60; // L: 1651 + } + } else { + int var20; + if (Client.titleLoadingStage == 60) { // L: 1654 + var19 = DevicePcmPlayerProvider.method338(ObjectSound.archive10, class305.archive8); // L: 1655 + var20 = Login.field911.length + Login.field910.length; // L: 1658 + if (var19 < var20) { // L: 1661 + Login.Login_loadingText = "Loading title screen - " + var19 * 100 / var20 + "%"; // L: 1662 + Login.Login_loadingPercent = 50; // L: 1663 + } else { + Login.Login_loadingText = "Loaded title screen"; // L: 1666 + Login.Login_loadingPercent = 50; // L: 1667 + PendingSpawn.updateGameState(5); // L: 1668 + Client.titleLoadingStage = 70; // L: 1669 + } + } else if (Client.titleLoadingStage == 70) { // L: 1672 + if (!class356.archive2.isFullyLoaded()) { // L: 1673 + Login.Login_loadingText = "Loading config - " + class356.archive2.loadPercent() + "%"; // L: 1674 + Login.Login_loadingPercent = 60; // L: 1675 + } else { + WorldMapLabelSize.method4417(class356.archive2); // L: 1678 + Archive var28 = class356.archive2; // L: 1679 + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var28; // L: 1681 + JagexCache.method3154(class356.archive2, InterfaceParent.archive7); // L: 1683 + class93.method2392(class356.archive2, InterfaceParent.archive7, Client.isLowDetail); // L: 1684 + var30 = class356.archive2; // L: 1685 + var2 = InterfaceParent.archive7; // L: 1686 + NPCComposition.NpcDefinition_archive = var30; // L: 1688 + class17.NpcDefinition_modelArchive = var2; // L: 1689 + World.method1662(class356.archive2); // L: 1691 + var23 = class356.archive2; // L: 1692 + Archive var4 = InterfaceParent.archive7; // L: 1693 + boolean var24 = Client.isMembersWorld; // L: 1694 + Font var25 = Varcs.fontPlain11; // L: 1695 + ItemComposition.ItemDefinition_archive = var23; // L: 1697 + ItemComposition.ItemDefinition_modelArchive = var4; // L: 1698 + class82.ItemDefinition_inMembersWorld = var24; // L: 1699 + ItemContainer.ItemDefinition_fileCount = ItemComposition.ItemDefinition_archive.getGroupFileCount(10); // L: 1700 + class146.ItemDefinition_fontPlain11 = var25; // L: 1701 + Archive var31 = class356.archive2; // L: 1703 + Archive var26 = NetSocket.archive0; // L: 1704 + Archive var32 = Clock.archive1; // L: 1705 + SequenceDefinition.SequenceDefinition_archive = var31; // L: 1707 + SequenceDefinition.SequenceDefinition_animationsArchive = var26; // L: 1708 + SequenceDefinition.SequenceDefinition_skeletonsArchive = var32; // L: 1709 + Archive var27 = class356.archive2; // L: 1711 + Archive var11 = InterfaceParent.archive7; // L: 1712 + SpotAnimationDefinition.SpotAnimationDefinition_archive = var27; // L: 1714 + class175.SpotAnimationDefinition_modelArchive = var11; // L: 1715 + Archive var12 = class356.archive2; // L: 1717 + VarbitComposition.VarbitDefinition_archive = var12; // L: 1719 + Archive var13 = class356.archive2; // L: 1721 + VarpDefinition.VarpDefinition_archive = var13; // L: 1723 + VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 1724 + Timer.method6381(class194.archive3, InterfaceParent.archive7, class305.archive8, class16.archive13); // L: 1726 + Archive var14 = class356.archive2; // L: 1727 + InvDefinition.InvDefinition_archive = var14; // L: 1729 + Archive var15 = class356.archive2; // L: 1731 + EnumComposition.EnumDefinition_archive = var15; // L: 1733 + Archive var16 = class356.archive2; // L: 1735 + VarcInt.VarcInt_archive = var16; // L: 1737 + class16.method179(class356.archive2); // L: 1739 + class305.method5592(class356.archive2); // L: 1740 + Login.HitSplatDefinition_cachedSprites = new class428(ApproximateRouteStrategy.field473, 54, class263.clientLanguage, class356.archive2); // L: 1741 + class221.HitSplatDefinition_cached = new class428(ApproximateRouteStrategy.field473, 47, class263.clientLanguage, class356.archive2); // L: 1742 + class125.varcs = new Varcs(); // L: 1743 + GameEngine.method505(class356.archive2, class305.archive8, class16.archive13); // L: 1744 + Archive var17 = class356.archive2; // L: 1745 + Archive var18 = class305.archive8; // L: 1746 + World.HealthBarDefinition_archive = var17; // L: 1748 + HealthBarDefinition.field1911 = var18; // L: 1749 + class154.method3059(class356.archive2, class305.archive8); // L: 1751 + Login.Login_loadingText = "Loaded config"; // L: 1752 + Login.Login_loadingPercent = 60; // L: 1753 + Client.titleLoadingStage = 80; // L: 1754 + } + } else if (Client.titleLoadingStage == 80) { // L: 1757 + var19 = 0; // L: 1758 + if (SoundSystem.compass == null) { // L: 1759 + SoundSystem.compass = StructComposition.SpriteBuffer_getSprite(class305.archive8, class28.spriteIds.compass, 0); + } else { + ++var19; // L: 1760 + } + + if (class344.redHintArrowSprite == null) { // L: 1761 + class344.redHintArrowSprite = StructComposition.SpriteBuffer_getSprite(class305.archive8, class28.spriteIds.field4373, 0); + } else { + ++var19; // L: 1762 + } + + if (class29.mapSceneSprites == null) { // L: 1763 + class29.mapSceneSprites = ItemContainer.method2062(class305.archive8, class28.spriteIds.mapScenes, 0); + } else { + ++var19; // L: 1764 + } + + SpritePixels[] var1; + int var3; + SpritePixels[] var5; + int var6; + SpritePixels var7; + int var8; + byte[] var9; + int var10; + if (UserComparator4.headIconPkSprites == null) { // L: 1765 + var2 = class305.archive8; // L: 1767 + var3 = class28.spriteIds.headIconsPk; // L: 1768 + if (!User.method6514(var2, var3, 0)) { // L: 1770 + var1 = null; // L: 1771 + } else { + var5 = new SpritePixels[class453.SpriteBuffer_spriteCount]; // L: 1776 + var6 = 0; + + while (true) { + if (var6 >= class453.SpriteBuffer_spriteCount) { + VarcInt.method3325(); // L: 1790 + var1 = var5; // L: 1793 + break; + } + + var7 = var5[var6] = new SpritePixels(); // L: 1778 + var7.width = class453.SpriteBuffer_spriteWidth; // L: 1779 + var7.height = class453.SpriteBuffer_spriteHeight; // L: 1780 + var7.xOffset = class453.SpriteBuffer_xOffsets[var6]; // L: 1781 + var7.yOffset = class453.SpriteBuffer_yOffsets[var6]; // L: 1782 + var7.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[var6]; // L: 1783 + var7.subHeight = class453.SpriteBuffer_spriteHeights[var6]; // L: 1784 + var8 = var7.subHeight * var7.subWidth; // L: 1785 + var9 = class127.SpriteBuffer_pixels[var6]; // L: 1786 + var7.pixels = new int[var8]; // L: 1787 + + for (var10 = 0; var10 < var8; ++var10) { // L: 1788 + var7.pixels[var10] = Decimator.SpriteBuffer_spritePalette[var9[var10] & 255]; + } + + ++var6; // L: 1777 + } + } + + UserComparator4.headIconPkSprites = var1; // L: 1795 + } else { + ++var19; // L: 1797 + } + + if (ChatChannel.headIconPrayerSprites == null) { // L: 1798 + var2 = class305.archive8; // L: 1800 + var3 = class28.spriteIds.field4376; // L: 1801 + if (!User.method6514(var2, var3, 0)) { // L: 1803 + var1 = null; // L: 1804 + } else { + var5 = new SpritePixels[class453.SpriteBuffer_spriteCount]; // L: 1809 + var6 = 0; + + while (true) { + if (var6 >= class453.SpriteBuffer_spriteCount) { + VarcInt.method3325(); // L: 1823 + var1 = var5; // L: 1826 + break; + } + + var7 = var5[var6] = new SpritePixels(); // L: 1811 + var7.width = class453.SpriteBuffer_spriteWidth; // L: 1812 + var7.height = class453.SpriteBuffer_spriteHeight; // L: 1813 + var7.xOffset = class453.SpriteBuffer_xOffsets[var6]; // L: 1814 + var7.yOffset = class453.SpriteBuffer_yOffsets[var6]; // L: 1815 + var7.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[var6]; // L: 1816 + var7.subHeight = class453.SpriteBuffer_spriteHeights[var6]; // L: 1817 + var8 = var7.subWidth * var7.subHeight; // L: 1818 + var9 = class127.SpriteBuffer_pixels[var6]; // L: 1819 + var7.pixels = new int[var8]; // L: 1820 + + for (var10 = 0; var10 < var8; ++var10) { // L: 1821 + var7.pixels[var10] = Decimator.SpriteBuffer_spritePalette[var9[var10] & 255]; + } + + ++var6; // L: 1810 + } + } + + ChatChannel.headIconPrayerSprites = var1; // L: 1828 + } else { + ++var19; // L: 1830 + } + + if (class21.headIconHintSprites == null) { // L: 1831 + var2 = class305.archive8; // L: 1833 + var3 = class28.spriteIds.field4377; // L: 1834 + if (!User.method6514(var2, var3, 0)) { // L: 1836 + var1 = null; // L: 1837 + } else { + var5 = new SpritePixels[class453.SpriteBuffer_spriteCount]; // L: 1842 + var6 = 0; + + while (true) { + if (var6 >= class453.SpriteBuffer_spriteCount) { + VarcInt.method3325(); // L: 1856 + var1 = var5; // L: 1859 + break; + } + + var7 = var5[var6] = new SpritePixels(); // L: 1844 + var7.width = class453.SpriteBuffer_spriteWidth; // L: 1845 + var7.height = class453.SpriteBuffer_spriteHeight; // L: 1846 + var7.xOffset = class453.SpriteBuffer_xOffsets[var6]; // L: 1847 + var7.yOffset = class453.SpriteBuffer_yOffsets[var6]; // L: 1848 + var7.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[var6]; // L: 1849 + var7.subHeight = class453.SpriteBuffer_spriteHeights[var6]; // L: 1850 + var8 = var7.subWidth * var7.subHeight; // L: 1851 + var9 = class127.SpriteBuffer_pixels[var6]; // L: 1852 + var7.pixels = new int[var8]; // L: 1853 + + for (var10 = 0; var10 < var8; ++var10) { // L: 1854 + var7.pixels[var10] = Decimator.SpriteBuffer_spritePalette[var9[var10] & 255]; + } + + ++var6; // L: 1843 + } + } + + class21.headIconHintSprites = var1; // L: 1861 + } else { + ++var19; // L: 1863 + } + + if (class146.mapMarkerSprites == null) { // L: 1864 + var2 = class305.archive8; // L: 1866 + var3 = class28.spriteIds.field4378; // L: 1867 + if (!User.method6514(var2, var3, 0)) { // L: 1869 + var1 = null; // L: 1870 + } else { + var5 = new SpritePixels[class453.SpriteBuffer_spriteCount]; // L: 1875 + var6 = 0; + + while (true) { + if (var6 >= class453.SpriteBuffer_spriteCount) { + VarcInt.method3325(); // L: 1889 + var1 = var5; // L: 1892 + break; + } + + var7 = var5[var6] = new SpritePixels(); // L: 1877 + var7.width = class453.SpriteBuffer_spriteWidth; // L: 1878 + var7.height = class453.SpriteBuffer_spriteHeight; // L: 1879 + var7.xOffset = class453.SpriteBuffer_xOffsets[var6]; // L: 1880 + var7.yOffset = class453.SpriteBuffer_yOffsets[var6]; // L: 1881 + var7.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[var6]; // L: 1882 + var7.subHeight = class453.SpriteBuffer_spriteHeights[var6]; // L: 1883 + var8 = var7.subWidth * var7.subHeight; // L: 1884 + var9 = class127.SpriteBuffer_pixels[var6]; // L: 1885 + var7.pixels = new int[var8]; // L: 1886 + + for (var10 = 0; var10 < var8; ++var10) { // L: 1887 + var7.pixels[var10] = Decimator.SpriteBuffer_spritePalette[var9[var10] & 255]; + } + + ++var6; // L: 1876 + } + } + + class146.mapMarkerSprites = var1; // L: 1894 + } else { + ++var19; // L: 1896 + } + + if (Projectile.crossSprites == null) { // L: 1897 + var2 = class305.archive8; // L: 1899 + var3 = class28.spriteIds.field4374; // L: 1900 + if (!User.method6514(var2, var3, 0)) { // L: 1902 + var1 = null; // L: 1903 + } else { + var5 = new SpritePixels[class453.SpriteBuffer_spriteCount]; // L: 1908 + var6 = 0; + + while (true) { + if (var6 >= class453.SpriteBuffer_spriteCount) { + VarcInt.method3325(); // L: 1922 + var1 = var5; // L: 1925 + break; + } + + var7 = var5[var6] = new SpritePixels(); // L: 1910 + var7.width = class453.SpriteBuffer_spriteWidth; // L: 1911 + var7.height = class453.SpriteBuffer_spriteHeight; // L: 1912 + var7.xOffset = class453.SpriteBuffer_xOffsets[var6]; // L: 1913 + var7.yOffset = class453.SpriteBuffer_yOffsets[var6]; // L: 1914 + var7.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[var6]; // L: 1915 + var7.subHeight = class453.SpriteBuffer_spriteHeights[var6]; // L: 1916 + var8 = var7.subWidth * var7.subHeight; // L: 1917 + var9 = class127.SpriteBuffer_pixels[var6]; // L: 1918 + var7.pixels = new int[var8]; // L: 1919 + + for (var10 = 0; var10 < var8; ++var10) { // L: 1920 + var7.pixels[var10] = Decimator.SpriteBuffer_spritePalette[var9[var10] & 255]; + } + + ++var6; // L: 1909 + } + } + + Projectile.crossSprites = var1; // L: 1927 + } else { + ++var19; // L: 1929 + } + + if (WallDecoration.mapDotSprites == null) { // L: 1930 + var2 = class305.archive8; // L: 1932 + var3 = class28.spriteIds.field4375; // L: 1933 + if (!User.method6514(var2, var3, 0)) { // L: 1935 + var1 = null; // L: 1936 + } else { + var5 = new SpritePixels[class453.SpriteBuffer_spriteCount]; // L: 1941 + var6 = 0; + + while (true) { + if (var6 >= class453.SpriteBuffer_spriteCount) { + VarcInt.method3325(); // L: 1955 + var1 = var5; // L: 1958 + break; + } + + var7 = var5[var6] = new SpritePixels(); // L: 1943 + var7.width = class453.SpriteBuffer_spriteWidth; // L: 1944 + var7.height = class453.SpriteBuffer_spriteHeight; // L: 1945 + var7.xOffset = class453.SpriteBuffer_xOffsets[var6]; // L: 1946 + var7.yOffset = class453.SpriteBuffer_yOffsets[var6]; // L: 1947 + var7.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[var6]; // L: 1948 + var7.subHeight = class453.SpriteBuffer_spriteHeights[var6]; // L: 1949 + var8 = var7.subHeight * var7.subWidth; // L: 1950 + var9 = class127.SpriteBuffer_pixels[var6]; // L: 1951 + var7.pixels = new int[var8]; // L: 1952 + + for (var10 = 0; var10 < var8; ++var10) { // L: 1953 + var7.pixels[var10] = Decimator.SpriteBuffer_spritePalette[var9[var10] & 255]; + } + + ++var6; // L: 1942 + } + } + + WallDecoration.mapDotSprites = var1; // L: 1960 + } else { + ++var19; // L: 1962 + } + + if (class127.scrollBarSprites == null) { // L: 1963 + class127.scrollBarSprites = ItemContainer.method2062(class305.archive8, class28.spriteIds.field4381, 0); + } else { + ++var19; // L: 1964 + } + + if (ScriptEvent.modIconSprites == null) { // L: 1965 + ScriptEvent.modIconSprites = ItemContainer.method2062(class305.archive8, class28.spriteIds.field4372, 0); + } else { + ++var19; // L: 1966 + } + + if (var19 < 11) { // L: 1967 + Login.Login_loadingText = "Loading sprites - " + var19 * 100 / 12 + "%"; // L: 1968 + Login.Login_loadingPercent = 70; // L: 1969 + } else { + AbstractFont.AbstractFont_modIconSprites = ScriptEvent.modIconSprites; // L: 1972 + class344.redHintArrowSprite.normalize(); // L: 1973 + var20 = (int)(Math.random() * 21.0D) - 10; // L: 1974 + int var21 = (int)(Math.random() * 21.0D) - 10; // L: 1975 + var3 = (int)(Math.random() * 21.0D) - 10; // L: 1976 + int var22 = (int)(Math.random() * 41.0D) - 20; // L: 1977 + class29.mapSceneSprites[0].shiftColors(var22 + var20, var21 + var22, var3 + var22); // L: 1978 + Login.Login_loadingText = "Loaded sprites"; // L: 1979 + Login.Login_loadingPercent = 70; // L: 1980 + Client.titleLoadingStage = 90; // L: 1981 + } + } else if (Client.titleLoadingStage == 90) { // L: 1984 + if (!TileItem.archive9.isFullyLoaded()) { // L: 1985 + Login.Login_loadingText = "Loading textures - " + "0%"; // L: 1986 + Login.Login_loadingPercent = 90; // L: 1987 + } else { + PcmPlayer.textureProvider = new TextureProvider(TileItem.archive9, class305.archive8, 20, class12.clientPreferences.method2225(), Client.isLowDetail ? 64 : 128); // L: 1990 + Rasterizer3D.Rasterizer3D_setTextureLoader(PcmPlayer.textureProvider); // L: 1991 + Rasterizer3D.Rasterizer3D_setBrightness(class12.clientPreferences.method2225()); // L: 1992 + Client.titleLoadingStage = 100; // L: 1993 + } + } else if (Client.titleLoadingStage == 100) { // L: 1996 + var19 = PcmPlayer.textureProvider.getLoadedPercentage(); // L: 1997 + if (var19 < 100) { // L: 1998 + Login.Login_loadingText = "Loading textures - " + var19 + "%"; // L: 1999 + Login.Login_loadingPercent = 90; // L: 2000 + } else { + Login.Login_loadingText = "Loaded textures"; // L: 2003 + Login.Login_loadingPercent = 90; // L: 2004 + Client.titleLoadingStage = 110; // L: 2005 + } + } else if (Client.titleLoadingStage == 110) { // L: 2008 + Varcs.mouseRecorder = new MouseRecorder(); // L: 2009 + GameEngine.taskHandler.newThreadTask(Varcs.mouseRecorder, 10); // L: 2010 + Login.Login_loadingText = "Loaded input handler"; // L: 2011 + Login.Login_loadingPercent = 92; // L: 2012 + Client.titleLoadingStage = 120; // L: 2013 + } else if (Client.titleLoadingStage == 120) { // L: 2016 + if (!ObjectSound.archive10.tryLoadFileByNames("huffman", "")) { // L: 2017 + Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 2018 + Login.Login_loadingPercent = 94; // L: 2019 + } else { + Huffman var0 = new Huffman(ObjectSound.archive10.takeFileByNames("huffman", "")); // L: 2022 + GraphicsObject.method1870(var0); // L: 2023 + Login.Login_loadingText = "Loaded wordpack"; // L: 2024 + Login.Login_loadingPercent = 94; // L: 2025 + Client.titleLoadingStage = 130; // L: 2026 + } + } else if (Client.titleLoadingStage == 130) { // L: 2029 + if (!class194.archive3.isFullyLoaded()) { // L: 2030 + Login.Login_loadingText = "Loading interfaces - " + class194.archive3.loadPercent() * 4 / 5 + "%"; // L: 2031 + Login.Login_loadingPercent = 96; // L: 2032 + } else if (!class115.archive12.isFullyLoaded()) { // L: 2035 + Login.Login_loadingText = "Loading interfaces - " + (80 + class115.archive12.loadPercent() / 6) + "%"; // L: 2036 + Login.Login_loadingPercent = 96; // L: 2037 + } else if (!class16.archive13.isFullyLoaded()) { // L: 2040 + Login.Login_loadingText = "Loading interfaces - " + (96 + class16.archive13.loadPercent() / 50) + "%"; // L: 2041 + Login.Login_loadingPercent = 96; // L: 2042 + } else { + Login.Login_loadingText = "Loaded interfaces"; // L: 2045 + Login.Login_loadingPercent = 98; // L: 2046 + Client.titleLoadingStage = 140; // L: 2047 + } + } else if (Client.titleLoadingStage == 140) { // L: 2050 + Login.Login_loadingPercent = 100; // L: 2051 + if (!VarpDefinition.archive19.tryLoadGroupByName(WorldMapCacheName.field2910.name)) { // L: 2052 + Login.Login_loadingText = "Loading world map - " + VarpDefinition.archive19.groupLoadPercentByName(WorldMapCacheName.field2910.name) / 10 + "%"; // L: 2053 + } else { + if (ServerPacket.worldMap == null) { // L: 2056 + ServerPacket.worldMap = new WorldMap(); // L: 2057 + ServerPacket.worldMap.init(VarpDefinition.archive19, class92.archive18, ItemContainer.archive20, ChatChannel.fontBold12, Client.fontsMap, class29.mapSceneSprites); // L: 2058 + } + + Login.Login_loadingText = "Loaded world map"; // L: 2060 + Client.titleLoadingStage = 150; // L: 2061 + } + } else if (Client.titleLoadingStage == 150) { // L: 2064 + PendingSpawn.updateGameState(10); // L: 2065 + } } - - return (var0 & 65408) + var1; // L: 951 } - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-89" - ) - public static void method3033(boolean var0) { - if (var0 != DevicePcmPlayerProvider.ItemDefinition_inMembersWorld) { // L: 584 - ItemComposition.ItemDefinition_cached.clear(); // L: 586 - ItemComposition.ItemDefinition_cachedModels.clear(); // L: 587 - ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 588 - DevicePcmPlayerProvider.ItemDefinition_inMembersWorld = var0; // L: 590 - } - - } // L: 592 + } // L: 1531 1537 1563 1590 1610 1635 1643 1652 1664 1670 1676 1755 1970 1982 1988 1994 2001 2006 2014 2020 2027 2033 2038 2043 2048 2054 2062 2066 2068 } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 4a6cbdb081..91b34f5fb0 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1,2089 +1,2146 @@ +import com.jagex.oldscape.pub.OAuthApi; +import com.jagex.oldscape.pub.OtlTokenRequester; +import com.jagex.oldscape.pub.RefreshAccessTokenRequester; import java.io.IOException; import java.net.MalformedURLException; import java.net.Socket; import java.net.URL; +import java.security.SecureRandom; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; -import java.util.LinkedHashMap; +import java.util.Map.Entry; import java.util.concurrent.Future; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; import netscape.javascript.JSObject; @Implements("Client") @ObfuscatedName("client") public final class Client extends GameEngine implements Usernamed, OAuthApi { - @ObfuscatedName("rw") + @ObfuscatedName("rk") @ObfuscatedSignature( - descriptor = "[Lex;" + descriptor = "[Lek;" ) @Export("currentClanSettings") static ClanSettings[] currentClanSettings; - @ObfuscatedName("us") + @ObfuscatedName("un") @ObfuscatedGetter( - intValue = 1674651291 - ) - public static int field779; - @ObfuscatedName("ss") - @Export("playingJingle") - static boolean playingJingle; - @ObfuscatedName("tz") - @ObfuscatedGetter( - intValue = 599158567 + intValue = 127608033 ) @Export("viewportOffsetX") static int viewportOffsetX; - @ObfuscatedName("to") + @ObfuscatedName("up") @ObfuscatedGetter( - intValue = -296270013 + intValue = 332427901 ) @Export("viewportOffsetY") static int viewportOffsetY; - @ObfuscatedName("rk") + @ObfuscatedName("uz") @ObfuscatedGetter( - intValue = 1370188631 + intValue = 734962691 + ) + public static int field767; + @ObfuscatedName("si") + @Export("playingJingle") + static boolean playingJingle; + @ObfuscatedName("vu") + @ObfuscatedSignature( + descriptor = "Lbl;" + ) + static final ApproximateRouteStrategy field771; + @ObfuscatedName("vk") + static int[] field772; + @ObfuscatedName("vl") + static int[] field773; + @ObfuscatedName("rq") + @ObfuscatedGetter( + intValue = -1537020861 ) @Export("destinationX") static int destinationX; - @ObfuscatedName("rf") + @ObfuscatedName("sq") @ObfuscatedGetter( - intValue = -1262873417 + intValue = -512520213 ) @Export("destinationY") static int destinationY; - @ObfuscatedName("vi") - @ObfuscatedSignature( - descriptor = "Lbh;" - ) - static final ApproximateRouteStrategy field783; - @ObfuscatedName("vy") - static int[] field784; - @ObfuscatedName("vj") - static int[] field785; - @ObfuscatedName("sa") - @Export("isCameraLocked") - static boolean isCameraLocked; - @ObfuscatedName("tu") - static boolean field754; - @ObfuscatedName("ue") + @ObfuscatedName("uc") @ObfuscatedGetter( - intValue = 1572034959 + intValue = 2034802331 ) - static int field561; - @ObfuscatedName("uz") + static int field602; + @ObfuscatedName("uv") @ObfuscatedSignature( descriptor = "Lkp;" ) @Export("playerAppearance") static PlayerComposition playerAppearance; - @ObfuscatedName("sw") + @ObfuscatedName("sf") @ObfuscatedGetter( - intValue = 1679635193 - ) - @Export("soundEffectCount") - static int soundEffectCount; - @ObfuscatedName("qn") - @ObfuscatedGetter( - intValue = -1673017289 - ) - @Export("publicChatMode") - static int publicChatMode; - @ObfuscatedName("sq") - @Export("soundEffectIds") - static int[] soundEffectIds; - @ObfuscatedName("uj") - @ObfuscatedGetter( - intValue = 984000669 - ) - static int field775; - @ObfuscatedName("qz") - @ObfuscatedGetter( - intValue = 1124774391 - ) - @Export("tradeChatMode") - static int tradeChatMode; - @ObfuscatedName("sc") - @Export("queuedSoundEffectLoops") - static int[] queuedSoundEffectLoops; - @ObfuscatedName("sm") - @Export("queuedSoundEffectDelays") - static int[] queuedSoundEffectDelays; - @ObfuscatedName("sp") - @ObfuscatedSignature( - descriptor = "[Lav;" - ) - @Export("soundEffects") - static SoundEffect[] soundEffects; - @ObfuscatedName("sb") - @ObfuscatedGetter( - intValue = -1290712593 + intValue = 438457609 ) @Export("currentTrackGroupId") static int currentTrackGroupId; - @ObfuscatedName("sy") - @Export("soundLocations") - static int[] soundLocations; - @ObfuscatedName("so") + @ObfuscatedName("ur") @ObfuscatedGetter( - intValue = 362704857 + intValue = -125837253 + ) + static int field763; + @ObfuscatedName("so") + @Export("isCameraLocked") + static boolean isCameraLocked; + @ObfuscatedName("sv") + @ObfuscatedGetter( + intValue = -1463523237 ) @Export("minimapState") static int minimapState; - @ObfuscatedName("rt") - @ObfuscatedGetter( - intValue = 223521103 - ) - static int field714; - @ObfuscatedName("rj") - @ObfuscatedGetter( - longValue = -2347175531478296847L - ) - static long field585; - @ObfuscatedName("uf") - @Export("archiveLoaders") - static ArrayList archiveLoaders; - @ObfuscatedName("tx") - static boolean[] field546; - @ObfuscatedName("uo") - @ObfuscatedGetter( - intValue = 810173849 - ) - @Export("archiveLoadersDone") - static int archiveLoadersDone; - @ObfuscatedName("rx") - @ObfuscatedGetter( - intValue = -2104517495 - ) - @Export("mapIconCount") - static int mapIconCount; - @ObfuscatedName("tk") - static short field760; - @ObfuscatedName("te") - static short field761; - @ObfuscatedName("tt") - static short field766; - @ObfuscatedName("rd") - @Export("mapIconXs") - static int[] mapIconXs; - @ObfuscatedName("tq") - static short field666; - @ObfuscatedName("tg") - static short field765; - @ObfuscatedName("um") - @ObfuscatedSignature( - descriptor = "Lor;" - ) - @Export("platformInfoProvider") - static PlatformInfoProvider platformInfoProvider; - @ObfuscatedName("tc") - @ObfuscatedGetter( - intValue = -985861069 - ) - @Export("viewportZoom") - static int viewportZoom; - @ObfuscatedName("tw") - static short field764; - @ObfuscatedName("td") - @ObfuscatedGetter( - intValue = 115517713 - ) - @Export("viewportWidth") - static int viewportWidth; - @ObfuscatedName("ri") - @Export("mapIconYs") - static int[] mapIconYs; @ObfuscatedName("th") - static int[] field756; + static boolean[] field743; + @ObfuscatedName("rw") + @ObfuscatedGetter( + intValue = 1443023427 + ) + static int field515; @ObfuscatedName("rc") @ObfuscatedSignature( - descriptor = "[Lqi;" - ) - @Export("mapIcons") - static SpritePixels[] mapIcons; - @ObfuscatedName("tl") - static int[] field636; - @ObfuscatedName("tb") - static int[] field674; - @ObfuscatedName("ru") - @ObfuscatedSignature( - descriptor = "[Lea;" + descriptor = "[Let;" ) @Export("currentClanChannels") static ClanChannel[] currentClanChannels; - @ObfuscatedName("tm") - static int[] field600; - @ObfuscatedName("ty") - @ObfuscatedGetter( - intValue = -2113477791 - ) - @Export("viewportHeight") - static int viewportHeight; - @ObfuscatedName("ra") - @ObfuscatedGetter( - intValue = -319356623 - ) - static int field731; - @ObfuscatedName("qt") + @ObfuscatedName("ti") + static boolean field742; + @ObfuscatedName("ri") @Export("crossWorldMessageIds") static long[] crossWorldMessageIds; - @ObfuscatedName("ts") - @Export("zoomHeight") - static short zoomHeight; - @ObfuscatedName("tr") - @Export("zoomWidth") - static short zoomWidth; - @ObfuscatedName("rq") + @ObfuscatedName("rj") @ObfuscatedGetter( - intValue = 959543265 + intValue = 1619055061 ) @Export("crossWorldMessageIdsIndex") static int crossWorldMessageIdsIndex; - @ObfuscatedName("rn") - static int[] field733; - @ObfuscatedName("re") - static int[] field732; - @ObfuscatedName("ul") + @ObfuscatedName("rm") @ObfuscatedGetter( - intValue = 75180695 + longValue = -2855623584539877235L ) - static int field782; - @ObfuscatedName("ug") + static long field722; + @ObfuscatedName("uh") + @Export("archiveLoaders") + static ArrayList archiveLoaders; + @ObfuscatedName("vp") + @ObfuscatedGetter( + intValue = 430177943 + ) + @Export("archiveLoadersDone") + static int archiveLoadersDone; + @ObfuscatedName("sz") + @ObfuscatedGetter( + intValue = -2066946189 + ) + @Export("soundEffectCount") + static int soundEffectCount; + @ObfuscatedName("sa") + @Export("queuedSoundEffectDelays") + static int[] queuedSoundEffectDelays; + @ObfuscatedName("td") + static short field748; + @ObfuscatedName("ty") + static short field749; + @ObfuscatedName("se") @ObfuscatedSignature( - descriptor = "[Llh;" + descriptor = "[Lau;" + ) + @Export("soundEffects") + static SoundEffect[] soundEffects; + @ObfuscatedName("ug") + static short field656; + @ObfuscatedName("sn") + @Export("soundEffectIds") + static int[] soundEffectIds; + @ObfuscatedName("uj") + @ObfuscatedSignature( + descriptor = "Loi;" + ) + @Export("platformInfoProvider") + static PlatformInfoProvider platformInfoProvider; + @ObfuscatedName("uk") + static short field755; + @ObfuscatedName("tt") + static short field753; + @ObfuscatedName("sy") + @Export("queuedSoundEffectLoops") + static int[] queuedSoundEffectLoops; + @ObfuscatedName("ry") + @ObfuscatedGetter( + intValue = 1318674061 + ) + @Export("mapIconCount") + static int mapIconCount; + @ObfuscatedName("st") + @Export("soundLocations") + static int[] soundLocations; + @ObfuscatedName("ua") + @ObfuscatedGetter( + intValue = 1333373151 + ) + @Export("viewportZoom") + static int viewportZoom; + @ObfuscatedName("tz") + static short field752; + @ObfuscatedName("rf") + @Export("mapIconXs") + static int[] mapIconXs; + @ObfuscatedName("uu") + @ObfuscatedGetter( + intValue = 731924017 + ) + @Export("viewportWidth") + static int viewportWidth; + @ObfuscatedName("us") + @ObfuscatedGetter( + intValue = -1035456419 + ) + @Export("viewportHeight") + static int viewportHeight; + @ObfuscatedName("rl") + @Export("mapIconYs") + static int[] mapIconYs; + @ObfuscatedName("rs") + @ObfuscatedSignature( + descriptor = "[Lqr;" + ) + @Export("mapIcons") + static SpritePixels[] mapIcons; + @ObfuscatedName("tf") + @Export("zoomHeight") + static short zoomHeight; + @ObfuscatedName("tw") + @Export("zoomWidth") + static short zoomWidth; + @ObfuscatedName("rr") + @ObfuscatedGetter( + intValue = -509945839 + ) + static int field719; + @ObfuscatedName("tx") + static int[] field745; + @ObfuscatedName("rp") + static int[] field721; + @ObfuscatedName("vc") + @ObfuscatedGetter( + intValue = 1709573475 + ) + static int field770; + @ObfuscatedName("rn") + static int[] field720; + @ObfuscatedName("tg") + static int[] field744; + @ObfuscatedName("tp") + static int[] field714; + @ObfuscatedName("tv") + static int[] field677; + @ObfuscatedName("ux") + @ObfuscatedSignature( + descriptor = "[Lly;" ) @Export("grandExchangeOffers") static GrandExchangeOffer[] grandExchangeOffers; - @ObfuscatedName("qs") - static String field728; - @ObfuscatedName("uw") + @ObfuscatedName("rz") + static int[] field769; + @ObfuscatedName("ru") + @ObfuscatedGetter( + intValue = -1427601113 + ) + @Export("publicChatMode") + static int publicChatMode; + @ObfuscatedName("rt") + @ObfuscatedGetter( + intValue = -1897700155 + ) + @Export("tradeChatMode") + static int tradeChatMode; + @ObfuscatedName("rd") + static String field549; + @ObfuscatedName("uy") @ObfuscatedSignature( - descriptor = "Lbf;" + descriptor = "Lbs;" ) @Export("GrandExchangeEvents_worldComparator") static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lgv;" + descriptor = "[Lgh;" ) @Export("collisionMaps") static CollisionMap[] collisionMaps; - @ObfuscatedName("aa") - static boolean field490; - @ObfuscatedName("bj") + @ObfuscatedName("at") + static boolean field659; + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = 125631107 + intValue = -1278418291 ) @Export("worldId") public static int worldId; - @ObfuscatedName("bm") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 1205446505 + intValue = -1944187969 ) @Export("worldProperties") static int worldProperties; - @ObfuscatedName("bo") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = 648294645 + intValue = -792348705 ) @Export("gameBuild") static int gameBuild; - @ObfuscatedName("bh") + @ObfuscatedName("bl") @Export("isMembersWorld") public static boolean isMembersWorld; - @ObfuscatedName("bf") + @ObfuscatedName("bs") @Export("isLowDetail") static boolean isLowDetail; - @ObfuscatedName("bn") + @ObfuscatedName("bj") + static String field662; + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = 302223075 + intValue = -217293771 ) - static int field617; - @ObfuscatedName("bq") + static int field484; + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -1896865619 + intValue = 499498919 ) @Export("clientType") static int clientType; - @ObfuscatedName("ba") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = 2077868883 + intValue = -965368167 ) - static int field498; - @ObfuscatedName("bk") + static int field486; + @ObfuscatedName("bt") @Export("onMobile") static boolean onMobile; - @ObfuscatedName("cc") + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = 1430199997 + intValue = 1544003447 ) @Export("gameState") static int gameState; - @ObfuscatedName("cd") - static boolean field504; - @ObfuscatedName("cw") + @ObfuscatedName("cp") @Export("isLoading") static boolean isLoading; - @ObfuscatedName("cx") + @ObfuscatedName("dc") @ObfuscatedGetter( - intValue = 395789251 + intValue = 469489167 ) @Export("cycle") static int cycle; - @ObfuscatedName("dr") + @ObfuscatedName("dp") @ObfuscatedGetter( - longValue = 4039727128502314979L + longValue = -7486676481103711511L ) @Export("mouseLastLastPressedTimeMillis") static long mouseLastLastPressedTimeMillis; - @ObfuscatedName("dd") + @ObfuscatedName("dy") @ObfuscatedGetter( - intValue = -1271698921 + intValue = -1940299159 ) - static int field508; - @ObfuscatedName("dg") + static int field492; + @ObfuscatedName("dh") @ObfuscatedGetter( - intValue = -636439299 + intValue = 1700797465 ) - static int field509; - @ObfuscatedName("de") + static int field681; + @ObfuscatedName("dj") @ObfuscatedGetter( - longValue = -3400389721311801431L + longValue = 4238643244622265373L ) - static long field510; - @ObfuscatedName("dp") + static long field494; + @ObfuscatedName("dx") @Export("hadFocus") static boolean hadFocus; - @ObfuscatedName("dx") + @ObfuscatedName("dd") @ObfuscatedGetter( - intValue = -1948172533 + intValue = 2094140741 ) @Export("rebootTimer") static int rebootTimer; - @ObfuscatedName("ds") + @ObfuscatedName("do") @ObfuscatedGetter( - intValue = -1059936819 + intValue = 1533095709 ) @Export("hintArrowType") static int hintArrowType; - @ObfuscatedName("dc") + @ObfuscatedName("di") @ObfuscatedGetter( - intValue = -1326790571 + intValue = 327943909 ) @Export("hintArrowNpcIndex") static int hintArrowNpcIndex; - @ObfuscatedName("dm") + @ObfuscatedName("de") @ObfuscatedGetter( - intValue = 1613753799 + intValue = -1320763851 ) @Export("hintArrowPlayerIndex") static int hintArrowPlayerIndex; - @ObfuscatedName("dv") + @ObfuscatedName("db") @ObfuscatedGetter( - intValue = 678748679 + intValue = -48902629 ) @Export("hintArrowX") static int hintArrowX; - @ObfuscatedName("da") + @ObfuscatedName("dn") @ObfuscatedGetter( - intValue = -484656195 + intValue = 618879367 ) @Export("hintArrowY") static int hintArrowY; - @ObfuscatedName("di") + @ObfuscatedName("dz") @ObfuscatedGetter( - intValue = -2063879327 + intValue = -523368967 ) @Export("hintArrowHeight") static int hintArrowHeight; - @ObfuscatedName("dt") + @ObfuscatedName("dl") @ObfuscatedGetter( - intValue = 800403081 + intValue = 554007097 ) @Export("hintArrowSubX") static int hintArrowSubX; - @ObfuscatedName("df") + @ObfuscatedName("da") @ObfuscatedGetter( - intValue = 576607501 + intValue = -741189791 ) @Export("hintArrowSubY") static int hintArrowSubY; - @ObfuscatedName("du") + @ObfuscatedName("dr") @ObfuscatedSignature( - descriptor = "Lcn;" + descriptor = "Lcq;" ) @Export("playerAttackOption") static AttackOption playerAttackOption; - @ObfuscatedName("dz") + @ObfuscatedName("ds") @ObfuscatedSignature( - descriptor = "Lcn;" + descriptor = "Lcq;" ) @Export("npcAttackOption") static AttackOption npcAttackOption; - @ObfuscatedName("db") + @ObfuscatedName("dw") @ObfuscatedGetter( - intValue = 1784085227 + intValue = -1074005895 ) @Export("titleLoadingStage") static int titleLoadingStage; - @ObfuscatedName("dy") + @ObfuscatedName("em") @ObfuscatedGetter( - intValue = -20961693 + intValue = -1048838289 ) @Export("js5ConnectState") static int js5ConnectState; - @ObfuscatedName("ec") + @ObfuscatedName("eh") @ObfuscatedGetter( - intValue = 1976785561 + intValue = -732279823 ) - static int field525; - @ObfuscatedName("ez") + static int field625; + @ObfuscatedName("et") + @ObfuscatedSignature( + descriptor = "Lle;" + ) + @Export("archive15") + static Archive archive15; + @ObfuscatedName("eu") @ObfuscatedGetter( - intValue = 962124251 + intValue = 186266927 ) @Export("js5Errors") static int js5Errors; - @ObfuscatedName("eh") + @ObfuscatedName("eq") @ObfuscatedGetter( - intValue = 1954076743 + intValue = -1220447691 ) @Export("loginState") static int loginState; - @ObfuscatedName("ev") + @ObfuscatedName("fs") @ObfuscatedGetter( - intValue = -1036916585 + intValue = 2023084757 ) - static int field528; - @ObfuscatedName("ff") - @ObfuscatedGetter( - intValue = -1101689681 - ) - static int field661; + static int field626; @ObfuscatedName("fp") @ObfuscatedGetter( - intValue = 1469005087 + intValue = -70601535 ) - static int field530; - @ObfuscatedName("fo") - @ObfuscatedSignature( - descriptor = "Ldl;" + static int field514; + @ObfuscatedName("fy") + @ObfuscatedGetter( + intValue = -30088535 ) - static class124 field531; - @ObfuscatedName("fm") - @ObfuscatedSignature( - descriptor = "Lpq;" - ) - static class441 field532; - @ObfuscatedName("ft") - @Export("Login_isUsernameRemembered") - static boolean Login_isUsernameRemembered; + static int field654; @ObfuscatedName("fg") @ObfuscatedSignature( - descriptor = "Lbt;" + descriptor = "Ldf;" + ) + static class124 field615; + @ObfuscatedName("fd") + @ObfuscatedSignature( + descriptor = "Lqu;" + ) + static class443 field517; + @ObfuscatedName("fk") + static final String field526; + @ObfuscatedName("gp") + @Export("Login_isUsernameRemembered") + static boolean Login_isUsernameRemembered; + @ObfuscatedName("gk") + @ObfuscatedSignature( + descriptor = "Lbh;" ) @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; - @ObfuscatedName("gs") + @ObfuscatedName("gy") + @Export("secureRandom") + static SecureRandom secureRandom; + @ObfuscatedName("gd") @Export("randomDatData") static byte[] randomDatData; - @ObfuscatedName("gw") + @ObfuscatedName("ga") @ObfuscatedSignature( - descriptor = "[Lcy;" + descriptor = "[Lcd;" ) @Export("npcs") static NPC[] npcs; - @ObfuscatedName("gv") + @ObfuscatedName("go") @ObfuscatedGetter( - intValue = 1354722257 + intValue = 1947856981 ) @Export("npcCount") static int npcCount; - @ObfuscatedName("gt") + @ObfuscatedName("gu") @Export("npcIndices") static int[] npcIndices; - @ObfuscatedName("gm") + @ObfuscatedName("gn") @ObfuscatedGetter( - intValue = 349713523 + intValue = 1608740447 ) - static int field547; - @ObfuscatedName("go") - static int[] field548; - @ObfuscatedName("gp") + static int field565; + @ObfuscatedName("gr") + static int[] field601; + @ObfuscatedName("gm") @ObfuscatedSignature( - descriptor = "Lcl;" + descriptor = "Lcz;" ) @Export("packetWriter") public static final PacketWriter packetWriter; - @ObfuscatedName("ga") + @ObfuscatedName("gg") @ObfuscatedGetter( - intValue = -429421433 + intValue = 1726076607 ) @Export("logoutTimer") static int logoutTimer; - @ObfuscatedName("gu") + @ObfuscatedName("gt") @Export("hadNetworkError") static boolean hadNetworkError; - @ObfuscatedName("gd") + @ObfuscatedName("hy") @Export("useBufferedSocket") static boolean useBufferedSocket; - @ObfuscatedName("gq") - static boolean field553; - @ObfuscatedName("gg") + @ObfuscatedName("ht") + static boolean field493; + @ObfuscatedName("hu") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmn;" ) @Export("timer") static Timer timer; - @ObfuscatedName("hz") + @ObfuscatedName("hc") @Export("fontsMap") static HashMap fontsMap; - @ObfuscatedName("ht") + @ObfuscatedName("hb") @ObfuscatedGetter( - intValue = -2040429487 + intValue = -1668545791 ) - static int field747; + static int field545; + @ObfuscatedName("ho") + @ObfuscatedGetter( + intValue = 689366699 + ) + static int field546; + @ObfuscatedName("hm") + @ObfuscatedGetter( + intValue = -262177223 + ) + static int field570; @ObfuscatedName("hd") @ObfuscatedGetter( - intValue = 1657321755 + intValue = 1267729281 ) - static int field608; - @ObfuscatedName("hq") + static int field548; + @ObfuscatedName("hp") @ObfuscatedGetter( - intValue = 800034625 + intValue = 1293908739 ) - static int field558; - @ObfuscatedName("hw") - @ObfuscatedGetter( - intValue = -1284292665 - ) - static int field758; - @ObfuscatedName("hs") - @ObfuscatedGetter( - intValue = -1957551061 - ) - static int field560; - @ObfuscatedName("hf") + static int field597; + @ObfuscatedName("ig") @Export("isInInstance") static boolean isInInstance; - @ObfuscatedName("hu") + @ObfuscatedName("iy") @Export("instanceChunkTemplates") static int[][][] instanceChunkTemplates; - @ObfuscatedName("hb") - static final int[] field748; - @ObfuscatedName("hv") + @ObfuscatedName("ip") + static final int[] field553; + @ObfuscatedName("in") @ObfuscatedGetter( - intValue = -1481528837 + intValue = -1672744051 ) - static int field556; + static int field727; @ObfuscatedName("it") @Export("selectedItemName") static String selectedItemName; - @ObfuscatedName("io") + @ObfuscatedName("ij") @ObfuscatedGetter( - intValue = 90219493 + intValue = 1810344519 ) - static int field566; - @ObfuscatedName("iy") - @ObfuscatedGetter( - intValue = 2041898935 - ) - static int field670; - @ObfuscatedName("ib") - @ObfuscatedGetter( - intValue = 2062325883 - ) - static int field694; + static int field555; @ObfuscatedName("ir") @ObfuscatedGetter( - intValue = -541139307 + intValue = -780915989 ) - static int field740; - @ObfuscatedName("iu") - static boolean field570; - @ObfuscatedName("is") + static int field556; + @ObfuscatedName("il") @ObfuscatedGetter( - intValue = -5461521 + intValue = -1243173565 + ) + static int field640; + @ObfuscatedName("im") + @ObfuscatedGetter( + intValue = -1989374159 + ) + static int field483; + @ObfuscatedName("io") + static boolean field559; + @ObfuscatedName("jq") + @ObfuscatedGetter( + intValue = -684171709 ) @Export("alternativeScrollbarWidth") static int alternativeScrollbarWidth; - @ObfuscatedName("jm") + @ObfuscatedName("ju") @ObfuscatedGetter( - intValue = 1628522517 + intValue = 1197895497 ) @Export("camAngleX") static int camAngleX; - @ObfuscatedName("jl") + @ObfuscatedName("jf") @ObfuscatedGetter( - intValue = 275555387 + intValue = 1252457677 ) @Export("camAngleY") static int camAngleY; - @ObfuscatedName("jp") + @ObfuscatedName("jr") @ObfuscatedGetter( - intValue = 170715045 + intValue = -1755070001 ) @Export("camAngleDY") static int camAngleDY; - @ObfuscatedName("jd") + @ObfuscatedName("jo") @ObfuscatedGetter( - intValue = -1211766585 + intValue = -1679026773 ) @Export("camAngleDX") static int camAngleDX; - @ObfuscatedName("jq") + @ObfuscatedName("jp") @ObfuscatedGetter( - intValue = 2051456837 + intValue = -906562689 ) @Export("mouseCamClickedX") static int mouseCamClickedX; - @ObfuscatedName("jv") + @ObfuscatedName("jk") @ObfuscatedGetter( - intValue = -1066673885 + intValue = -1720159471 ) @Export("mouseCamClickedY") static int mouseCamClickedY; - @ObfuscatedName("jo") + @ObfuscatedName("jw") @ObfuscatedGetter( - intValue = -1265757545 + intValue = 335114329 ) @Export("oculusOrbState") static int oculusOrbState; - @ObfuscatedName("jr") + @ObfuscatedName("je") @ObfuscatedGetter( - intValue = 924147421 + intValue = -314035411 ) @Export("camFollowHeight") static int camFollowHeight; - @ObfuscatedName("jy") - @ObfuscatedGetter( - intValue = -733089741 - ) - static int field581; - @ObfuscatedName("jj") - @ObfuscatedGetter( - intValue = -145236613 - ) - static int field590; @ObfuscatedName("ji") @ObfuscatedGetter( - intValue = -665527289 + intValue = 1232038605 ) - static int field489; - @ObfuscatedName("jb") + static int field569; + @ObfuscatedName("js") @ObfuscatedGetter( - intValue = -210849807 + intValue = 1950209385 + ) + static int field567; + @ObfuscatedName("jx") + @ObfuscatedGetter( + intValue = 1023354667 + ) + static int field571; + @ObfuscatedName("jc") + @ObfuscatedGetter( + intValue = 208832309 ) @Export("oculusOrbNormalSpeed") static int oculusOrbNormalSpeed; - @ObfuscatedName("jt") + @ObfuscatedName("jz") @ObfuscatedGetter( - intValue = 868767683 + intValue = -175885413 ) @Export("oculusOrbSlowedSpeed") static int oculusOrbSlowedSpeed; - @ObfuscatedName("ju") + @ObfuscatedName("jl") @ObfuscatedGetter( - intValue = -416666023 + intValue = -1673751255 ) - static int field586; - @ObfuscatedName("jn") - static boolean field759; - @ObfuscatedName("jh") + static int field482; + @ObfuscatedName("kf") + static boolean field575; + @ObfuscatedName("ka") @ObfuscatedGetter( - intValue = 865687077 + intValue = -270296809 ) - static int field588; - @ObfuscatedName("jx") - static boolean field589; - @ObfuscatedName("jg") + static int field576; + @ObfuscatedName("kn") + static boolean field557; + @ObfuscatedName("kd") @ObfuscatedGetter( - intValue = 158316317 + intValue = -2076113975 ) - static int field718; - @ObfuscatedName("je") + static int field578; + @ObfuscatedName("kh") @ObfuscatedGetter( - intValue = -170106615 + intValue = 483768037 ) @Export("overheadTextCount") static int overheadTextCount; - @ObfuscatedName("ja") + @ObfuscatedName("kk") @ObfuscatedGetter( - intValue = -1300592885 + intValue = 1581123849 ) @Export("overheadTextLimit") static int overheadTextLimit; - @ObfuscatedName("js") + @ObfuscatedName("kp") @Export("overheadTextXs") static int[] overheadTextXs; - @ObfuscatedName("kn") + @ObfuscatedName("kl") @Export("overheadTextYs") static int[] overheadTextYs; @ObfuscatedName("ki") @Export("overheadTextAscents") static int[] overheadTextAscents; - @ObfuscatedName("kg") + @ObfuscatedName("kv") @Export("overheadTextXOffsets") static int[] overheadTextXOffsets; @ObfuscatedName("ks") @Export("overheadTextColors") static int[] overheadTextColors; - @ObfuscatedName("kj") + @ObfuscatedName("kw") @Export("overheadTextEffects") static int[] overheadTextEffects; - @ObfuscatedName("kf") + @ObfuscatedName("kj") @Export("overheadTextCyclesRemaining") static int[] overheadTextCyclesRemaining; - @ObfuscatedName("kp") + @ObfuscatedName("kb") @Export("overheadText") static String[] overheadText; - @ObfuscatedName("kk") + @ObfuscatedName("kc") @Export("tileLastDrawnActor") static int[][] tileLastDrawnActor; - @ObfuscatedName("ky") + @ObfuscatedName("kr") @ObfuscatedGetter( - intValue = 1107217747 + intValue = 1351448589 ) @Export("viewportDrawCount") static int viewportDrawCount; - @ObfuscatedName("kc") + @ObfuscatedName("kx") @ObfuscatedGetter( - intValue = -1551118407 + intValue = 1803325213 ) @Export("viewportTempX") static int viewportTempX; - @ObfuscatedName("kw") + @ObfuscatedName("kt") @ObfuscatedGetter( - intValue = 1986228753 + intValue = 807038053 ) @Export("viewportTempY") static int viewportTempY; - @ObfuscatedName("ko") + @ObfuscatedName("ke") @ObfuscatedGetter( - intValue = 741952061 + intValue = 47728385 ) @Export("mouseCrossX") static int mouseCrossX; - @ObfuscatedName("kq") + @ObfuscatedName("kz") @ObfuscatedGetter( - intValue = 1652587127 + intValue = 2041470719 ) @Export("mouseCrossY") static int mouseCrossY; - @ObfuscatedName("kb") + @ObfuscatedName("ku") @ObfuscatedGetter( - intValue = 734553977 + intValue = -1687090233 ) @Export("mouseCrossState") static int mouseCrossState; - @ObfuscatedName("ku") + @ObfuscatedName("ko") @ObfuscatedGetter( - intValue = -1471175899 + intValue = 379603381 ) @Export("mouseCrossColor") static int mouseCrossColor; - @ObfuscatedName("kx") + @ObfuscatedName("kq") @Export("showMouseCross") static boolean showMouseCross; - @ObfuscatedName("kl") + @ObfuscatedName("kg") @ObfuscatedGetter( - intValue = 151117229 + intValue = -759271611 ) - static int field610; - @ObfuscatedName("kt") + static int field598; + @ObfuscatedName("ky") @ObfuscatedGetter( - intValue = 1905969143 + intValue = 1437033155 ) - static int field611; - @ObfuscatedName("kh") + static int field599; + @ObfuscatedName("li") @ObfuscatedGetter( - intValue = 771238189 + intValue = -294428911 ) @Export("dragItemSlotSource") static int dragItemSlotSource; - @ObfuscatedName("kv") + @ObfuscatedName("lp") @ObfuscatedGetter( - intValue = -1731633013 + intValue = -1303003277 ) @Export("draggedWidgetX") static int draggedWidgetX; - @ObfuscatedName("kr") + @ObfuscatedName("lc") @ObfuscatedGetter( - intValue = 591102181 + intValue = -813690107 ) @Export("draggedWidgetY") static int draggedWidgetY; - @ObfuscatedName("ka") + @ObfuscatedName("lb") @ObfuscatedGetter( - intValue = 1965014457 + intValue = 637964015 ) @Export("dragItemSlotDestination") static int dragItemSlotDestination; - @ObfuscatedName("kz") - static boolean field767; - @ObfuscatedName("lg") + @ObfuscatedName("ld") + static boolean field604; + @ObfuscatedName("la") @ObfuscatedGetter( - intValue = 1504694891 + intValue = -1631862171 ) @Export("itemDragDuration") static int itemDragDuration; - @ObfuscatedName("lx") + @ObfuscatedName("lw") @ObfuscatedGetter( - intValue = -961793091 + intValue = -1891907085 ) - static int field618; - @ObfuscatedName("ln") + static int field606; + @ObfuscatedName("lj") @Export("showLoadingMessages") static boolean showLoadingMessages; - @ObfuscatedName("lu") + @ObfuscatedName("ly") @ObfuscatedSignature( - descriptor = "[Lcz;" + descriptor = "[Lca;" ) @Export("players") static Player[] players; - @ObfuscatedName("li") + @ObfuscatedName("lh") @ObfuscatedGetter( - intValue = 911475385 + intValue = -1171887655 ) @Export("localPlayerIndex") static int localPlayerIndex; - @ObfuscatedName("lq") - @ObfuscatedGetter( - intValue = -525615991 - ) - static int field544; - @ObfuscatedName("ll") - @ObfuscatedGetter( - longValue = 4157369345681014175L - ) - static long field623; - @ObfuscatedName("lc") - @Export("renderSelf") - static boolean renderSelf; @ObfuscatedName("ls") @ObfuscatedGetter( - intValue = -871115459 + intValue = 770928633 + ) + static int field610; + @ObfuscatedName("lk") + @ObfuscatedGetter( + longValue = 3707872763962830187L + ) + static long field611; + @ObfuscatedName("lq") + @Export("renderSelf") + static boolean renderSelf; + @ObfuscatedName("ll") + @ObfuscatedGetter( + intValue = -154688775 ) @Export("drawPlayerNames") static int drawPlayerNames; - @ObfuscatedName("lm") - @ObfuscatedGetter( - intValue = 1054913333 - ) - static int field626; @ObfuscatedName("lo") - static int[] field627; - @ObfuscatedName("lj") + @ObfuscatedGetter( + intValue = -1065459261 + ) + static int field621; + @ObfuscatedName("lm") + static int[] field616; + @ObfuscatedName("ma") @Export("playerMenuOpcodes") static final int[] playerMenuOpcodes; - @ObfuscatedName("la") + @ObfuscatedName("mi") @Export("playerMenuActions") static String[] playerMenuActions; - @ObfuscatedName("ld") + @ObfuscatedName("ms") @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; - @ObfuscatedName("lt") + @ObfuscatedName("ml") @Export("defaultRotations") static int[] defaultRotations; - @ObfuscatedName("lk") + @ObfuscatedName("mt") @ObfuscatedGetter( - intValue = 1885958183 + intValue = -599570105 ) @Export("combatTargetPlayerIndex") static int combatTargetPlayerIndex; - @ObfuscatedName("lr") + @ObfuscatedName("mv") @ObfuscatedSignature( - descriptor = "[[[Lld;" + descriptor = "[[[Llv;" ) @Export("groundItems") static NodeDeque[][][] groundItems; - @ObfuscatedName("ms") + @ObfuscatedName("me") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llv;" ) @Export("pendingSpawns") static NodeDeque pendingSpawns; - @ObfuscatedName("mr") + @ObfuscatedName("mf") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llv;" ) @Export("projectiles") static NodeDeque projectiles; - @ObfuscatedName("mk") + @ObfuscatedName("md") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llv;" ) @Export("graphicsObjects") static NodeDeque graphicsObjects; - @ObfuscatedName("mq") + @ObfuscatedName("mr") @Export("currentLevels") static int[] currentLevels; - @ObfuscatedName("mn") + @ObfuscatedName("mx") @Export("levels") static int[] levels; - @ObfuscatedName("md") + @ObfuscatedName("mo") @Export("experience") static int[] experience; - @ObfuscatedName("me") + @ObfuscatedName("mu") @ObfuscatedGetter( - intValue = -410278811 + intValue = 2040476069 ) @Export("leftClickOpensMenu") static int leftClickOpensMenu; - @ObfuscatedName("ma") + @ObfuscatedName("mp") @Export("isMenuOpen") static boolean isMenuOpen; - @ObfuscatedName("mp") + @ObfuscatedName("mq") @ObfuscatedGetter( - intValue = 121755793 + intValue = 942781313 ) @Export("menuOptionsCount") static int menuOptionsCount; @ObfuscatedName("my") @Export("menuArguments1") static int[] menuArguments1; - @ObfuscatedName("mj") + @ObfuscatedName("mc") @Export("menuArguments2") static int[] menuArguments2; - @ObfuscatedName("mu") + @ObfuscatedName("mz") @Export("menuOpcodes") static int[] menuOpcodes; - @ObfuscatedName("mf") + @ObfuscatedName("mh") @Export("menuIdentifiers") static int[] menuIdentifiers; - @ObfuscatedName("mi") + @ObfuscatedName("mw") @Export("menuActions") static String[] menuActions; - @ObfuscatedName("mm") + @ObfuscatedName("nd") @Export("menuTargets") static String[] menuTargets; - @ObfuscatedName("mc") + @ObfuscatedName("nj") @Export("menuShiftClick") static boolean[] menuShiftClick; - @ObfuscatedName("mx") + @ObfuscatedName("na") @Export("followerOpsLowPriority") static boolean followerOpsLowPriority; - @ObfuscatedName("mg") + @ObfuscatedName("nn") @Export("shiftClickDrop") static boolean shiftClickDrop; - @ObfuscatedName("mv") + @ObfuscatedName("nr") @Export("tapToDrop") static boolean tapToDrop; - @ObfuscatedName("mw") + @ObfuscatedName("nm") @Export("showMouseOverText") static boolean showMouseOverText; - @ObfuscatedName("np") + @ObfuscatedName("nb") @ObfuscatedGetter( - intValue = -1210803439 + intValue = -967949353 ) @Export("viewportX") static int viewportX; - @ObfuscatedName("nr") + @ObfuscatedName("ng") @ObfuscatedGetter( - intValue = 119579989 + intValue = 1936177467 ) @Export("viewportY") static int viewportY; - @ObfuscatedName("ne") + @ObfuscatedName("nq") @ObfuscatedGetter( - intValue = -1368411589 + intValue = -1234203737 ) - static int field656; - @ObfuscatedName("nn") + static int field645; + @ObfuscatedName("nf") @ObfuscatedGetter( - intValue = -2015724673 + intValue = -690580105 ) - static int field657; - @ObfuscatedName("nz") + static int field702; + @ObfuscatedName("ni") @ObfuscatedGetter( - intValue = 1419000661 + intValue = -1712799689 ) @Export("isItemSelected") static int isItemSelected; - @ObfuscatedName("ng") + @ObfuscatedName("no") @Export("isSpellSelected") static boolean isSpellSelected; - @ObfuscatedName("ni") + @ObfuscatedName("ny") @ObfuscatedGetter( - intValue = -1858579497 + intValue = 1489754623 ) @Export("selectedSpellChildIndex") static int selectedSpellChildIndex; - @ObfuscatedName("ny") + @ObfuscatedName("nu") @ObfuscatedGetter( - intValue = -151006751 + intValue = 1640085877 ) @Export("selectedSpellItemId") static int selectedSpellItemId; - @ObfuscatedName("nx") + @ObfuscatedName("nk") @Export("selectedSpellActionName") static String selectedSpellActionName; - @ObfuscatedName("nd") + @ObfuscatedName("nv") @Export("selectedSpellName") static String selectedSpellName; - @ObfuscatedName("nw") + @ObfuscatedName("nh") @ObfuscatedGetter( - intValue = 1632536739 + intValue = -628280401 ) @Export("rootInterface") static int rootInterface; - @ObfuscatedName("nu") + @ObfuscatedName("nw") @ObfuscatedSignature( - descriptor = "Lpo;" + descriptor = "Lpv;" ) @Export("interfaceParents") static NodeHashTable interfaceParents; - @ObfuscatedName("nq") + @ObfuscatedName("od") @ObfuscatedGetter( - intValue = -90975371 + intValue = -381412093 ) - static int field668; - @ObfuscatedName("nt") + static int field487; + @ObfuscatedName("ow") @ObfuscatedGetter( - intValue = -1017961137 + intValue = -1385659211 ) - static int field628; - @ObfuscatedName("nb") + static int field657; + @ObfuscatedName("ou") @ObfuscatedGetter( - intValue = -1279214155 + intValue = 1129390483 ) @Export("chatEffects") static int chatEffects; - @ObfuscatedName("nj") + @ObfuscatedName("ol") @ObfuscatedGetter( - intValue = 1543781551 + intValue = -1268599939 ) - static int field524; + static int field480; @ObfuscatedName("ob") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Lki;" ) @Export("meslayerContinueWidget") static Widget meslayerContinueWidget; - @ObfuscatedName("oa") + @ObfuscatedName("oz") @ObfuscatedGetter( - intValue = -1063216989 + intValue = 942376391 ) @Export("runEnergy") static int runEnergy; - @ObfuscatedName("om") + @ObfuscatedName("ot") @ObfuscatedGetter( - intValue = -749223927 + intValue = 93181997 ) @Export("weight") static int weight; @ObfuscatedName("oh") @ObfuscatedGetter( - intValue = -1274512229 + intValue = 1679259971 ) @Export("staffModLevel") - static int staffModLevel; - @ObfuscatedName("ox") + public static int staffModLevel; + @ObfuscatedName("ov") @ObfuscatedGetter( - intValue = -1488347039 + intValue = 840097293 ) @Export("followerIndex") static int followerIndex; - @ObfuscatedName("oe") + @ObfuscatedName("or") @Export("playerMod") static boolean playerMod; - @ObfuscatedName("oi") + @ObfuscatedName("ox") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Lki;" ) @Export("viewportWidget") static Widget viewportWidget; - @ObfuscatedName("oy") + @ObfuscatedName("og") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Lki;" ) @Export("clickedWidget") static Widget clickedWidget; - @ObfuscatedName("ok") + @ObfuscatedName("oq") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Lki;" ) @Export("clickedWidgetParent") static Widget clickedWidgetParent; - @ObfuscatedName("op") + @ObfuscatedName("oj") @ObfuscatedGetter( - intValue = -1977634921 + intValue = -251848545 ) @Export("widgetClickX") static int widgetClickX; - @ObfuscatedName("on") + @ObfuscatedName("oc") @ObfuscatedGetter( - intValue = 933052317 + intValue = 701573001 ) @Export("widgetClickY") static int widgetClickY; - @ObfuscatedName("oc") + @ObfuscatedName("on") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Lki;" ) @Export("draggedOnWidget") static Widget draggedOnWidget; - @ObfuscatedName("ot") - static boolean field696; - @ObfuscatedName("oz") - @ObfuscatedGetter( - intValue = -1107790009 - ) - static int field773; - @ObfuscatedName("ou") - @ObfuscatedGetter( - intValue = -754925295 - ) - static int field686; - @ObfuscatedName("ol") - static boolean field687; + @ObfuscatedName("ok") + static boolean field574; @ObfuscatedName("os") @ObfuscatedGetter( - intValue = -1838827617 + intValue = 1943275901 ) - static int field688; - @ObfuscatedName("og") + static int field747; + @ObfuscatedName("of") @ObfuscatedGetter( - intValue = 1850811259 + intValue = 2047583569 ) - static int field757; - @ObfuscatedName("oq") + static int field674; + @ObfuscatedName("om") + static boolean field675; + @ObfuscatedName("oi") + @ObfuscatedGetter( + intValue = 352021831 + ) + static int field653; + @ObfuscatedName("oy") + @ObfuscatedGetter( + intValue = 1143795035 + ) + static int field612; + @ObfuscatedName("op") @Export("isDraggingWidget") static boolean isDraggingWidget; - @ObfuscatedName("ov") + @ObfuscatedName("pv") @ObfuscatedGetter( - intValue = 1092217725 + intValue = 1746638637 ) @Export("cycleCntr") static int cycleCntr; - @ObfuscatedName("pu") + @ObfuscatedName("pj") @Export("changedVarps") static int[] changedVarps; - @ObfuscatedName("pt") + @ObfuscatedName("pe") @ObfuscatedGetter( - intValue = -334272855 + intValue = -1300368255 ) @Export("changedVarpCount") static int changedVarpCount; - @ObfuscatedName("po") + @ObfuscatedName("pu") @Export("changedItemContainers") static int[] changedItemContainers; - @ObfuscatedName("pd") + @ObfuscatedName("pz") @ObfuscatedGetter( - intValue = -478615495 + intValue = -386041557 ) - static int field695; - @ObfuscatedName("pp") + static int field683; + @ObfuscatedName("pg") @Export("changedSkills") static int[] changedSkills; - @ObfuscatedName("pe") + @ObfuscatedName("pd") @ObfuscatedGetter( - intValue = 2097836455 + intValue = 1687044341 ) @Export("changedSkillsCount") static int changedSkillsCount; - @ObfuscatedName("pg") - static int[] field698; - @ObfuscatedName("ph") - @ObfuscatedGetter( - intValue = 1885131439 - ) - static int field699; @ObfuscatedName("pb") + static int[] field686; + @ObfuscatedName("pp") @ObfuscatedGetter( - intValue = -1111710623 + intValue = -31940881 + ) + static int field687; + @ObfuscatedName("pa") + @ObfuscatedGetter( + intValue = 743328381 ) @Export("chatCycle") static int chatCycle; - @ObfuscatedName("pn") + @ObfuscatedName("pr") @ObfuscatedGetter( - intValue = 1773222505 + intValue = 1498936325 ) - static int field701; - @ObfuscatedName("pj") + static int field689; + @ObfuscatedName("pm") @ObfuscatedGetter( - intValue = -1118711907 + intValue = -1311780869 ) - static int field702; - @ObfuscatedName("pw") + static int field690; + @ObfuscatedName("ps") @ObfuscatedGetter( - intValue = 614772325 + intValue = -1047813865 ) - static int field703; - @ObfuscatedName("pa") + static int field691; + @ObfuscatedName("pq") @ObfuscatedGetter( - intValue = -1232589287 + intValue = -316236861 ) - static int field755; - @ObfuscatedName("py") + static int field692; + @ObfuscatedName("pl") @ObfuscatedGetter( - intValue = -646988223 + intValue = 330047093 ) - static int field705; + static int field762; + @ObfuscatedName("pf") + @ObfuscatedGetter( + intValue = 907254029 + ) + static int field512; @ObfuscatedName("pc") @ObfuscatedGetter( - intValue = 776062487 + intValue = -1728010509 ) - static int field706; - @ObfuscatedName("pk") + static int field695; + @ObfuscatedName("qp") @ObfuscatedGetter( - intValue = -409433949 - ) - static int field707; - @ObfuscatedName("pi") - @ObfuscatedGetter( - intValue = 96279785 + intValue = 189830111 ) @Export("mouseWheelRotation") static int mouseWheelRotation; - @ObfuscatedName("pr") + @ObfuscatedName("qn") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llv;" ) @Export("scriptEvents") static NodeDeque scriptEvents; - @ObfuscatedName("pm") + @ObfuscatedName("qo") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llv;" ) - static NodeDeque field710; - @ObfuscatedName("pv") + static NodeDeque field698; + @ObfuscatedName("qx") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llv;" ) - static NodeDeque field711; - @ObfuscatedName("pq") + static NodeDeque field701; + @ObfuscatedName("qc") @ObfuscatedSignature( - descriptor = "Lpo;" + descriptor = "Lpv;" ) @Export("widgetFlags") static NodeHashTable widgetFlags; - @ObfuscatedName("qr") + @ObfuscatedName("qw") @ObfuscatedGetter( - intValue = -988949017 + intValue = 863306169 ) @Export("rootWidgetCount") static int rootWidgetCount; - @ObfuscatedName("qf") - @ObfuscatedGetter( - intValue = -398701791 - ) - static int field540; @ObfuscatedName("qd") - static boolean[] field715; - @ObfuscatedName("ql") - static boolean[] field716; - @ObfuscatedName("qu") - static boolean[] field717; - @ObfuscatedName("qe") + @ObfuscatedGetter( + intValue = 300350499 + ) + static int field694; + @ObfuscatedName("qr") + static boolean[] field652; + @ObfuscatedName("qk") + static boolean[] field704; + @ObfuscatedName("qa") + static boolean[] field524; + @ObfuscatedName("qh") @Export("rootWidgetXs") static int[] rootWidgetXs; - @ObfuscatedName("qq") + @ObfuscatedName("qb") @Export("rootWidgetYs") static int[] rootWidgetYs; - @ObfuscatedName("qi") + @ObfuscatedName("qj") @Export("rootWidgetWidths") static int[] rootWidgetWidths; - @ObfuscatedName("qy") + @ObfuscatedName("qz") @Export("rootWidgetHeights") static int[] rootWidgetHeights; - @ObfuscatedName("qx") + @ObfuscatedName("qs") @ObfuscatedGetter( - intValue = 1720526633 + intValue = -1165338739 ) @Export("gameDrawingMode") static int gameDrawingMode; @ObfuscatedName("qv") @ObfuscatedGetter( - longValue = 669441914719297349L + longValue = 5765024780864769377L ) - static long field601; - @ObfuscatedName("qa") + static long field711; + @ObfuscatedName("qq") @Export("isResizable") static boolean isResizable; - @ObfuscatedName("qo") - static int[] field725; - @ObfuscatedName("fl") - String field564; - @ObfuscatedName("fb") - @ObfuscatedSignature( - descriptor = "Ld;" - ) - class14 field622; + @ObfuscatedName("fx") + String field518; @ObfuscatedName("fe") @ObfuscatedSignature( - descriptor = "Lx;" + descriptor = "Lt;" ) - class19 field690; + class14 field519; + @ObfuscatedName("fb") + @ObfuscatedSignature( + descriptor = "Lh;" + ) + class19 field520; + @ObfuscatedName("fr") + OtlTokenRequester field478; + @ObfuscatedName("fu") + Future field550; @ObfuscatedName("fc") @ObfuscatedSignature( - descriptor = "Lcom/jagex/oldscape/pub/OtlTokenRequester;" + descriptor = "Lh;" ) - OtlTokenRequester field536; - @ObfuscatedName("fq") - Future field599; - @ObfuscatedName("gb") - @ObfuscatedSignature( - descriptor = "Lpi;" - ) - Buffer field496; + class19 field523; + @ObfuscatedName("fj") + RefreshAccessTokenRequester field577; + @ObfuscatedName("fm") + Future field581; @ObfuscatedName("gi") @ObfuscatedSignature( - descriptor = "Ll;" + descriptor = "Lpx;" ) - class7 field541; - @ObfuscatedName("gn") + Buffer field529; + @ObfuscatedName("gq") + @ObfuscatedSignature( + descriptor = "Ls;" + ) + class7 field592; + @ObfuscatedName("gh") @ObfuscatedGetter( - longValue = 1413967701067592279L + longValue = 5000728514975258643L ) - long field542; + long field531; static { - field490 = true; // L: 134 - worldId = 1; // L: 135 - worldProperties = 0; // L: 136 - gameBuild = 0; // L: 138 - isMembersWorld = false; // L: 141 - isLowDetail = false; // L: 142 - field617 = -1; // L: 147 - clientType = -1; // L: 148 - field498 = -1; // L: 149 - onMobile = false; // L: 150 - gameState = 0; // L: 162 - isLoading = true; // L: 185 - cycle = 0; // L: 186 - mouseLastLastPressedTimeMillis = -1L; // L: 187 - field508 = -1; // L: 189 - field509 = -1; // L: 190 - field510 = -1L; // L: 191 - hadFocus = true; // L: 192 - rebootTimer = 0; // L: 193 - hintArrowType = 0; // L: 194 - hintArrowNpcIndex = 0; // L: 195 - hintArrowPlayerIndex = 0; // L: 196 - hintArrowX = 0; // L: 197 - hintArrowY = 0; // L: 198 - hintArrowHeight = 0; // L: 199 - hintArrowSubX = 0; // L: 200 - hintArrowSubY = 0; // L: 201 - playerAttackOption = AttackOption.AttackOption_hidden; // L: 203 - npcAttackOption = AttackOption.AttackOption_hidden; // L: 204 - titleLoadingStage = 0; // L: 209 - js5ConnectState = 0; // L: 212 - field525 = 0; // L: 213 - js5Errors = 0; // L: 235 - loginState = 0; // L: 237 - field528 = 0; // L: 238 - field661 = 0; // L: 239 - field530 = 0; // L: 240 - field531 = class124.field1495; // L: 241 - field532 = class441.field4678; // L: 242 - Login_isUsernameRemembered = false; // L: 261 - secureRandomFuture = new SecureRandomFuture(); // L: 262 - randomDatData = null; // L: 269 - npcs = new NPC[32768]; // L: 273 - npcCount = 0; // L: 274 - npcIndices = new int[32768]; // L: 275 - field547 = 0; // L: 276 - field548 = new int[250]; // L: 277 - packetWriter = new PacketWriter(); // L: 280 - logoutTimer = 0; // L: 282 - hadNetworkError = false; // L: 283 - useBufferedSocket = true; // L: 284 - field553 = false; // L: 285 - timer = new Timer(); // L: 286 - fontsMap = new HashMap(); // L: 292 - field747 = 0; // L: 299 - field608 = 1; // L: 300 - field558 = 0; // L: 301 - field758 = 1; // L: 302 - field560 = 0; // L: 303 - collisionMaps = new CollisionMap[4]; // L: 311 - isInInstance = false; // L: 312 - instanceChunkTemplates = new int[4][13][13]; // L: 313 - field748 = 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: 314 - field556 = 0; // L: 317 - field566 = 2301979; // L: 329 - field670 = 5063219; // L: 330 - field694 = 3353893; // L: 331 - field740 = 7759444; // L: 332 - field570 = false; // L: 333 - alternativeScrollbarWidth = 0; // L: 334 - camAngleX = 128; // L: 342 - camAngleY = 0; // L: 343 - camAngleDY = 0; // L: 344 - camAngleDX = 0; // L: 345 - mouseCamClickedX = 0; // L: 346 - mouseCamClickedY = 0; // L: 347 - oculusOrbState = 0; // L: 348 - camFollowHeight = 50; // L: 349 - field581 = 0; // L: 353 - field590 = 0; // L: 354 - field489 = 0; // L: 355 - oculusOrbNormalSpeed = 12; // L: 357 - oculusOrbSlowedSpeed = 6; // L: 358 - field586 = 0; // L: 359 - field759 = false; // L: 360 - field588 = 0; // L: 361 - field589 = false; // L: 362 - field718 = 0; // L: 363 - overheadTextCount = 0; // L: 364 - overheadTextLimit = 50; // L: 365 - overheadTextXs = new int[overheadTextLimit]; // L: 366 - overheadTextYs = new int[overheadTextLimit]; // L: 367 - overheadTextAscents = new int[overheadTextLimit]; // L: 368 - overheadTextXOffsets = new int[overheadTextLimit]; // L: 369 - overheadTextColors = new int[overheadTextLimit]; // L: 370 - overheadTextEffects = new int[overheadTextLimit]; // L: 371 - overheadTextCyclesRemaining = new int[overheadTextLimit]; // L: 372 - overheadText = new String[overheadTextLimit]; // L: 373 - tileLastDrawnActor = new int[104][104]; // L: 374 - viewportDrawCount = 0; // L: 375 - viewportTempX = -1; // L: 376 - viewportTempY = -1; // L: 377 - mouseCrossX = 0; // L: 378 - mouseCrossY = 0; // L: 379 - mouseCrossState = 0; // L: 380 - mouseCrossColor = 0; // L: 381 - showMouseCross = true; // L: 382 - field610 = 0; // L: 384 - field611 = 0; // L: 385 - dragItemSlotSource = 0; // L: 388 - draggedWidgetX = 0; // L: 389 - draggedWidgetY = 0; // L: 390 - dragItemSlotDestination = 0; // L: 391 - field767 = false; // L: 392 - itemDragDuration = 0; // L: 393 - field618 = 0; // L: 394 - showLoadingMessages = true; // L: 396 - players = new Player[2048]; // L: 398 - localPlayerIndex = -1; // L: 400 - field544 = 0; // L: 401 - field623 = -1L; // L: 402 - renderSelf = true; // L: 404 - drawPlayerNames = 0; // L: 409 - field626 = 0; // L: 410 - field627 = new int[1000]; // L: 411 - playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; // L: 413 - playerMenuActions = new String[8]; // L: 414 - playerOptionsPriorities = new boolean[8]; // L: 415 - defaultRotations = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; // L: 416 - combatTargetPlayerIndex = -1; // L: 417 - groundItems = new NodeDeque[4][104][104]; // L: 418 - pendingSpawns = new NodeDeque(); // L: 419 - projectiles = new NodeDeque(); // L: 420 - graphicsObjects = new NodeDeque(); // L: 421 - currentLevels = new int[25]; // L: 422 - levels = new int[25]; // L: 423 - experience = new int[25]; // L: 424 - leftClickOpensMenu = 0; // L: 425 - isMenuOpen = false; // L: 426 - menuOptionsCount = 0; // L: 432 - menuArguments1 = new int[500]; // L: 433 - menuArguments2 = new int[500]; // L: 434 - menuOpcodes = new int[500]; // L: 435 - menuIdentifiers = new int[500]; // L: 436 - menuActions = new String[500]; // L: 437 - menuTargets = new String[500]; // L: 438 - menuShiftClick = new boolean[500]; // L: 439 - followerOpsLowPriority = false; // L: 440 - shiftClickDrop = false; // L: 442 - tapToDrop = false; // L: 443 - showMouseOverText = true; // L: 444 - viewportX = -1; // L: 445 - viewportY = -1; // L: 446 - field656 = 0; // L: 450 - field657 = 50; // L: 451 - isItemSelected = 0; // L: 452 - selectedItemName = null; // L: 456 - isSpellSelected = false; // L: 457 - selectedSpellChildIndex = -1; // L: 459 - selectedSpellItemId = -1; // L: 460 - selectedSpellActionName = null; // L: 462 - selectedSpellName = null; // L: 463 - rootInterface = -1; // L: 464 - interfaceParents = new NodeHashTable(8); // L: 465 - field668 = 0; // L: 470 - field628 = -1; // L: 471 - chatEffects = 0; // L: 472 - field524 = 0; // L: 473 - meslayerContinueWidget = null; // L: 474 - runEnergy = 0; // L: 475 - weight = 0; // L: 476 - staffModLevel = 0; // L: 477 - followerIndex = -1; // L: 478 - playerMod = false; // L: 479 - viewportWidget = null; // L: 480 - clickedWidget = null; // L: 481 - clickedWidgetParent = null; // L: 482 - widgetClickX = 0; // L: 483 - widgetClickY = 0; // L: 484 - draggedOnWidget = null; // L: 485 - field696 = false; // L: 486 - field773 = -1; // L: 487 - field686 = -1; // L: 488 - field687 = false; // L: 489 - field688 = -1; // L: 490 - field757 = -1; // L: 491 - isDraggingWidget = false; // L: 492 - cycleCntr = 1; // L: 497 - changedVarps = new int[32]; // L: 500 - changedVarpCount = 0; // L: 501 - changedItemContainers = new int[32]; // L: 502 - field695 = 0; // L: 503 - changedSkills = new int[32]; // L: 504 - changedSkillsCount = 0; // L: 505 - field698 = new int[32]; // L: 506 - field699 = 0; // L: 507 - chatCycle = 0; // L: 508 - field701 = 0; // L: 509 - field702 = 0; // L: 510 - field703 = 0; // L: 511 - field755 = 0; // L: 512 - field705 = 0; // L: 513 - field706 = 0; // L: 514 - field707 = 0; // L: 515 - mouseWheelRotation = 0; // L: 521 - scriptEvents = new NodeDeque(); // L: 522 - field710 = new NodeDeque(); // L: 523 - field711 = new NodeDeque(); // L: 524 - widgetFlags = new NodeHashTable(512); // L: 525 - rootWidgetCount = 0; // L: 527 - field540 = -2; // L: 528 - field715 = new boolean[100]; // L: 529 - field716 = new boolean[100]; // L: 530 - field717 = new boolean[100]; // L: 531 - rootWidgetXs = new int[100]; // L: 532 - rootWidgetYs = new int[100]; // L: 533 - rootWidgetWidths = new int[100]; // L: 534 - rootWidgetHeights = new int[100]; // L: 535 - gameDrawingMode = 0; // L: 536 - field601 = 0L; // L: 537 - isResizable = true; // L: 538 - field725 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 545 - publicChatMode = 0; // L: 546 - tradeChatMode = 0; // L: 548 - field728 = ""; // L: 549 - crossWorldMessageIds = new long[100]; // L: 551 - crossWorldMessageIdsIndex = 0; // L: 552 - field731 = 0; // L: 554 - field732 = new int[128]; // L: 555 - field733 = new int[128]; // L: 556 - field585 = -1L; // L: 557 - currentClanSettings = new ClanSettings[3]; // L: 561 - currentClanChannels = new ClanChannel[3]; // L: 563 - field714 = -1; // L: 565 - mapIconCount = 0; // L: 566 - mapIconXs = new int[1000]; // L: 567 - mapIconYs = new int[1000]; // L: 568 - mapIcons = new SpritePixels[1000]; // L: 569 - destinationX = 0; // L: 570 - destinationY = 0; // L: 571 - minimapState = 0; // L: 578 - currentTrackGroupId = -1; // L: 579 - playingJingle = false; // L: 580 - soundEffectCount = 0; // L: 586 - soundEffectIds = new int[50]; // L: 587 - queuedSoundEffectLoops = new int[50]; // L: 588 - queuedSoundEffectDelays = new int[50]; // L: 589 - soundLocations = new int[50]; // L: 590 - soundEffects = new SoundEffect[50]; // L: 591 - isCameraLocked = false; // L: 593 - field754 = false; // L: 604 - field546 = new boolean[5]; // L: 612 - field756 = new int[5]; // L: 613 - field636 = new int[5]; // L: 614 - field674 = new int[5]; // L: 615 - field600 = new int[5]; // L: 616 - field760 = 256; // L: 617 - field761 = 205; // L: 618 - zoomHeight = 256; // L: 619 - zoomWidth = 320; // L: 620 - field764 = 1; // L: 621 - field765 = 32767; // L: 622 - field766 = 1; // L: 623 - field666 = 32767; // L: 624 - viewportOffsetX = 0; // L: 625 - viewportOffsetY = 0; // L: 626 - viewportWidth = 0; // L: 627 - viewportHeight = 0; // L: 628 - viewportZoom = 0; // L: 629 - playerAppearance = new PlayerComposition(); // L: 631 - field561 = -1; // L: 632 - field775 = -1; // L: 633 - platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 635 - grandExchangeOffers = new GrandExchangeOffer[8]; // L: 637 - GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); // L: 640 - field779 = -1; // L: 647 - archiveLoaders = new ArrayList(10); // L: 648 - archiveLoadersDone = 0; // L: 649 - field782 = 0; // L: 650 - field783 = new ApproximateRouteStrategy(); // L: 659 - field784 = new int[50]; // L: 660 - field785 = new int[50]; // L: 661 + field659 = true; // L: 142 + worldId = 1; // L: 143 + worldProperties = 0; // L: 144 + gameBuild = 0; // L: 146 + isMembersWorld = false; // L: 149 + isLowDetail = false; // L: 150 + field484 = -1; // L: 155 + clientType = -1; // L: 156 + field486 = -1; // L: 157 + onMobile = false; // L: 158 + gameState = 0; // L: 170 + isLoading = true; // L: 194 + cycle = 0; // L: 195 + mouseLastLastPressedTimeMillis = -1L; // L: 196 + field492 = -1; // L: 198 + field681 = -1; // L: 199 + field494 = -1L; // L: 200 + hadFocus = true; // L: 201 + rebootTimer = 0; // L: 202 + hintArrowType = 0; // L: 203 + hintArrowNpcIndex = 0; // L: 204 + hintArrowPlayerIndex = 0; // L: 205 + hintArrowX = 0; // L: 206 + hintArrowY = 0; // L: 207 + hintArrowHeight = 0; // L: 208 + hintArrowSubX = 0; // L: 209 + hintArrowSubY = 0; // L: 210 + playerAttackOption = AttackOption.AttackOption_hidden; // L: 212 + npcAttackOption = AttackOption.AttackOption_hidden; // L: 213 + titleLoadingStage = 0; // L: 218 + js5ConnectState = 0; // L: 221 + field625 = 0; // L: 222 + js5Errors = 0; // L: 244 + loginState = 0; // L: 246 + field626 = 0; // L: 247 + field514 = 0; // L: 248 + field654 = 0; // L: 249 + field615 = class124.field1553; // L: 250 + field517 = class443.field4734; // L: 251 + field526 = class119.method2745(SecureRandomCallable.method2035("com_jagex_auth_desktop_osrs:public")); // L: 270 + Login_isUsernameRemembered = false; // L: 276 + secureRandomFuture = new SecureRandomFuture(); // L: 277 + randomDatData = null; // L: 284 + npcs = new NPC[32768]; // L: 288 + npcCount = 0; // L: 289 + npcIndices = new int[32768]; // L: 290 + field565 = 0; // L: 291 + field601 = new int[250]; // L: 292 + packetWriter = new PacketWriter(); // L: 295 + logoutTimer = 0; // L: 297 + hadNetworkError = false; // L: 298 + useBufferedSocket = true; // L: 299 + field493 = false; // L: 300 + timer = new Timer(); // L: 301 + fontsMap = new HashMap(); // L: 307 + field545 = 0; // L: 314 + field546 = 1; // L: 315 + field570 = 0; // L: 316 + field548 = 1; // L: 317 + field597 = 0; // L: 318 + collisionMaps = new CollisionMap[4]; // L: 326 + isInInstance = false; // L: 327 + instanceChunkTemplates = new int[4][13][13]; // L: 328 + field553 = 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: 329 + field727 = 0; // L: 332 + field555 = 2301979; // L: 344 + field556 = 5063219; // L: 345 + field640 = 3353893; // L: 346 + field483 = 7759444; // L: 347 + field559 = false; // L: 348 + alternativeScrollbarWidth = 0; // L: 349 + camAngleX = 128; // L: 357 + camAngleY = 0; // L: 358 + camAngleDY = 0; // L: 359 + camAngleDX = 0; // L: 360 + mouseCamClickedX = 0; // L: 361 + mouseCamClickedY = 0; // L: 362 + oculusOrbState = 0; // L: 363 + camFollowHeight = 50; // L: 364 + field569 = 0; // L: 368 + field567 = 0; // L: 369 + field571 = 0; // L: 370 + oculusOrbNormalSpeed = 12; // L: 372 + oculusOrbSlowedSpeed = 6; // L: 373 + field482 = 0; // L: 374 + field575 = false; // L: 375 + field576 = 0; // L: 376 + field557 = false; // L: 377 + field578 = 0; // L: 378 + overheadTextCount = 0; // L: 379 + overheadTextLimit = 50; // L: 380 + overheadTextXs = new int[overheadTextLimit]; // L: 381 + overheadTextYs = new int[overheadTextLimit]; // L: 382 + overheadTextAscents = new int[overheadTextLimit]; // L: 383 + overheadTextXOffsets = new int[overheadTextLimit]; // L: 384 + overheadTextColors = new int[overheadTextLimit]; // L: 385 + overheadTextEffects = new int[overheadTextLimit]; // L: 386 + overheadTextCyclesRemaining = new int[overheadTextLimit]; // L: 387 + overheadText = new String[overheadTextLimit]; // L: 388 + tileLastDrawnActor = new int[104][104]; // L: 389 + viewportDrawCount = 0; // L: 390 + viewportTempX = -1; // L: 391 + viewportTempY = -1; // L: 392 + mouseCrossX = 0; // L: 393 + mouseCrossY = 0; // L: 394 + mouseCrossState = 0; // L: 395 + mouseCrossColor = 0; // L: 396 + showMouseCross = true; // L: 397 + field598 = 0; // L: 399 + field599 = 0; // L: 400 + dragItemSlotSource = 0; // L: 403 + draggedWidgetX = 0; // L: 404 + draggedWidgetY = 0; // L: 405 + dragItemSlotDestination = 0; // L: 406 + field604 = false; // L: 407 + itemDragDuration = 0; // L: 408 + field606 = 0; // L: 409 + showLoadingMessages = true; // L: 411 + players = new Player[2048]; // L: 413 + localPlayerIndex = -1; // L: 415 + field610 = 0; // L: 416 + field611 = -1L; // L: 417 + renderSelf = true; // L: 419 + drawPlayerNames = 0; // L: 424 + field621 = 0; // L: 425 + field616 = new int[1000]; // L: 426 + playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; // L: 428 + playerMenuActions = new String[8]; // L: 429 + playerOptionsPriorities = new boolean[8]; // L: 430 + defaultRotations = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; // L: 431 + combatTargetPlayerIndex = -1; // L: 432 + groundItems = new NodeDeque[4][104][104]; // L: 433 + pendingSpawns = new NodeDeque(); // L: 434 + projectiles = new NodeDeque(); // L: 435 + graphicsObjects = new NodeDeque(); // L: 436 + currentLevels = new int[25]; // L: 437 + levels = new int[25]; // L: 438 + experience = new int[25]; // L: 439 + leftClickOpensMenu = 0; // L: 440 + isMenuOpen = false; // L: 441 + menuOptionsCount = 0; // L: 447 + menuArguments1 = new int[500]; // L: 448 + menuArguments2 = new int[500]; // L: 449 + menuOpcodes = new int[500]; // L: 450 + menuIdentifiers = new int[500]; // L: 451 + menuActions = new String[500]; // L: 452 + menuTargets = new String[500]; // L: 453 + menuShiftClick = new boolean[500]; // L: 454 + followerOpsLowPriority = false; // L: 455 + shiftClickDrop = false; // L: 457 + tapToDrop = false; // L: 458 + showMouseOverText = true; // L: 459 + viewportX = -1; // L: 460 + viewportY = -1; // L: 461 + field645 = 0; // L: 465 + field702 = 50; // L: 466 + isItemSelected = 0; // L: 467 + selectedItemName = null; // L: 471 + isSpellSelected = false; // L: 472 + selectedSpellChildIndex = -1; // L: 474 + selectedSpellItemId = -1; // L: 475 + selectedSpellActionName = null; // L: 477 + selectedSpellName = null; // L: 478 + rootInterface = -1; // L: 479 + interfaceParents = new NodeHashTable(8); // L: 480 + field487 = 0; // L: 485 + field657 = -1; // L: 486 + chatEffects = 0; // L: 487 + field480 = 0; // L: 488 + meslayerContinueWidget = null; // L: 489 + runEnergy = 0; // L: 490 + weight = 0; // L: 491 + staffModLevel = 0; // L: 492 + followerIndex = -1; // L: 493 + playerMod = false; // L: 494 + viewportWidget = null; // L: 495 + clickedWidget = null; // L: 496 + clickedWidgetParent = null; // L: 497 + widgetClickX = 0; // L: 498 + widgetClickY = 0; // L: 499 + draggedOnWidget = null; // L: 500 + field574 = false; // L: 501 + field747 = -1; // L: 502 + field674 = -1; // L: 503 + field675 = false; // L: 504 + field653 = -1; // L: 505 + field612 = -1; // L: 506 + isDraggingWidget = false; // L: 507 + cycleCntr = 1; // L: 512 + changedVarps = new int[32]; // L: 515 + changedVarpCount = 0; // L: 516 + changedItemContainers = new int[32]; // L: 517 + field683 = 0; // L: 518 + changedSkills = new int[32]; // L: 519 + changedSkillsCount = 0; // L: 520 + field686 = new int[32]; // L: 521 + field687 = 0; // L: 522 + chatCycle = 0; // L: 523 + field689 = 0; // L: 524 + field690 = 0; // L: 525 + field691 = 0; // L: 526 + field692 = 0; // L: 527 + field762 = 0; // L: 528 + field512 = 0; // L: 529 + field695 = 0; // L: 530 + mouseWheelRotation = 0; // L: 536 + scriptEvents = new NodeDeque(); // L: 537 + field698 = new NodeDeque(); // L: 538 + field701 = new NodeDeque(); // L: 539 + widgetFlags = new NodeHashTable(512); // L: 540 + rootWidgetCount = 0; // L: 542 + field694 = -2; // L: 543 + field652 = new boolean[100]; // L: 544 + field704 = new boolean[100]; // L: 545 + field524 = new boolean[100]; // L: 546 + rootWidgetXs = new int[100]; // L: 547 + rootWidgetYs = new int[100]; // L: 548 + rootWidgetWidths = new int[100]; // L: 549 + rootWidgetHeights = new int[100]; // L: 550 + gameDrawingMode = 0; // L: 551 + field711 = 0L; // L: 552 + isResizable = true; // L: 553 + field769 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 560 + publicChatMode = 0; // L: 561 + tradeChatMode = 0; // L: 563 + field549 = ""; // L: 564 + crossWorldMessageIds = new long[100]; // L: 566 + crossWorldMessageIdsIndex = 0; // L: 567 + field719 = 0; // L: 569 + field720 = new int[128]; // L: 570 + field721 = new int[128]; // L: 571 + field722 = -1L; // L: 572 + currentClanSettings = new ClanSettings[4]; // L: 576 + currentClanChannels = new ClanChannel[4]; // L: 578 + field515 = -1; // L: 580 + mapIconCount = 0; // L: 581 + mapIconXs = new int[1000]; // L: 582 + mapIconYs = new int[1000]; // L: 583 + mapIcons = new SpritePixels[1000]; // L: 584 + destinationX = 0; // L: 585 + destinationY = 0; // L: 586 + minimapState = 0; // L: 593 + currentTrackGroupId = -1; // L: 594 + playingJingle = false; // L: 595 + soundEffectCount = 0; // L: 601 + soundEffectIds = new int[50]; // L: 602 + queuedSoundEffectLoops = new int[50]; // L: 603 + queuedSoundEffectDelays = new int[50]; // L: 604 + soundLocations = new int[50]; // L: 605 + soundEffects = new SoundEffect[50]; // L: 606 + isCameraLocked = false; // L: 608 + field742 = false; // L: 619 + field743 = new boolean[5]; // L: 627 + field744 = new int[5]; // L: 628 + field745 = new int[5]; // L: 629 + field714 = new int[5]; // L: 630 + field677 = new int[5]; // L: 631 + field748 = 256; // L: 632 + field749 = 205; // L: 633 + zoomHeight = 256; // L: 634 + zoomWidth = 320; // L: 635 + field752 = 1; // L: 636 + field753 = 32767; // L: 637 + field656 = 1; // L: 638 + field755 = 32767; // L: 639 + viewportOffsetX = 0; // L: 640 + viewportOffsetY = 0; // L: 641 + viewportWidth = 0; // L: 642 + viewportHeight = 0; // L: 643 + viewportZoom = 0; // L: 644 + playerAppearance = new PlayerComposition(); // L: 646 + field602 = -1; // L: 647 + field763 = -1; // L: 648 + platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 650 + grandExchangeOffers = new GrandExchangeOffer[8]; // L: 652 + GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); // L: 655 + field767 = -1; // L: 662 + archiveLoaders = new ArrayList(10); // L: 663 + archiveLoadersDone = 0; // L: 664 + field770 = 0; // L: 665 + field771 = new ApproximateRouteStrategy(); // L: 674 + field772 = new int[50]; // L: 675 + field773 = new int[50]; // L: 676 } public Client() { - this.field542 = -1L; // L: 267 - } // L: 12725 + this.field531 = -1L; // L: 282 + } - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1462606142" + garbageValue = "-1437501286" ) @Export("resizeGame") protected final void resizeGame() { - field601 = class136.method2931() + 500L; // L: 4285 - this.resizeJS(); // L: 4286 - if (rootInterface != -1) { // L: 4287 + field711 = class113.method2624() + 500L; // L: 4375 + this.resizeJS(); // L: 4376 + if (rootInterface != -1) { // L: 4377 this.resizeRoot(true); } - } // L: 4288 + } // L: 4378 - @ObfuscatedName("e") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1665364684" + descriptor = "(S)V", + garbageValue = "-1311" ) @Export("setUp") protected final void setUp() { - ArchiveLoader.method2061(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); // L: 831 - SecureRandomFuture.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 832 - UserComparator9.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 833 - class329.currentPort = SecureRandomFuture.worldPort; // L: 834 - PlayerComposition.field3304 = class293.field3308; // L: 835 - class144.field1629 = class293.field3309; // L: 836 - WorldMapIcon_0.field2300 = class293.field3310; // L: 837 - WorldMapRectangle.field2356 = class293.field3312; // L: 838 - VerticalAlignment.urlRequester = new class101(); // L: 839 - this.setUpKeyboard(); // L: 840 - this.method428(); // L: 841 - MenuAction.mouseWheel = this.mouseWheel(); // L: 842 - class182.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 843 - class131.clientPreferences = AbstractWorldMapData.method4344(); // L: 844 - this.setUpClipboard(); // L: 845 - ModelData0.method5093(this, class193.field2189); // L: 846 - class131.setWindowedMode(class131.clientPreferences.method2251()); // L: 847 - Decimator.friendSystem = new FriendSystem(class122.loginType); // L: 848 - this.field622 = new class14("tokenRequest", 1, 1); // L: 849 - } // L: 850 + Interpreter.method1866(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); // L: 907 + Tiles.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 908 + GrandExchangeEvent.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 909 + WorldMapRegion.currentPort = Tiles.worldPort; // L: 910 + Coord.field3352 = class293.field3375; // L: 911 + DesktopPlatformInfoProvider.field4469 = class293.field3371; // L: 912 + class340.field4156 = class293.field3376; // L: 913 + PlayerComposition.field3366 = class293.field3374; // L: 914 + UserComparator7.urlRequester = new class101(); // L: 915 + this.setUpKeyboard(); // L: 916 + this.method415(); // L: 917 + Clock.mouseWheel = this.mouseWheel(); // L: 918 + class135.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 919 + AccessFile var2 = null; // L: 922 + ClientPreferences var3 = new ClientPreferences(); // L: 923 - @ObfuscatedName("z") + try { + var2 = UserComparator3.getPreferencesFile("", ApproximateRouteStrategy.field473.name, false); // L: 925 + byte[] var4 = new byte[(int)var2.length()]; // L: 926 + + int var6; + for (int var5 = 0; var5 < var4.length; var5 += var6) { // L: 927 928 931 + var6 = var2.read(var4, var5, var4.length - var5); // L: 929 + if (var6 == -1) { // L: 930 + throw new IOException(); + } + } + + var3 = new ClientPreferences(new Buffer(var4)); // L: 933 + } catch (Exception var8) { // L: 935 + } + + try { + if (var2 != null) { // L: 937 + var2.close(); + } + } catch (Exception var7) { // L: 939 + } + + class12.clientPreferences = var3; // L: 942 + this.setUpClipboard(); // L: 943 + Tiles.method1996(this, GameEngine.field206); // L: 944 + Widget.setWindowedMode(class12.clientPreferences.method2274()); // L: 945 + BufferedSource.friendSystem = new FriendSystem(class391.loginType); // L: 946 + this.field519 = new class14("tokenRequest", 1, 1); // L: 947 + } // L: 948 + + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "612160698" + garbageValue = "-772264838" ) @Export("doCycle") protected final void doCycle() { - ++cycle; // L: 853 - this.doCycleJs5(); // L: 854 + ++cycle; // L: 952 + this.doCycleJs5(); // L: 953 while (true) { ArchiveDiskAction var1; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 858 - var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); // L: 859 - } // L: 860 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 957 + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); // L: 958 + } // L: 959 - if (var1 == null) { // L: 861 + if (var1 == null) { // L: 960 int var5; try { - if (class273.musicPlayerStatus == 1) { // L: 867 - var5 = class273.midiPcmStream.method5264(); // L: 868 - if (var5 > 0 && class273.midiPcmStream.isReady()) { // L: 869 - var5 -= class273.pcmSampleLength; // L: 870 - if (var5 < 0) { // L: 871 + if (class273.musicPlayerStatus == 1) { // L: 966 + var5 = class273.midiPcmStream.method5080(); // L: 967 + if (var5 > 0 && class273.midiPcmStream.isReady()) { // L: 968 + var5 -= GrandExchangeEvent.pcmSampleLength; // L: 969 + if (var5 < 0) { // L: 970 var5 = 0; } - class273.midiPcmStream.setPcmStreamVolume(var5); // L: 872 + class273.midiPcmStream.setPcmStreamVolume(var5); // L: 971 } else { - class273.midiPcmStream.clear(); // L: 875 - class273.midiPcmStream.removeAll(); // L: 876 - if (class273.musicTrackArchive != null) { // L: 877 + class273.midiPcmStream.clear(); // L: 974 + class273.midiPcmStream.removeAll(); // L: 975 + if (ClanChannelMember.musicTrackArchive != null) { // L: 976 class273.musicPlayerStatus = 2; } else { - class273.musicPlayerStatus = 0; // L: 878 + class273.musicPlayerStatus = 0; // L: 977 } - ArchiveDiskActionHandler.musicTrack = null; // L: 879 - class152.soundCache = null; // L: 880 + class273.musicTrack = null; // L: 978 + class152.soundCache = null; // L: 979 } } - } catch (Exception var9) { // L: 883 - var9.printStackTrace(); // L: 884 - class273.midiPcmStream.clear(); // L: 885 - class273.musicPlayerStatus = 0; // L: 886 - ArchiveDiskActionHandler.musicTrack = null; // L: 887 - class152.soundCache = null; // L: 888 - class273.musicTrackArchive = null; // L: 889 + } catch (Exception var9) { // L: 982 + var9.printStackTrace(); // L: 983 + class273.midiPcmStream.clear(); // L: 984 + class273.musicPlayerStatus = 0; // L: 985 + class273.musicTrack = null; // L: 986 + class152.soundCache = null; // L: 987 + ClanChannelMember.musicTrackArchive = null; // L: 988 } - class116.playPcmPlayers(); // L: 892 - synchronized(KeyHandler.KeyHandler_instance) { // L: 894 - ++KeyHandler.KeyHandler_idleCycles; // L: 895 - KeyHandler.field141 = KeyHandler.field138; // L: 896 - KeyHandler.field118 = 0; // L: 897 - KeyHandler.field132 = 0; // L: 898 - Arrays.fill(KeyHandler.field140, false); // L: 899 - Arrays.fill(KeyHandler.field131, false); // L: 900 - if (KeyHandler.field128 < 0) { // L: 901 - Arrays.fill(KeyHandler.KeyHandler_pressedKeys, false); // L: 902 - KeyHandler.field128 = KeyHandler.field133; // L: 903 + ArchiveLoader.playPcmPlayers(); // L: 991 + synchronized(KeyHandler.KeyHandler_instance) { // L: 993 + ++KeyHandler.KeyHandler_idleCycles; // L: 994 + KeyHandler.field142 = KeyHandler.field144; // L: 995 + KeyHandler.field139 = 0; // L: 996 + KeyHandler.field134 = 0; // L: 997 + Arrays.fill(KeyHandler.field120, false); // L: 998 + Arrays.fill(KeyHandler.field132, false); // L: 999 + if (KeyHandler.field135 < 0) { // L: 1000 + Arrays.fill(KeyHandler.KeyHandler_pressedKeys, false); // L: 1001 + KeyHandler.field135 = KeyHandler.field150; // L: 1002 } else { - while (KeyHandler.field128 != KeyHandler.field133) { // L: 906 - int var6 = KeyHandler.field145[KeyHandler.field133]; // L: 907 - KeyHandler.field133 = KeyHandler.field133 + 1 & 127; // L: 908 - if (var6 < 0) { // L: 909 - var6 = ~var6; // L: 910 - if (KeyHandler.KeyHandler_pressedKeys[var6]) { // L: 911 - KeyHandler.KeyHandler_pressedKeys[var6] = false; // L: 912 - KeyHandler.field131[var6] = true; // L: 913 - KeyHandler.field139[KeyHandler.field132] = var6; // L: 914 - ++KeyHandler.field132; // L: 915 + while (KeyHandler.field135 != KeyHandler.field150) { // L: 1005 + int var6 = KeyHandler.field133[KeyHandler.field150]; // L: 1006 + KeyHandler.field150 = KeyHandler.field150 + 1 & 127; // L: 1007 + if (var6 < 0) { // L: 1008 + var6 = ~var6; // L: 1009 + if (KeyHandler.KeyHandler_pressedKeys[var6]) { // L: 1010 + KeyHandler.KeyHandler_pressedKeys[var6] = false; // L: 1011 + KeyHandler.field132[var6] = true; // L: 1012 + KeyHandler.field140[KeyHandler.field134] = var6; // L: 1013 + ++KeyHandler.field134; // L: 1014 } } else { - if (!KeyHandler.KeyHandler_pressedKeys[var6] && KeyHandler.field118 < KeyHandler.field143.length - 1) { // L: 919 - KeyHandler.field140[var6] = true; // L: 920 - KeyHandler.field143[++KeyHandler.field118 - 1] = var6; // L: 921 + if (!KeyHandler.KeyHandler_pressedKeys[var6] && KeyHandler.field139 < KeyHandler.field138.length - 1) { // L: 1018 + KeyHandler.field120[var6] = true; // L: 1019 + KeyHandler.field138[++KeyHandler.field139 - 1] = var6; // L: 1020 } - KeyHandler.KeyHandler_pressedKeys[var6] = true; // L: 923 + KeyHandler.KeyHandler_pressedKeys[var6] = true; // L: 1022 } } } - if (KeyHandler.field118 > 0) { // L: 927 + if (KeyHandler.field139 > 0) { // L: 1026 KeyHandler.KeyHandler_idleCycles = 0; } - KeyHandler.field138 = KeyHandler.field142; // L: 928 + KeyHandler.field144 = KeyHandler.field143; // L: 1027 } - HealthBarDefinition.method3473(); // L: 931 - if (MenuAction.mouseWheel != null) { // L: 932 - var5 = MenuAction.mouseWheel.useRotation(); // L: 933 - mouseWheelRotation = var5; // L: 934 + WorldMapLabelSize.method4414(); // L: 1030 + if (Clock.mouseWheel != null) { // L: 1031 + var5 = Clock.mouseWheel.useRotation(); // L: 1032 + mouseWheelRotation = var5; // L: 1033 } - if (gameState == 0) { // L: 936 - Archive.load(); // L: 937 - UserComparator9.method2619(); // L: 938 - } else if (gameState == 5) { // L: 940 - class360.loginScreen(this, class13.fontPlain12); // L: 941 - Archive.load(); // L: 942 - UserComparator9.method2619(); // L: 943 - } else if (gameState != 10 && gameState != 11) { // L: 945 - if (gameState == 20) { // L: 946 - class360.loginScreen(this, class13.fontPlain12); // L: 947 - this.doCycleLoggedOut(); // L: 948 - } else if (gameState == 50) { // L: 950 - class360.loginScreen(this, class13.fontPlain12); // L: 951 - this.doCycleLoggedOut(); // L: 952 - } else if (gameState == 25) { // L: 954 - FriendSystem.method1715(); + if (gameState == 0) { // L: 1035 + ClanSettings.load(); // L: 1036 + WorldMap.method7222(); // L: 1037 + } else if (gameState == 5) { // L: 1039 + class136.loginScreen(this, class149.fontPlain12); // L: 1040 + ClanSettings.load(); // L: 1041 + WorldMap.method7222(); // L: 1042 + } else if (gameState != 10 && gameState != 11) { // L: 1044 + if (gameState == 20) { // L: 1045 + class136.loginScreen(this, class149.fontPlain12); // L: 1046 + this.doCycleLoggedOut(); // L: 1047 + } else if (gameState == 50) { // L: 1049 + class136.loginScreen(this, class149.fontPlain12); // L: 1050 + this.doCycleLoggedOut(); // L: 1051 + } else if (gameState == 25) { // L: 1053 + class301.method5580(); } } else { - class360.loginScreen(this, class13.fontPlain12); + class136.loginScreen(this, class149.fontPlain12); } - if (gameState == 30) { // L: 955 + if (gameState == 30) { // L: 1054 this.doCycleLoggedIn(); - } else if (gameState == 40 || gameState == 45) { // L: 956 + } else if (gameState == 40 || gameState == 45) { // L: 1055 this.doCycleLoggedOut(); } - return; // L: 957 + return; // L: 1056 } - var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); // L: 862 + var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); // L: 961 } } - @ObfuscatedName("h") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(ZS)V", - garbageValue = "-8708" + descriptor = "(ZI)V", + garbageValue = "-375798495" ) @Export("draw") protected final void draw(boolean var1) { - boolean var2; - label175: { - try { - if (class273.musicPlayerStatus == 2) { // L: 963 - if (ArchiveDiskActionHandler.musicTrack == null) { // L: 964 - ArchiveDiskActionHandler.musicTrack = MusicTrack.readTrack(class273.musicTrackArchive, AccessFile.musicTrackGroupId, class273.musicTrackFileId); // L: 965 - if (ArchiveDiskActionHandler.musicTrack == null) { // L: 966 - var2 = false; // L: 967 - break label175; - } - } - - if (class152.soundCache == null) { // L: 971 - class152.soundCache = new SoundCache(class273.soundEffectsArchive, class273.musicSamplesArchive); - } - - if (class273.midiPcmStream.loadMusicTrack(ArchiveDiskActionHandler.musicTrack, class273.musicPatchesArchive, class152.soundCache, 22050)) { // L: 972 - class273.midiPcmStream.clearAll(); // L: 973 - class273.midiPcmStream.setPcmStreamVolume(class273.musicTrackVolume); // L: 974 - class273.midiPcmStream.setMusicTrack(ArchiveDiskActionHandler.musicTrack, class17.musicTrackBoolean); // L: 975 - class273.musicPlayerStatus = 0; // L: 976 - ArchiveDiskActionHandler.musicTrack = null; // L: 977 - class152.soundCache = null; // L: 978 - class273.musicTrackArchive = null; // L: 979 - var2 = true; // L: 980 - break label175; - } - } - } catch (Exception var6) { // L: 985 - var6.printStackTrace(); // L: 986 - class273.midiPcmStream.clear(); // L: 987 - class273.musicPlayerStatus = 0; // L: 988 - ArchiveDiskActionHandler.musicTrack = null; // L: 989 - class152.soundCache = null; // L: 990 - class273.musicTrackArchive = null; // L: 991 - } - - var2 = false; // L: 993 + boolean var2 = Players.method2427(); // L: 1060 + if (var2 && playingJingle && SecureRandomCallable.pcmPlayer0 != null) { // L: 1061 1062 + SecureRandomCallable.pcmPlayer0.tryDiscard(); } - if (var2 && playingJingle && KeyHandler.pcmPlayer0 != null) { // L: 996 997 - KeyHandler.pcmPlayer0.tryDiscard(); + if ((gameState == 10 || gameState == 20 || gameState == 30) && field711 != 0L && class113.method2624() > field711) { // L: 1064 1065 + Widget.setWindowedMode(ClanChannelMember.getWindowedMode()); // L: 1066 } - if ((gameState == 10 || gameState == 20 || gameState == 30) && field601 != 0L && class136.method2931() > field601) { // L: 999 1000 - class131.setWindowedMode(getWindowedMode()); // L: 1001 - } - - int var4; - if (var1) { // L: 1004 - for (var4 = 0; var4 < 100; ++var4) { // L: 1005 - field715[var4] = true; + int var3; + if (var1) { // L: 1069 + for (var3 = 0; var3 < 100; ++var3) { // L: 1070 + field652[var3] = true; } } - if (gameState == 0) { // L: 1007 + if (gameState == 0) { // L: 1072 this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); - } else if (gameState == 5) { // L: 1008 - class128.drawTitle(RouteStrategy.fontBold12, class113.fontPlain11, class13.fontPlain12); - } else if (gameState != 10 && gameState != 11) { // L: 1009 - if (gameState == 20) { // L: 1010 - class128.drawTitle(RouteStrategy.fontBold12, class113.fontPlain11, class13.fontPlain12); - } else if (gameState == 50) { // L: 1011 - class128.drawTitle(RouteStrategy.fontBold12, class113.fontPlain11, class13.fontPlain12); - } else if (gameState == 25) { // L: 1012 - if (field560 == 1) { // L: 1013 - if (field747 > field608) { // L: 1014 - field608 = field747; + } else if (gameState == 5) { // L: 1073 + SoundCache.drawTitle(ChatChannel.fontBold12, Varcs.fontPlain11, class149.fontPlain12); + } else if (gameState != 10 && gameState != 11) { // L: 1074 + if (gameState == 20) { // L: 1075 + SoundCache.drawTitle(ChatChannel.fontBold12, Varcs.fontPlain11, class149.fontPlain12); + } else if (gameState == 50) { // L: 1076 + SoundCache.drawTitle(ChatChannel.fontBold12, Varcs.fontPlain11, class149.fontPlain12); + } else if (gameState == 25) { // L: 1077 + if (field597 == 1) { // L: 1078 + if (field545 > field546) { // L: 1079 + field546 = field545; } - var4 = (field608 * 50 - field747 * 50) / field608; // L: 1015 - MusicPatch.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); // L: 1016 - } else if (field560 == 2) { // L: 1018 - if (field558 > field758) { // L: 1019 - field758 = field558; + var3 = (field546 * 50 - field545 * 50) / field546; // L: 1080 + class259.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); // L: 1081 + } else if (field597 == 2) { // L: 1083 + if (field570 > field548) { // L: 1084 + field548 = field570; } - var4 = (field758 * 50 - field558 * 50) / field758 + 50; // L: 1020 - MusicPatch.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); // L: 1021 + var3 = (field548 * 50 - field570 * 50) / field548 + 50; // L: 1085 + class259.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); // L: 1086 } else { - MusicPatch.drawLoadingMessage("Loading - please wait.", false); // L: 1023 + class259.drawLoadingMessage("Loading - please wait.", false); // L: 1088 } - } else if (gameState == 30) { // L: 1025 + } else if (gameState == 30) { // L: 1090 this.drawLoggedIn(); - } else if (gameState == 40) { // L: 1026 - MusicPatch.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); - } else if (gameState == 45) { // L: 1027 - MusicPatch.drawLoadingMessage("Please wait...", false); + } else if (gameState == 40) { // L: 1091 + class259.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); + } else if (gameState == 45) { // L: 1092 + class259.drawLoadingMessage("Please wait...", false); } } else { - class128.drawTitle(RouteStrategy.fontBold12, class113.fontPlain11, class13.fontPlain12); + SoundCache.drawTitle(ChatChannel.fontBold12, Varcs.fontPlain11, class149.fontPlain12); // L: 1082 } - if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 1028 - for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1029 - if (field716[var4]) { // L: 1030 - FontName.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); // L: 1031 - field716[var4] = false; // L: 1032 + if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 1093 + for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1094 + if (field704[var3]) { // L: 1095 + DevicePcmPlayerProvider.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]); // L: 1096 + field704[var3] = false; // L: 1097 } } - } else if (gameState > 0) { // L: 1036 - FontName.rasterProvider.drawFull(0, 0); // L: 1037 + } else if (gameState > 0) { // L: 1101 + DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0); // L: 1102 - for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1038 - field716[var4] = false; + for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1103 + field704[var3] = false; } } - } // L: 1040 + } // L: 1105 - @ObfuscatedName("ae") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1364313232" + descriptor = "(B)V", + garbageValue = "-31" ) @Export("kill0") protected final void kill0() { - if (class160.varcs.hasUnwrittenChanges()) { // L: 1043 - class160.varcs.write(); + if (class125.varcs.hasUnwrittenChanges()) { // L: 1108 + class125.varcs.write(); } - if (class120.mouseRecorder != null) { // L: 1044 - class120.mouseRecorder.isRunning = false; + if (Varcs.mouseRecorder != null) { // L: 1109 + Varcs.mouseRecorder.isRunning = false; } - class120.mouseRecorder = null; // L: 1045 - packetWriter.close(); // L: 1046 - class205.method4256(); // L: 1047 - class116.method2705(); // L: 1048 - MenuAction.mouseWheel = null; // L: 1049 - if (KeyHandler.pcmPlayer0 != null) { // L: 1050 - KeyHandler.pcmPlayer0.shutdown(); + Varcs.mouseRecorder = null; // L: 1110 + packetWriter.close(); // L: 1111 + class162.method3209(); // L: 1112 + if (MouseHandler.MouseHandler_instance != null) { // L: 1114 + synchronized(MouseHandler.MouseHandler_instance) { // L: 1115 + MouseHandler.MouseHandler_instance = null; // L: 1116 + } // L: 1117 } - if (ViewportMouse.pcmPlayer1 != null) { // L: 1051 - ViewportMouse.pcmPlayer1.shutdown(); + Clock.mouseWheel = null; // L: 1120 + if (SecureRandomCallable.pcmPlayer0 != null) { // L: 1121 + SecureRandomCallable.pcmPlayer0.shutdown(); } - if (NetCache.NetCache_socket != null) { // L: 1053 + if (Fonts.pcmPlayer1 != null) { // L: 1122 + Fonts.pcmPlayer1.shutdown(); + } + + if (NetCache.NetCache_socket != null) { // L: 1124 NetCache.NetCache_socket.close(); } - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 1056 - if (ArchiveDiskActionHandler.field3945 != 0) { // L: 1057 - ArchiveDiskActionHandler.field3945 = 1; // L: 1058 + Occluder.method4221(); // L: 1126 + if (UserComparator7.urlRequester != null) { // L: 1127 + UserComparator7.urlRequester.close(); // L: 1128 + UserComparator7.urlRequester = null; // L: 1129 + } - try { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 1060 - } catch (InterruptedException var4) { // L: 1062 - } + try { + JagexCache.JagexCache_dat2File.close(); // L: 1133 + + for (int var3 = 0; var3 < UserComparator6.idxCount; ++var3) { // L: 1134 + JagexCache.JagexCache_idxFiles[var3].close(); } + + JagexCache.JagexCache_idx255File.close(); // L: 1135 + JagexCache.JagexCache_randomDat.close(); // L: 1136 + } catch (Exception var5) { // L: 1138 } - if (VerticalAlignment.urlRequester != null) { // L: 1066 - VerticalAlignment.urlRequester.close(); // L: 1067 - VerticalAlignment.urlRequester = null; // L: 1068 - } + this.field519.method161(); // L: 1140 + } // L: 1141 - FriendLoginUpdate.method6685(); // L: 1070 - this.field622.method167(); // L: 1071 - } // L: 1072 - - @ObfuscatedName("av") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "111435525" + descriptor = "(B)V", + garbageValue = "-9" ) - protected final void vmethod1140() { - } // L: 668 + protected final void vmethod1448() { + } // L: 683 - @ObfuscatedName("ey") + @ObfuscatedName("ez") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "104545398" + garbageValue = "1606202603" ) - boolean method1532() { - return class360.field4209 != null && !class360.field4209.trim().isEmpty(); // L: 811 + boolean method1128() { + return Decimator.field406 != null && !Decimator.field406.trim().isEmpty(); // L: 852 } - @ObfuscatedName("eh") + @ObfuscatedName("eq") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "42" + garbageValue = "-69" ) - boolean method1476() { - return this.field536 != null; // L: 815 + boolean method1520() { + return this.field478 != null; // L: 856 } - @ObfuscatedName("ev") + @ObfuscatedName("fs") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)V", - garbageValue = "20" + garbageValue = "64" ) - void method1366(String var1) throws MalformedURLException, IOException { - URL var2 = new URL(class113.field1372 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"); // L: 819 - OtlTokenRequester var3 = this.field536; // L: 820 - if (var3 != null) { // L: 821 - this.field599 = var3.request(var2); // L: 822 + void method1130(String var1) throws IOException { + HashMap var2 = new HashMap(); // L: 860 + var2.put("grant_type", "refresh_token"); // L: 861 + var2.put("scope", "gamesso.token.create"); // L: 862 + var2.put("refresh_token", var1); // L: 863 + URL var3 = new URL(ApproximateRouteStrategy.field471 + "shield/oauth/token" + (new class401(var2)).method6961()); // L: 864 + HashMap var4 = new HashMap(); // L: 865 + var4.put("Authorization", "Basic " + field526); // L: 866 + var4.put("Host", (new URL(ApproximateRouteStrategy.field471)).getHost()); // L: 867 + var4.put("Accept", class398.field4432.method6940()); // L: 868 + class9 var5 = class9.field32; // L: 869 + RefreshAccessTokenRequester var6 = this.field577; // L: 870 + if (var6 != null) { // L: 871 + this.field581 = var6.request(var5.method67(), var3, var4, ""); // L: 872 } else { - class10 var4 = new class10(var2, class9.field37); // L: 825 - var4.method77("Authorization", "Bearer " + var1); // L: 826 - this.field690 = this.field622.method166(var4); // L: 827 + class10 var7 = new class10(var3, var5); // L: 875 + Iterator var8 = var4.entrySet().iterator(); // L: 876 + + while (var8.hasNext()) { + Entry var9 = (Entry)var8.next(); // L: 877 + var7.method78((String)var9.getKey(), (String)var9.getValue()); // L: 879 + } + + this.field523 = this.field519.method160(var7); // L: 882 } - } // L: 823 828 + } // L: 873 883 @ObfuscatedName("fp") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1218305449" + ) + void method1229(String var1) throws MalformedURLException, IOException { + URL var2 = new URL(ApproximateRouteStrategy.field471 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"); // L: 886 + HashMap var3 = new HashMap(); // L: 887 + var3.put("Authorization", "Bearer " + var1); // L: 888 + class9 var4 = class9.field40; // L: 889 + OtlTokenRequester var5 = this.field478; // L: 890 + if (var5 != null) { // L: 891 + this.field550 = var5.request(var4.method67(), var2, var3, ""); // L: 892 + } else { + class10 var6 = new class10(var2, var4); // L: 895 + Iterator var7 = var3.entrySet().iterator(); // L: 896 + + while (var7.hasNext()) { + Entry var8 = (Entry)var7.next(); // L: 897 + var6.method78((String)var8.getKey(), (String)var8.getValue()); // L: 899 + } + + this.field520 = this.field519.method160(var6); // L: 902 + } + } // L: 893 903 + + @ObfuscatedName("fg") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2117459446" + garbageValue = "-568109507" ) @Export("doCycleJs5") void doCycleJs5() { - if (gameState != 1000) { // L: 1117 - long var2 = class136.method2931(); // L: 1120 - int var4 = (int)(var2 - NetCache.field3982); // L: 1121 - NetCache.field3982 = var2; // L: 1122 - if (var4 > 200) { // L: 1123 + if (gameState != 1000) { // L: 1206 + long var2 = class113.method2624(); // L: 1209 + int var4 = (int)(var2 - NetCache.field4041); // L: 1210 + NetCache.field4041 = var2; // L: 1211 + if (var4 > 200) { // L: 1212 var4 = 200; } - NetCache.NetCache_loadTime += var4; // L: 1124 + NetCache.NetCache_loadTime += var4; // L: 1213 boolean var1; - if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 1125 - var1 = true; // L: 1126 - } else if (NetCache.NetCache_socket == null) { // L: 1129 - var1 = false; // L: 1130 + if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 1214 + var1 = true; // L: 1215 + } else if (NetCache.NetCache_socket == null) { // L: 1218 + var1 = false; // L: 1219 } else { try { label243: { - if (NetCache.NetCache_loadTime > 30000) { // L: 1134 + if (NetCache.NetCache_loadTime > 30000) { // L: 1223 throw new IOException(); } NetFileRequest var5; Buffer var6; - while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 1135 - var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 1136 - var6 = new Buffer(4); // L: 1137 - var6.writeByte(1); // L: 1138 - var6.writeMedium((int)var5.key); // L: 1139 - NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1140 - NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key); // L: 1141 - --NetCache.NetCache_pendingPriorityWritesCount; // L: 1142 - ++NetCache.NetCache_pendingPriorityResponsesCount; // L: 1143 + while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 1224 + var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 1225 + var6 = new Buffer(4); // L: 1226 + var6.writeByte(1); // L: 1227 + var6.writeMedium((int)var5.key); // L: 1228 + NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1229 + NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key); // L: 1230 + --NetCache.NetCache_pendingPriorityWritesCount; // L: 1231 + ++NetCache.NetCache_pendingPriorityResponsesCount; // L: 1232 } - while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 1145 - var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 1146 - var6 = new Buffer(4); // L: 1147 - var6.writeByte(0); // L: 1148 - var6.writeMedium((int)var5.key); // L: 1149 - NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1150 - var5.removeDual(); // L: 1151 - NetCache.NetCache_pendingResponses.put(var5, var5.key); // L: 1152 - --NetCache.NetCache_pendingWritesCount; // L: 1153 - ++NetCache.NetCache_pendingResponsesCount; // L: 1154 + while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 1234 + var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 1235 + var6 = new Buffer(4); // L: 1236 + var6.writeByte(0); // L: 1237 + var6.writeMedium((int)var5.key); // L: 1238 + NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1239 + var5.removeDual(); // L: 1240 + NetCache.NetCache_pendingResponses.put(var5, var5.key); // L: 1241 + --NetCache.NetCache_pendingWritesCount; // L: 1242 + ++NetCache.NetCache_pendingResponsesCount; // L: 1243 } - for (int var17 = 0; var17 < 100; ++var17) { // L: 1156 - int var18 = NetCache.NetCache_socket.available(); // L: 1157 - if (var18 < 0) { // L: 1158 + for (int var17 = 0; var17 < 100; ++var17) { // L: 1245 + int var18 = NetCache.NetCache_socket.available(); // L: 1246 + if (var18 < 0) { // L: 1247 throw new IOException(); } - if (var18 == 0) { // L: 1159 + if (var18 == 0) { // L: 1248 break; } - NetCache.NetCache_loadTime = 0; // L: 1160 - byte var7 = 0; // L: 1161 - if (class271.NetCache_currentResponse == null) { // L: 1162 + NetCache.NetCache_loadTime = 0; // L: 1249 + byte var7 = 0; // L: 1250 + if (WorldMapIcon_0.NetCache_currentResponse == null) { // L: 1251 var7 = 8; - } else if (NetCache.field3995 == 0) { // L: 1163 + } else if (NetCache.field4052 == 0) { // L: 1252 var7 = 1; } @@ -2094,3383 +2151,3626 @@ public final class Client extends GameEngine implements Usernamed, OAuthApi { byte[] var10000; int var10001; Buffer var25; - if (var7 > 0) { // L: 1164 - var8 = var7 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 1165 - if (var8 > var18) { // L: 1166 + if (var7 > 0) { // L: 1253 + var8 = var7 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 1254 + if (var8 > var18) { // L: 1255 var8 = var18; } - NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var8); // L: 1167 - if (NetCache.field3998 != 0) { // L: 1168 - for (var9 = 0; var9 < var8; ++var9) { // L: 1169 + NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var8); // L: 1256 + if (NetCache.field4043 != 0) { // L: 1257 + for (var9 = 0; var9 < var8; ++var9) { // L: 1258 var10000 = NetCache.NetCache_responseHeaderBuffer.array; - var10001 = NetCache.NetCache_responseHeaderBuffer.offset + var9; - var10000[var10001] ^= NetCache.field3998; + var10001 = var9 + NetCache.NetCache_responseHeaderBuffer.offset; + var10000[var10001] ^= NetCache.field4043; } } - var25 = NetCache.NetCache_responseHeaderBuffer; // L: 1171 + var25 = NetCache.NetCache_responseHeaderBuffer; // L: 1260 var25.offset += var8; - if (NetCache.NetCache_responseHeaderBuffer.offset < var7) { // L: 1172 + if (NetCache.NetCache_responseHeaderBuffer.offset < var7) { // L: 1261 break; } - if (class271.NetCache_currentResponse == null) { // L: 1173 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1174 - var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1175 - var10 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 1176 - int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1177 - var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 1178 - long var13 = (long)(var10 + (var9 << 16)); // L: 1179 - NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); // L: 1180 - Coord.field3289 = true; // L: 1181 - if (var15 == null) { // L: 1182 - var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); // L: 1183 - Coord.field3289 = false; // L: 1184 + if (WorldMapIcon_0.NetCache_currentResponse == null) { // L: 1262 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1263 + var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1264 + var10 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 1265 + int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1266 + var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 1267 + long var13 = (long)(var10 + (var9 << 16)); // L: 1268 + NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); // L: 1269 + class270.field3218 = true; // L: 1270 + if (var15 == null) { // L: 1271 + var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); // L: 1272 + class270.field3218 = false; // L: 1273 } - if (var15 == null) { // L: 1186 - throw new IOException(); // L: 1187 + if (var15 == null) { // L: 1275 + throw new IOException(); // L: 1276 } - int var16 = var11 == 0 ? 5 : 9; // L: 1189 - class271.NetCache_currentResponse = var15; // L: 1190 - class194.NetCache_responseArchiveBuffer = new Buffer(var16 + var12 + class271.NetCache_currentResponse.padding); // L: 1191 - class194.NetCache_responseArchiveBuffer.writeByte(var11); // L: 1192 - class194.NetCache_responseArchiveBuffer.writeInt(var12); // L: 1193 - NetCache.field3995 = 8; // L: 1194 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1195 - } else if (NetCache.field3995 == 0) { // L: 1198 - if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 1199 - NetCache.field3995 = 1; // L: 1200 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1201 + int var16 = var11 == 0 ? 5 : 9; // L: 1278 + WorldMapIcon_0.NetCache_currentResponse = var15; // L: 1279 + class357.NetCache_responseArchiveBuffer = new Buffer(var16 + var12 + WorldMapIcon_0.NetCache_currentResponse.padding); // L: 1280 + class357.NetCache_responseArchiveBuffer.writeByte(var11); // L: 1281 + class357.NetCache_responseArchiveBuffer.writeInt(var12); // L: 1282 + NetCache.field4052 = 8; // L: 1283 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1284 + } else if (NetCache.field4052 == 0) { // L: 1287 + if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 1288 + NetCache.field4052 = 1; // L: 1289 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1290 } else { - class271.NetCache_currentResponse = null; // L: 1205 + WorldMapIcon_0.NetCache_currentResponse = null; // L: 1294 } } } else { - var8 = class194.NetCache_responseArchiveBuffer.array.length - class271.NetCache_currentResponse.padding; // L: 1211 - var9 = 512 - NetCache.field3995; // L: 1212 - if (var9 > var8 - class194.NetCache_responseArchiveBuffer.offset) { // L: 1213 - var9 = var8 - class194.NetCache_responseArchiveBuffer.offset; + var8 = class357.NetCache_responseArchiveBuffer.array.length - WorldMapIcon_0.NetCache_currentResponse.padding; // L: 1300 + var9 = 512 - NetCache.field4052; // L: 1301 + if (var9 > var8 - class357.NetCache_responseArchiveBuffer.offset) { // L: 1302 + var9 = var8 - class357.NetCache_responseArchiveBuffer.offset; } - if (var9 > var18) { // L: 1214 + if (var9 > var18) { // L: 1303 var9 = var18; } - NetCache.NetCache_socket.read(class194.NetCache_responseArchiveBuffer.array, class194.NetCache_responseArchiveBuffer.offset, var9); // L: 1215 - if (NetCache.field3998 != 0) { // L: 1216 - for (var10 = 0; var10 < var9; ++var10) { // L: 1217 - var10000 = class194.NetCache_responseArchiveBuffer.array; - var10001 = class194.NetCache_responseArchiveBuffer.offset + var10; - var10000[var10001] ^= NetCache.field3998; + NetCache.NetCache_socket.read(class357.NetCache_responseArchiveBuffer.array, class357.NetCache_responseArchiveBuffer.offset, var9); // L: 1304 + if (NetCache.field4043 != 0) { // L: 1305 + for (var10 = 0; var10 < var9; ++var10) { // L: 1306 + var10000 = class357.NetCache_responseArchiveBuffer.array; + var10001 = class357.NetCache_responseArchiveBuffer.offset + var10; + var10000[var10001] ^= NetCache.field4043; } } - var25 = class194.NetCache_responseArchiveBuffer; // L: 1219 + var25 = class357.NetCache_responseArchiveBuffer; // L: 1308 var25.offset += var9; - NetCache.field3995 += var9; // L: 1220 - if (var8 == class194.NetCache_responseArchiveBuffer.offset) { // L: 1221 - if (16711935L == class271.NetCache_currentResponse.key) { // L: 1222 - Huffman.NetCache_reference = class194.NetCache_responseArchiveBuffer; // L: 1223 + NetCache.field4052 += var9; // L: 1309 + if (var8 == class357.NetCache_responseArchiveBuffer.offset) { // L: 1310 + if (WorldMapIcon_0.NetCache_currentResponse.key == 16711935L) { // L: 1311 + class300.NetCache_reference = class357.NetCache_responseArchiveBuffer; // L: 1312 - for (var10 = 0; var10 < 256; ++var10) { // L: 1224 - Archive var19 = NetCache.NetCache_archives[var10]; // L: 1225 - if (var19 != null) { // L: 1226 - Huffman.NetCache_reference.offset = var10 * 8 + 5; // L: 1227 - var12 = Huffman.NetCache_reference.readInt(); // L: 1228 - int var20 = Huffman.NetCache_reference.readInt(); // L: 1229 - var19.loadIndex(var12, var20); // L: 1230 + for (var10 = 0; var10 < 256; ++var10) { // L: 1313 + Archive var19 = NetCache.NetCache_archives[var10]; // L: 1314 + if (var19 != null) { // L: 1315 + class300.NetCache_reference.offset = var10 * 8 + 5; // L: 1316 + var12 = class300.NetCache_reference.readInt(); // L: 1317 + int var20 = class300.NetCache_reference.readInt(); // L: 1318 + var19.loadIndex(var12, var20); // L: 1319 } } } else { - NetCache.NetCache_crc.reset(); // L: 1235 - NetCache.NetCache_crc.update(class194.NetCache_responseArchiveBuffer.array, 0, var8); // L: 1236 - var10 = (int)NetCache.NetCache_crc.getValue(); // L: 1237 - if (var10 != class271.NetCache_currentResponse.crc) { // L: 1238 + NetCache.NetCache_crc.reset(); // L: 1324 + NetCache.NetCache_crc.update(class357.NetCache_responseArchiveBuffer.array, 0, var8); // L: 1325 + var10 = (int)NetCache.NetCache_crc.getValue(); // L: 1326 + if (var10 != WorldMapIcon_0.NetCache_currentResponse.crc) { // L: 1327 try { - NetCache.NetCache_socket.close(); // L: 1240 - } catch (Exception var23) { // L: 1242 + NetCache.NetCache_socket.close(); // L: 1329 + } catch (Exception var23) { // L: 1331 } - ++NetCache.NetCache_crcMismatches; // L: 1243 - NetCache.NetCache_socket = null; // L: 1244 - NetCache.field3998 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 1245 - var1 = false; // L: 1246 + ++NetCache.NetCache_crcMismatches; // L: 1332 + NetCache.NetCache_socket = null; // L: 1333 + NetCache.field4043 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 1334 + var1 = false; // L: 1335 break label243; } - NetCache.NetCache_crcMismatches = 0; // L: 1249 - NetCache.NetCache_ioExceptions = 0; // L: 1250 - class271.NetCache_currentResponse.archive.write((int)(class271.NetCache_currentResponse.key & 65535L), class194.NetCache_responseArchiveBuffer.array, (class271.NetCache_currentResponse.key & 16711680L) == 16711680L, Coord.field3289); // L: 1251 + NetCache.NetCache_crcMismatches = 0; // L: 1338 + NetCache.NetCache_ioExceptions = 0; // L: 1339 + WorldMapIcon_0.NetCache_currentResponse.archive.write((int)(WorldMapIcon_0.NetCache_currentResponse.key & 65535L), class357.NetCache_responseArchiveBuffer.array, (WorldMapIcon_0.NetCache_currentResponse.key & 16711680L) == 16711680L, class270.field3218); // L: 1340 } - class271.NetCache_currentResponse.remove(); // L: 1253 - if (Coord.field3289) { // L: 1254 + WorldMapIcon_0.NetCache_currentResponse.remove(); // L: 1342 + if (class270.field3218) { // L: 1343 --NetCache.NetCache_pendingPriorityResponsesCount; } else { - --NetCache.NetCache_pendingResponsesCount; // L: 1255 + --NetCache.NetCache_pendingResponsesCount; // L: 1344 } - NetCache.field3995 = 0; // L: 1256 - class271.NetCache_currentResponse = null; // L: 1257 - class194.NetCache_responseArchiveBuffer = null; // L: 1258 + NetCache.field4052 = 0; // L: 1345 + WorldMapIcon_0.NetCache_currentResponse = null; // L: 1346 + class357.NetCache_responseArchiveBuffer = null; // L: 1347 } else { - if (NetCache.field3995 != 512) { // L: 1260 + if (NetCache.field4052 != 512) { // L: 1349 break; } - NetCache.field3995 = 0; + NetCache.field4052 = 0; } } } - var1 = true; // L: 1264 + var1 = true; // L: 1353 } } catch (IOException var24) { try { - NetCache.NetCache_socket.close(); // L: 1268 - } catch (Exception var22) { // L: 1270 + NetCache.NetCache_socket.close(); // L: 1357 + } catch (Exception var22) { // L: 1359 } - ++NetCache.NetCache_ioExceptions; // L: 1271 - NetCache.NetCache_socket = null; // L: 1272 - var1 = false; // L: 1273 + ++NetCache.NetCache_ioExceptions; // L: 1360 + NetCache.NetCache_socket = null; // L: 1361 + var1 = false; // L: 1362 } } - if (!var1) { // L: 1277 + if (!var1) { // L: 1366 this.doCycleJs5Connect(); } } - } // L: 1278 + } // L: 1367 - @ObfuscatedName("fo") + @ObfuscatedName("fd") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-49490538" + descriptor = "(S)V", + garbageValue = "17214" ) @Export("doCycleJs5Connect") void doCycleJs5Connect() { - if (NetCache.NetCache_crcMismatches >= 4) { // L: 1281 - this.error("js5crc"); // L: 1282 - Decimator.updateGameState(1000); // L: 1283 + if (NetCache.NetCache_crcMismatches >= 4) { // L: 1370 + this.error("js5crc"); // L: 1371 + PendingSpawn.updateGameState(1000); // L: 1372 } else { - if (NetCache.NetCache_ioExceptions >= 4) { // L: 1286 - if (gameState <= 5) { // L: 1287 - this.error("js5io"); // L: 1288 - Decimator.updateGameState(1000); // L: 1289 - return; // L: 1290 + if (NetCache.NetCache_ioExceptions >= 4) { // L: 1375 + if (gameState <= 5) { // L: 1376 + this.error("js5io"); // L: 1377 + PendingSpawn.updateGameState(1000); // L: 1378 + return; // L: 1379 } - field525 = 3000; // L: 1293 - NetCache.NetCache_ioExceptions = 3; // L: 1294 + field625 = 3000; // L: 1382 + NetCache.NetCache_ioExceptions = 3; // L: 1383 } - if (--field525 + 1 <= 0) { // L: 1297 + if (--field625 + 1 <= 0) { // L: 1386 try { - if (js5ConnectState == 0) { // L: 1299 - VerticalAlignment.js5SocketTask = GameEngine.taskHandler.newSocketTask(class17.worldHost, class329.currentPort); // L: 1300 - ++js5ConnectState; // L: 1301 + if (js5ConnectState == 0) { // L: 1388 + class259.js5SocketTask = GameEngine.taskHandler.newSocketTask(Timer.worldHost, WorldMapRegion.currentPort); // L: 1389 + ++js5ConnectState; // L: 1390 } - if (js5ConnectState == 1) { // L: 1303 - if (VerticalAlignment.js5SocketTask.status == 2) { // L: 1304 - this.js5Error(-1); // L: 1305 - return; // L: 1306 + if (js5ConnectState == 1) { // L: 1392 + if (class259.js5SocketTask.status == 2) { // L: 1393 + this.js5Error(-1); // L: 1394 + return; // L: 1395 } - if (VerticalAlignment.js5SocketTask.status == 1) { // L: 1308 + if (class259.js5SocketTask.status == 1) { // L: 1397 ++js5ConnectState; } } - if (js5ConnectState == 2) { // L: 1310 - if (useBufferedSocket) { // L: 1311 - Socket var2 = (Socket)VerticalAlignment.js5SocketTask.result; // L: 1313 - BufferedNetSocket var1 = new BufferedNetSocket(var2, 40000, 5000); // L: 1315 - Decimator.js5Socket = var1; // L: 1317 + if (js5ConnectState == 2) { // L: 1399 + if (useBufferedSocket) { // L: 1400 + Socket var2 = (Socket)class259.js5SocketTask.result; // L: 1402 + BufferedNetSocket var1 = new BufferedNetSocket(var2, 40000, 5000); // L: 1404 + Varcs.js5Socket = var1; // L: 1406 } else { - Decimator.js5Socket = new NetSocket((Socket)VerticalAlignment.js5SocketTask.result, GameEngine.taskHandler, 5000); // L: 1320 + Varcs.js5Socket = new NetSocket((Socket)class259.js5SocketTask.result, GameEngine.taskHandler, 5000); // L: 1409 } - Buffer var13 = new Buffer(5); // L: 1322 - var13.writeByte(15); // L: 1323 - var13.writeInt(204); // L: 1324 - Decimator.js5Socket.write(var13.array, 0, 5); // L: 1325 - ++js5ConnectState; // L: 1326 - KeyHandler.field149 = class136.method2931(); // L: 1327 + Buffer var5 = new Buffer(5); // L: 1411 + var5.writeByte(15); // L: 1412 + var5.writeInt(205); // L: 1413 + Varcs.js5Socket.write(var5.array, 0, 5); // L: 1414 + ++js5ConnectState; // L: 1415 + class147.field1704 = class113.method2624(); // L: 1416 } - if (js5ConnectState == 3) { // L: 1329 - if (Decimator.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 1330 - int var5 = Decimator.js5Socket.readUnsignedByte(); // L: 1331 - if (var5 != 0) { // L: 1332 - this.js5Error(var5); // L: 1333 - return; // L: 1334 + if (js5ConnectState == 3) { // L: 1418 + if (Varcs.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 1419 + int var3 = Varcs.js5Socket.readUnsignedByte(); // L: 1420 + if (var3 != 0) { // L: 1421 + this.js5Error(var3); // L: 1422 + return; // L: 1423 } - ++js5ConnectState; // L: 1336 - } else if (class136.method2931() - KeyHandler.field149 > 30000L) { // L: 1339 - this.js5Error(-2); // L: 1340 - return; // L: 1341 + ++js5ConnectState; // L: 1425 + } else if (class113.method2624() - class147.field1704 > 30000L) { // L: 1428 + this.js5Error(-2); // L: 1429 + return; // L: 1430 } } - if (js5ConnectState == 4) { // L: 1345 - AbstractSocket var14 = Decimator.js5Socket; // L: 1346 - boolean var6 = gameState > 20; // L: 1347 - if (NetCache.NetCache_socket != null) { // L: 1349 - try { - NetCache.NetCache_socket.close(); // L: 1351 - } catch (Exception var11) { // L: 1353 - } - - NetCache.NetCache_socket = null; // L: 1354 - } - - NetCache.NetCache_socket = var14; // L: 1356 - Buffer var3; - if (NetCache.NetCache_socket != null) { // L: 1358 - try { - var3 = new Buffer(4); // L: 1360 - var3.writeByte(var6 ? 2 : 3); // L: 1361 - var3.writeMedium(0); // L: 1362 - NetCache.NetCache_socket.write(var3.array, 0, 4); // L: 1363 - } catch (IOException var10) { - try { - NetCache.NetCache_socket.close(); // L: 1367 - } catch (Exception var9) { // L: 1369 - } - - ++NetCache.NetCache_ioExceptions; // L: 1370 - NetCache.NetCache_socket = null; // L: 1371 - } - } - - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1374 - class271.NetCache_currentResponse = null; // L: 1375 - class194.NetCache_responseArchiveBuffer = null; // L: 1376 - NetCache.field3995 = 0; // L: 1377 - - while (true) { - NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 1379 - if (var15 == null) { // L: 1380 - while (true) { - var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 1386 - if (var15 == null) { // L: 1387 - if (NetCache.field3998 != 0) { // L: 1393 - try { - var3 = new Buffer(4); // L: 1395 - var3.writeByte(4); // L: 1396 - var3.writeByte(NetCache.field3998); // L: 1397 - var3.writeShort(0); // L: 1398 - NetCache.NetCache_socket.write(var3.array, 0, 4); // L: 1399 - } catch (IOException var8) { - try { - NetCache.NetCache_socket.close(); // L: 1403 - } catch (Exception var7) { // L: 1405 - } - - ++NetCache.NetCache_ioExceptions; // L: 1406 - NetCache.NetCache_socket = null; // L: 1407 - } - } - - NetCache.NetCache_loadTime = 0; // L: 1410 - NetCache.field3982 = class136.method2931(); // L: 1411 - VerticalAlignment.js5SocketTask = null; // L: 1413 - Decimator.js5Socket = null; // L: 1414 - js5ConnectState = 0; // L: 1415 - js5Errors = 0; // L: 1416 - return; // L: 1422 - } - - NetCache.NetCache_pendingWritesQueue.addLast(var15); // L: 1388 - NetCache.NetCache_pendingWrites.put(var15, var15.key); // L: 1389 - ++NetCache.NetCache_pendingWritesCount; // L: 1390 - --NetCache.NetCache_pendingResponsesCount; // L: 1391 - } - } - - NetCache.NetCache_pendingPriorityWrites.put(var15, var15.key); // L: 1381 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 1382 - --NetCache.NetCache_pendingPriorityResponsesCount; // L: 1383 - } + if (js5ConnectState == 4) { // L: 1434 + Skeleton.method4024(Varcs.js5Socket, gameState > 20); // L: 1435 + class259.js5SocketTask = null; // L: 1436 + Varcs.js5Socket = null; // L: 1437 + js5ConnectState = 0; // L: 1438 + js5Errors = 0; // L: 1439 } - } catch (IOException var12) { // L: 1419 - this.js5Error(-3); // L: 1420 + } catch (IOException var4) { // L: 1442 + this.js5Error(-3); // L: 1443 } } } - } // L: 1284 + } // L: 1373 1445 - @ObfuscatedName("fm") + @ObfuscatedName("fh") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "66" + descriptor = "(II)V", + garbageValue = "1106896178" ) @Export("js5Error") void js5Error(int var1) { - VerticalAlignment.js5SocketTask = null; // L: 1425 - Decimator.js5Socket = null; // L: 1426 - js5ConnectState = 0; // L: 1427 - if (SecureRandomFuture.worldPort == class329.currentPort) { // L: 1428 - class329.currentPort = UserComparator9.js5Port; + class259.js5SocketTask = null; // L: 1448 + Varcs.js5Socket = null; // L: 1449 + js5ConnectState = 0; // L: 1450 + if (Tiles.worldPort == WorldMapRegion.currentPort) { // L: 1451 + WorldMapRegion.currentPort = GrandExchangeEvent.js5Port; } else { - class329.currentPort = SecureRandomFuture.worldPort; // L: 1429 + WorldMapRegion.currentPort = Tiles.worldPort; // L: 1452 } - ++js5Errors; // L: 1430 - if (js5Errors < 2 || var1 != 7 && var1 != 9) { // L: 1431 - if (js5Errors >= 2 && var1 == 6) { // L: 1438 - this.error("js5connect_outofdate"); // L: 1439 - Decimator.updateGameState(1000); // L: 1440 - } else if (js5Errors >= 4) { // L: 1442 - if (gameState <= 5) { // L: 1443 - this.error("js5connect"); // L: 1444 - Decimator.updateGameState(1000); // L: 1445 + ++js5Errors; // L: 1453 + if (js5Errors < 2 || var1 != 7 && var1 != 9) { // L: 1454 + if (js5Errors >= 2 && var1 == 6) { // L: 1461 + this.error("js5connect_outofdate"); // L: 1462 + PendingSpawn.updateGameState(1000); // L: 1463 + } else if (js5Errors >= 4) { // L: 1465 + if (gameState <= 5) { // L: 1466 + this.error("js5connect"); // L: 1467 + PendingSpawn.updateGameState(1000); // L: 1468 } else { - field525 = 3000; // L: 1447 + field625 = 3000; // L: 1470 } } - } else if (gameState <= 5) { // L: 1432 - this.error("js5connect_full"); // L: 1433 - Decimator.updateGameState(1000); // L: 1434 + } else if (gameState <= 5) { // L: 1455 + this.error("js5connect_full"); // L: 1456 + PendingSpawn.updateGameState(1000); // L: 1457 } else { - field525 = 3000; // L: 1436 + field625 = 3000; // L: 1459 } - } // L: 1449 + } // L: 1472 - @ObfuscatedName("fx") + @ObfuscatedName("ft") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1166216650" + descriptor = "(B)V", + garbageValue = "57" ) @Export("doCycleLoggedOut") final void doCycleLoggedOut() { - Object var1 = packetWriter.getSocket(); // L: 1978 - PacketBuffer var2 = packetWriter.packetBuffer; // L: 1979 + Object var1 = packetWriter.getSocket(); // L: 2077 + PacketBuffer var2 = packetWriter.packetBuffer; // L: 2078 try { - if (loginState == 0) { // L: 1981 - if (class347.secureRandom == null && (secureRandomFuture.isDone() || field528 > 250)) { // L: 1982 - class347.secureRandom = secureRandomFuture.get(); // L: 1983 - secureRandomFuture.shutdown(); // L: 1984 - secureRandomFuture = null; // L: 1985 + if (loginState == 0) { // L: 2080 + if (secureRandom == null && (secureRandomFuture.isDone() || field626 > 250)) { // L: 2081 + secureRandom = secureRandomFuture.get(); // L: 2082 + secureRandomFuture.shutdown(); // L: 2083 + secureRandomFuture = null; // L: 2084 } - if (class347.secureRandom != null) { // L: 1987 - if (var1 != null) { // L: 1988 - ((AbstractSocket)var1).close(); // L: 1989 - var1 = null; // L: 1990 + if (secureRandom != null) { // L: 2086 + if (var1 != null) { // L: 2087 + ((AbstractSocket)var1).close(); // L: 2088 + var1 = null; // L: 2089 } - DynamicObject.socketTask = null; // L: 1992 - hadNetworkError = false; // L: 1993 - field528 = 0; // L: 1994 - if (field532.method7928()) { // L: 1995 + WorldMapCacheName.socketTask = null; // L: 2091 + hadNetworkError = false; // L: 2092 + field626 = 0; // L: 2093 + if (field517.method7790()) { // L: 2094 try { - this.method1366(class360.field4209); // L: 1997 - ModeWhere.method6099(20); // L: 1998 - } catch (Throwable var27) { // L: 2000 - Widget.RunException_sendStackTrace((String)null, var27); // L: 2001 - ScriptFrame.getLoginError(65); // L: 2002 - return; // L: 2003 + this.method1130(ModelData0.field2661); // L: 2096 + Canvas.method347(21); // L: 2097 + } catch (Throwable var21) { // L: 2099 + ArchiveDiskActionHandler.RunException_sendStackTrace((String)null, var21); // L: 2100 + PcmPlayer.getLoginError(65); // L: 2101 + return; // L: 2102 } } else { - ModeWhere.method6099(1); // L: 2007 + Canvas.method347(1); // L: 2106 } } } - if (loginState == 20) { // L: 2011 - if (this.field599 != null) { // L: 2012 - if (!this.field599.isDone()) { // L: 2013 - return; // L: 2014 + class21 var23; + if (loginState == 21) { // L: 2110 + if (this.field581 != null) { // L: 2111 + if (!this.field581.isDone()) { // L: 2112 + return; // L: 2113 } - if (this.field599.isCancelled()) { // L: 2016 - ScriptFrame.getLoginError(65); // L: 2017 - this.field599 = null; // L: 2018 - return; // L: 2019 + if (this.field581.isCancelled()) { // L: 2115 + PcmPlayer.getLoginError(65); // L: 2116 + this.field581 = null; // L: 2117 + return; // L: 2118 } try { - OtlTokenResponse var3 = (OtlTokenResponse)this.field599.get(); // L: 2022 - if (!var3.isSuccess()) { // L: 2023 - ScriptFrame.getLoginError(65); // L: 2024 - this.field599 = null; // L: 2025 - return; // L: 2026 + OtlTokenResponse var3 = (OtlTokenResponse)this.field581.get(); // L: 2121 + if (!var3.isSuccess()) { // L: 2122 + PcmPlayer.getLoginError(65); // L: 2123 + this.field581 = null; // L: 2124 + return; // L: 2125 } - this.field564 = var3.getToken(); // L: 2028 - this.field599 = null; // L: 2029 - } catch (Exception var26) { // L: 2031 - Widget.RunException_sendStackTrace((String)null, var26); // L: 2032 - ScriptFrame.getLoginError(65); // L: 2033 - this.field599 = null; // L: 2034 - return; // L: 2035 + Decimator.field406 = var3.getAccessToken(); // L: 2127 + ModelData0.field2661 = var3.getRefreshToken(); // L: 2128 + this.field581 = null; // L: 2129 + } catch (Exception var20) { // L: 2131 + ArchiveDiskActionHandler.RunException_sendStackTrace((String)null, var20); // L: 2132 + PcmPlayer.getLoginError(65); // L: 2133 + this.field581 = null; // L: 2134 + return; // L: 2135 } } else { - if (this.field690 == null) { // L: 2038 - ScriptFrame.getLoginError(65); // L: 2059 - return; // L: 2060 + if (this.field523 == null) { // L: 2138 + PcmPlayer.getLoginError(65); // L: 2168 + return; // L: 2169 } - if (!this.field690.method268()) { // L: 2039 - return; // L: 2040 + if (!this.field523.method253()) { // L: 2139 + return; // L: 2140 } - if (this.field690.method283()) { // L: 2042 - Widget.RunException_sendStackTrace(this.field690.method271(), (Throwable)null); // L: 2043 - ScriptFrame.getLoginError(65); // L: 2044 - this.field690 = null; // L: 2045 - return; // L: 2046 + if (this.field523.method250()) { // L: 2142 + ArchiveDiskActionHandler.RunException_sendStackTrace(this.field523.method251(), (Throwable)null); // L: 2143 + PcmPlayer.getLoginError(65); // L: 2144 + this.field523 = null; // L: 2145 + return; // L: 2146 } - class21 var30 = this.field690.method274(); // L: 2048 - if (var30.method299() != 200) { // L: 2049 - Widget.RunException_sendStackTrace("Response code: " + var30.method299() + "Response body: " + var30.method297(), (Throwable)null); // L: 2050 - ScriptFrame.getLoginError(65); // L: 2051 - this.field690 = null; // L: 2052 - return; // L: 2053 + var23 = this.field523.method254(); // L: 2148 + if (var23.method271() != 200) { // L: 2149 + PcmPlayer.getLoginError(65); // L: 2150 + this.field523 = null; // L: 2151 + return; // L: 2152 } - this.field564 = var30.method297(); // L: 2055 - this.field690 = null; // L: 2056 + field626 = 0; // L: 2154 + class400 var4 = new class400(var23.method276()); // L: 2155 + + try { + Decimator.field406 = var4.method6947().getString("access_token"); // L: 2157 + ModelData0.field2661 = var4.method6947().getString("refresh_token"); // L: 2158 + } catch (Exception var19) { // L: 2160 + ArchiveDiskActionHandler.RunException_sendStackTrace("Error parsing tokens", var19); // L: 2161 + PcmPlayer.getLoginError(65); // L: 2162 + this.field523 = null; // L: 2163 + return; // L: 2164 + } } - field528 = 0; // L: 2062 - ModeWhere.method6099(1); // L: 2063 + this.method1229(Decimator.field406); // L: 2171 + Canvas.method347(20); // L: 2172 } - if (loginState == 1) { // L: 2065 - if (DynamicObject.socketTask == null) { // L: 2066 - DynamicObject.socketTask = GameEngine.taskHandler.newSocketTask(class17.worldHost, class329.currentPort); // L: 2067 + if (loginState == 20) { // L: 2174 + if (this.field550 != null) { // L: 2175 + if (!this.field550.isDone()) { // L: 2176 + return; // L: 2177 + } + + if (this.field550.isCancelled()) { // L: 2179 + PcmPlayer.getLoginError(65); // L: 2180 + this.field550 = null; // L: 2181 + return; // L: 2182 + } + + try { + com.jagex.oldscape.pub.OtlTokenResponse var24 = (com.jagex.oldscape.pub.OtlTokenResponse)this.field550.get(); // L: 2185 + if (!var24.isSuccess()) { // L: 2186 + PcmPlayer.getLoginError(65); // L: 2187 + this.field550 = null; // L: 2188 + return; // L: 2189 + } + + this.field518 = var24.getToken(); // L: 2191 + this.field550 = null; // L: 2192 + } catch (Exception var18) { // L: 2194 + ArchiveDiskActionHandler.RunException_sendStackTrace((String)null, var18); // L: 2195 + PcmPlayer.getLoginError(65); // L: 2196 + this.field550 = null; // L: 2197 + return; // L: 2198 + } + } else { + if (this.field520 == null) { // L: 2201 + PcmPlayer.getLoginError(65); // L: 2222 + return; // L: 2223 + } + + if (!this.field520.method253()) { // L: 2202 + return; // L: 2203 + } + + if (this.field520.method250()) { // L: 2205 + ArchiveDiskActionHandler.RunException_sendStackTrace(this.field520.method251(), (Throwable)null); // L: 2206 + PcmPlayer.getLoginError(65); // L: 2207 + this.field520 = null; // L: 2208 + return; // L: 2209 + } + + var23 = this.field520.method254(); // L: 2211 + if (var23.method271() != 200) { // L: 2212 + ArchiveDiskActionHandler.RunException_sendStackTrace("Response code: " + var23.method271() + "Response body: " + var23.method276(), (Throwable)null); // L: 2213 + PcmPlayer.getLoginError(65); // L: 2214 + this.field520 = null; // L: 2215 + return; // L: 2216 + } + + this.field518 = var23.method276(); // L: 2218 + this.field520 = null; // L: 2219 } - if (DynamicObject.socketTask.status == 2) { // L: 2069 + field626 = 0; // L: 2225 + Canvas.method347(1); // L: 2226 + } + + if (loginState == 1) { // L: 2228 + if (WorldMapCacheName.socketTask == null) { // L: 2229 + WorldMapCacheName.socketTask = GameEngine.taskHandler.newSocketTask(Timer.worldHost, WorldMapRegion.currentPort); // L: 2230 + } + + if (WorldMapCacheName.socketTask.status == 2) { // L: 2232 throw new IOException(); } - if (DynamicObject.socketTask.status == 1) { // L: 2070 - if (useBufferedSocket) { // L: 2071 - Socket var4 = (Socket)DynamicObject.socketTask.result; // L: 2073 - BufferedNetSocket var31 = new BufferedNetSocket(var4, 40000, 5000); // L: 2075 - var1 = var31; // L: 2077 + if (WorldMapCacheName.socketTask.status == 1) { // L: 2233 + if (useBufferedSocket) { // L: 2234 + Socket var25 = (Socket)WorldMapCacheName.socketTask.result; // L: 2236 + BufferedNetSocket var26 = new BufferedNetSocket(var25, 40000, 5000); // L: 2238 + var1 = var26; // L: 2240 } else { - var1 = new NetSocket((Socket)DynamicObject.socketTask.result, GameEngine.taskHandler, 5000); // L: 2080 + var1 = new NetSocket((Socket)WorldMapCacheName.socketTask.result, GameEngine.taskHandler, 5000); // L: 2243 } - packetWriter.setSocket((AbstractSocket)var1); // L: 2082 - DynamicObject.socketTask = null; // L: 2083 - ModeWhere.method6099(2); // L: 2084 + packetWriter.setSocket((AbstractSocket)var1); // L: 2245 + WorldMapCacheName.socketTask = null; // L: 2246 + Canvas.method347(2); // L: 2247 } } - PacketBufferNode var33; - if (loginState == 2) { // L: 2087 - packetWriter.clearBuffer(); // L: 2088 - if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 2093 - var33 = new PacketBufferNode(); // L: 2094 + PacketBufferNode var27; + if (loginState == 2) { // L: 2250 + packetWriter.clearBuffer(); // L: 2251 + var27 = class162.method3208(); // L: 2252 + var27.packetBuffer.writeByte(LoginPacket.field3192.id); // L: 2253 + packetWriter.addNode(var27); // L: 2254 + packetWriter.flush(); // L: 2255 + var2.offset = 0; // L: 2256 + Canvas.method347(3); // L: 2257 + } + + boolean var11; + int var12; + if (loginState == 3) { // L: 2259 + if (SecureRandomCallable.pcmPlayer0 != null) { // L: 2260 + SecureRandomCallable.pcmPlayer0.method739(); + } + + if (Fonts.pcmPlayer1 != null) { // L: 2261 + Fonts.pcmPlayer1.method739(); + } + + var11 = true; // L: 2262 + if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 2263 2264 + var11 = false; + } + + if (var11) { // L: 2266 + var12 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2267 + if (SecureRandomCallable.pcmPlayer0 != null) { // L: 2268 + SecureRandomCallable.pcmPlayer0.method739(); + } + + if (Fonts.pcmPlayer1 != null) { // L: 2269 + Fonts.pcmPlayer1.method739(); + } + + if (var12 != 0) { // L: 2270 + PcmPlayer.getLoginError(var12); // L: 2271 + return; // L: 2272 + } + + var2.offset = 0; // L: 2274 + Canvas.method347(4); // L: 2275 + } + } + + int var40; + if (loginState == 4) { // L: 2278 + if (var2.offset < 8) { // L: 2279 + var40 = ((AbstractSocket)var1).available(); // L: 2280 + if (var40 > 8 - var2.offset) { // L: 2281 + var40 = 8 - var2.offset; + } + + if (var40 > 0) { // L: 2282 + ((AbstractSocket)var1).read(var2.array, var2.offset, var40); // L: 2283 + var2.offset += var40; // L: 2284 + } + } + + if (var2.offset == 8) { // L: 2287 + var2.offset = 0; // L: 2288 + ModelData0.field2658 = var2.readLong(); // L: 2289 + Canvas.method347(5); // L: 2290 + } + } + + int var6; + if (loginState == 5) { // L: 2293 + packetWriter.packetBuffer.offset = 0; // L: 2294 + packetWriter.clearBuffer(); // L: 2295 + PacketBuffer var29 = new PacketBuffer(500); // L: 2296 + int[] var28 = new int[]{secureRandom.nextInt(), secureRandom.nextInt(), secureRandom.nextInt(), secureRandom.nextInt()}; // L: 2297 2298 2299 2300 2301 + var29.offset = 0; // L: 2302 + var29.writeByte(1); // L: 2303 + var29.writeInt(var28[0]); // L: 2304 + var29.writeInt(var28[1]); // L: 2305 + var29.writeInt(var28[2]); // L: 2306 + var29.writeInt(var28[3]); // L: 2307 + var29.writeLong(ModelData0.field2658); // L: 2308 + if (gameState == 40) { // L: 2309 + var29.writeInt(LoginType.field4619[0]); // L: 2310 + var29.writeInt(LoginType.field4619[1]); // L: 2311 + var29.writeInt(LoginType.field4619[2]); // L: 2312 + var29.writeInt(LoginType.field4619[3]); // L: 2313 } else { - var33 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 2097 - } - - var33.clientPacket = null; // L: 2100 - var33.clientPacketLength = 0; // L: 2101 - var33.packetBuffer = new PacketBuffer(5000); // L: 2102 - var33.packetBuffer.writeByte(LoginPacket.field3137.id); // L: 2106 - packetWriter.addNode(var33); // L: 2107 - packetWriter.flush(); // L: 2108 - var2.offset = 0; // L: 2109 - ModeWhere.method6099(3); // L: 2110 - } - - boolean var14; - int var15; - if (loginState == 3) { // L: 2112 - if (KeyHandler.pcmPlayer0 != null) { // L: 2113 - KeyHandler.pcmPlayer0.method690(); - } - - if (ViewportMouse.pcmPlayer1 != null) { // L: 2114 - ViewportMouse.pcmPlayer1.method690(); - } - - var14 = true; // L: 2115 - if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 2116 2117 - var14 = false; - } - - if (var14) { // L: 2119 - var15 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2120 - if (KeyHandler.pcmPlayer0 != null) { // L: 2121 - KeyHandler.pcmPlayer0.method690(); - } - - if (ViewportMouse.pcmPlayer1 != null) { // L: 2122 - ViewportMouse.pcmPlayer1.method690(); - } - - if (var15 != 0) { // L: 2123 - ScriptFrame.getLoginError(var15); // L: 2124 - return; // L: 2125 - } - - var2.offset = 0; // L: 2127 - ModeWhere.method6099(4); // L: 2128 - } - } - - int var44; - if (loginState == 4) { // L: 2131 - if (var2.offset < 8) { // L: 2132 - var44 = ((AbstractSocket)var1).available(); // L: 2133 - if (var44 > 8 - var2.offset) { // L: 2134 - var44 = 8 - var2.offset; - } - - if (var44 > 0) { // L: 2135 - ((AbstractSocket)var1).read(var2.array, var2.offset, var44); // L: 2136 - var2.offset += var44; // L: 2137 - } - } - - if (var2.offset == 8) { // L: 2140 - var2.offset = 0; // L: 2141 - ServerPacket.field3129 = var2.readLong(); // L: 2142 - ModeWhere.method6099(5); // L: 2143 - } - } - - int var7; - int var9; - int var17; - if (loginState == 5) { // L: 2146 - packetWriter.packetBuffer.offset = 0; // L: 2147 - packetWriter.clearBuffer(); // L: 2148 - PacketBuffer var32 = new PacketBuffer(500); // L: 2149 - int[] var36 = new int[]{class347.secureRandom.nextInt(), class347.secureRandom.nextInt(), class347.secureRandom.nextInt(), class347.secureRandom.nextInt()}; // L: 2150 2151 2152 2153 2154 - var32.offset = 0; // L: 2155 - var32.writeByte(1); // L: 2156 - var32.writeInt(var36[0]); // L: 2157 - var32.writeInt(var36[1]); // L: 2158 - var32.writeInt(var36[2]); // L: 2159 - var32.writeInt(var36[3]); // L: 2160 - var32.writeLong(ServerPacket.field3129); // L: 2161 - if (gameState == 40) { // L: 2162 - var32.writeInt(VertexNormal.field2817[0]); // L: 2163 - var32.writeInt(VertexNormal.field2817[1]); // L: 2164 - var32.writeInt(VertexNormal.field2817[2]); // L: 2165 - var32.writeInt(VertexNormal.field2817[3]); // L: 2166 - } else { - if (gameState == 50) { // L: 2169 - var32.writeByte(class124.field1497.rsOrdinal()); // L: 2170 - var32.writeInt(WorldMapSectionType.field2321); // L: 2171 + if (gameState == 50) { // L: 2316 + var29.writeByte(class124.field1555.rsOrdinal()); // L: 2317 + var29.writeInt(class7.field26); // L: 2318 } else { - var32.writeByte(field531.rsOrdinal()); // L: 2174 - switch(field531.field1493) { // L: 2175 + var29.writeByte(field615.rsOrdinal()); // L: 2321 + switch(field615.field1552) { // L: 2322 + case 0: case 1: - var32.offset += 4; // L: 2185 - break; // L: 2186 + var29.writeMedium(WorldMapCacheName.field2912); // L: 2336 + ++var29.offset; // L: 2337 + break; case 2: + var29.offset += 4; // L: 2325 + break; // L: 2326 case 3: - var32.writeMedium(WorldMapID.field2386); // L: 2179 - ++var32.offset; // L: 2180 - break; // L: 2181 - case 4: - LinkedHashMap var6 = class131.clientPreferences.parameters; // L: 2191 - String var8 = Login.Login_username; // L: 2193 - var9 = var8.length(); // L: 2195 - int var10 = 0; // L: 2196 - - for (int var11 = 0; var11 < var9; ++var11) { // L: 2197 - var10 = (var10 << 5) - var10 + var8.charAt(var11); - } - - var32.writeInt((Integer)var6.get(var10)); // L: 2200 + var29.writeInt((Integer)class12.clientPreferences.parameters.get(class239.method4810(Login.Login_username))); // L: 2330 } } - if (field532.method7928()) { // L: 2205 - var32.writeByte(class441.field4671.rsOrdinal()); // L: 2206 - var32.writeStringCp1252NullTerminated(this.field564); // L: 2207 + if (field517.method7790()) { // L: 2342 + var29.writeByte(class443.field4730.rsOrdinal()); // L: 2343 + var29.writeStringCp1252NullTerminated(this.field518); // L: 2344 } else { - var32.writeByte(class441.field4678.rsOrdinal()); // L: 2210 - var32.writeStringCp1252NullTerminated(Login.Login_password); // L: 2211 + var29.writeByte(class443.field4734.rsOrdinal()); // L: 2347 + var29.writeStringCp1252NullTerminated(Login.Login_password); // L: 2348 } } - var32.encryptRsa(class67.field882, class67.field880); // L: 2214 - VertexNormal.field2817 = var36; // L: 2215 - PacketBufferNode var40; - if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 2220 - var40 = new PacketBufferNode(); // L: 2221 + var29.encryptRsa(class67.field875, class67.field871); // L: 2351 + LoginType.field4619 = var28; // L: 2352 + PacketBufferNode var5 = class162.method3208(); // L: 2353 + var5.packetBuffer.offset = 0; // L: 2354 + if (gameState == 40) { // L: 2355 + var5.packetBuffer.writeByte(LoginPacket.field3194.id); // L: 2356 } else { - var40 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 2224 + var5.packetBuffer.writeByte(LoginPacket.field3193.id); // L: 2359 } - var40.clientPacket = null; // L: 2227 - var40.clientPacketLength = 0; // L: 2228 - var40.packetBuffer = new PacketBuffer(5000); // L: 2229 - var40.packetBuffer.offset = 0; // L: 2233 - if (gameState == 40) { // L: 2234 - var40.packetBuffer.writeByte(LoginPacket.field3133.id); // L: 2235 - } else { - var40.packetBuffer.writeByte(LoginPacket.field3132.id); // L: 2238 + var5.packetBuffer.writeShort(0); // L: 2361 + var6 = var5.packetBuffer.offset; // L: 2362 + var5.packetBuffer.writeInt(205); // L: 2363 + var5.packetBuffer.writeInt(1); // L: 2364 + var5.packetBuffer.writeByte(clientType); // L: 2365 + var5.packetBuffer.writeByte(field486); // L: 2366 + var5.packetBuffer.writeBytes(var29.array, 0, var29.offset); // L: 2367 + int var7 = var5.packetBuffer.offset; // L: 2368 + var5.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 2369 + var5.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 2370 + var5.packetBuffer.writeShort(GraphicsObject.canvasWidth); // L: 2371 + var5.packetBuffer.writeShort(class433.canvasHeight); // L: 2372 + IntHashTable.method8124(var5.packetBuffer); // L: 2373 + if (!field662.endsWith(";A")) { // L: 2374 + field662 = field662 + ";A"; // L: 2375 } - var40.packetBuffer.writeShort(0); // L: 2240 - var7 = var40.packetBuffer.offset; // L: 2241 - var40.packetBuffer.writeInt(204); // L: 2242 - var40.packetBuffer.writeInt(1); // L: 2243 - var40.packetBuffer.writeByte(clientType); // L: 2244 - var40.packetBuffer.writeByte(field498); // L: 2245 - var40.packetBuffer.writeBytes(var32.array, 0, var32.offset); // L: 2246 - var17 = var40.packetBuffer.offset; // L: 2247 - var40.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 2248 - var40.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 2249 - var40.packetBuffer.writeShort(InvDefinition.canvasWidth); // L: 2250 - var40.packetBuffer.writeShort(class321.canvasHeight); // L: 2251 - PacketBuffer var18 = var40.packetBuffer; // L: 2252 - int var12; - if (randomDatData != null) { // L: 2254 - var18.writeBytes(randomDatData, 0, randomDatData.length); // L: 2255 + var5.packetBuffer.writeStringCp1252NullTerminated(field662); // L: 2377 + var5.packetBuffer.writeInt(class230.field2807); // L: 2378 + Buffer var8 = new Buffer(class135.platformInfo.size()); // L: 2379 + class135.platformInfo.write(var8); // L: 2380 + var5.packetBuffer.writeBytes(var8.array, 0, var8.array.length); // L: 2381 + var5.packetBuffer.writeByte(clientType); // L: 2382 + var5.packetBuffer.writeInt(0); // L: 2383 + var5.packetBuffer.method7563(AbstractUserComparator.archive6.hash); // L: 2384 + var5.packetBuffer.writeInt(ItemContainer.archive20.hash); // L: 2385 + var5.packetBuffer.method7565(class305.archive8.hash); // L: 2386 + var5.packetBuffer.method7565(0); // L: 2387 + var5.packetBuffer.writeInt(class356.archive2.hash); // L: 2388 + var5.packetBuffer.method7563(VarpDefinition.archive19.hash); // L: 2389 + var5.packetBuffer.method7565(InterfaceParent.archive7.hash); // L: 2390 + var5.packetBuffer.method7565(class101.archive14.hash); // L: 2391 + var5.packetBuffer.writeIntME(UrlRequest.archive11.hash); // L: 2392 + var5.packetBuffer.writeInt(Clock.archive1.hash); // L: 2393 + var5.packetBuffer.method7563(Message.archive5.hash); // L: 2394 + var5.packetBuffer.writeInt(class16.archive13.hash); // L: 2395 + var5.packetBuffer.method7565(class114.archive17.hash); // L: 2396 + var5.packetBuffer.method7565(class92.archive18.hash); // L: 2397 + var5.packetBuffer.writeInt(ObjectSound.archive10.hash); // L: 2398 + var5.packetBuffer.writeInt(class194.archive3.hash); // L: 2399 + var5.packetBuffer.writeIntME(archive15.hash); // L: 2400 + var5.packetBuffer.writeInt(MouseHandler.archive4.hash); // L: 2401 + var5.packetBuffer.method7565(class115.archive12.hash); // L: 2402 + var5.packetBuffer.method7563(TileItem.archive9.hash); // L: 2403 + var5.packetBuffer.method7563(NetSocket.archive0.hash); // L: 2404 + var5.packetBuffer.xteaEncrypt(var28, var7, var5.packetBuffer.offset); // L: 2405 + var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var6); // L: 2406 + packetWriter.addNode(var5); // L: 2407 + packetWriter.flush(); // L: 2408 + packetWriter.isaacCipher = new IsaacCipher(var28); // L: 2409 + int[] var9 = new int[4]; // L: 2410 + + for (int var10 = 0; var10 < 4; ++var10) { // L: 2411 + var9[var10] = var28[var10] + 50; + } + + var2.newIsaacCipher(var9); // L: 2412 + Canvas.method347(6); // L: 2413 + } + + if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 2415 2416 + var40 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2417 + if (var40 == 61) { // L: 2418 + var12 = ((AbstractSocket)var1).available(); // L: 2419 + class92.field1273 = var12 == 1 && ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2420 + Canvas.method347(5); // L: 2421 + } + + if (var40 == 21 && gameState == 20) { // L: 2423 + Canvas.method347(12); // L: 2424 + } else if (var40 == 2) { // L: 2426 + Canvas.method347(14); // L: 2427 + } else if (var40 == 15 && gameState == 40) { // L: 2429 + packetWriter.serverPacketLength = -1; // L: 2430 + Canvas.method347(19); // L: 2431 + } else if (var40 == 64) { // L: 2433 + Canvas.method347(10); // L: 2434 + } else if (var40 == 23 && field514 < 1) { // L: 2436 + ++field514; // L: 2437 + Canvas.method347(0); // L: 2438 + } else if (var40 == 29) { // L: 2440 + Canvas.method347(17); // L: 2441 } else { - byte[] var19 = new byte[24]; // L: 2260 - - try { - JagexCache.JagexCache_randomDat.seek(0L); // L: 2262 - JagexCache.JagexCache_randomDat.readFully(var19); // L: 2263 - - for (var12 = 0; var12 < 24 && var19[var12] == 0; ++var12) { // L: 2264 2265 2266 - } - - if (var12 >= 24) { // L: 2268 - throw new IOException(); - } - } catch (Exception var28) { - for (int var13 = 0; var13 < 24; ++var13) { // L: 2271 - var19[var13] = -1; - } + if (var40 != 69) { // L: 2443 + PcmPlayer.getLoginError(var40); // L: 2447 + return; // L: 2448 } - var18.writeBytes(var19, 0, var19.length); // L: 2276 - } - - if (!class65.field868.endsWith(";A")) { // L: 2278 - class65.field868 = class65.field868 + ";A"; // L: 2279 - } - - var40.packetBuffer.writeStringCp1252NullTerminated(class65.field868); // L: 2281 - var40.packetBuffer.writeInt(GrandExchangeOfferOwnWorldComparator.field483); // L: 2282 - Buffer var21 = new Buffer(class263.platformInfo.size()); // L: 2283 - class263.platformInfo.write(var21); // L: 2284 - var40.packetBuffer.writeBytes(var21.array, 0, var21.array.length); // L: 2285 - var40.packetBuffer.writeByte(clientType); // L: 2286 - var40.packetBuffer.writeInt(0); // L: 2287 - var40.packetBuffer.writeInt(Message.archive11.hash); // L: 2288 - var40.packetBuffer.method7721(ApproximateRouteStrategy.archive20.hash); // L: 2289 - var40.packetBuffer.writeIntME(class291.archive14.hash); // L: 2290 - var40.packetBuffer.writeInt(class145.archive8.hash); // L: 2291 - var40.packetBuffer.writeIntME(class10.archive2.hash); // L: 2292 - var40.packetBuffer.writeIntME(ObjectSound.archive19.hash); // L: 2293 - var40.packetBuffer.method7721(0); // L: 2294 - var40.packetBuffer.method7723(class182.archive4.hash); // L: 2295 - var40.packetBuffer.writeInt(WorldMapDecorationType.archive9.hash); // L: 2296 - var40.packetBuffer.writeIntME(JagexCache.archive10.hash); // L: 2297 - var40.packetBuffer.writeInt(class166.archive13.hash); // L: 2298 - var40.packetBuffer.method7721(WorldMapRectangle.archive18.hash); // L: 2299 - var40.packetBuffer.method7721(class28.archive15.hash); // L: 2300 - var40.packetBuffer.method7723(LoginScreenAnimation.archive7.hash); // L: 2301 - var40.packetBuffer.method7723(class16.archive6.hash); // L: 2302 - var40.packetBuffer.writeInt(Players.archive5.hash); // L: 2303 - var40.packetBuffer.method7721(BufferedNetSocket.archive3.hash); // L: 2304 - var40.packetBuffer.method7723(UserComparator8.archive1.hash); // L: 2305 - var40.packetBuffer.method7721(class54.archive17.hash); // L: 2306 - var40.packetBuffer.writeIntME(KeyHandler.archive0.hash); // L: 2307 - var40.packetBuffer.writeInt(class152.archive12.hash); // L: 2308 - var40.packetBuffer.xteaEncrypt(var36, var17, var40.packetBuffer.offset); // L: 2309 - var40.packetBuffer.writeLengthShort(var40.packetBuffer.offset - var7); // L: 2310 - packetWriter.addNode(var40); // L: 2311 - packetWriter.flush(); // L: 2312 - packetWriter.isaacCipher = new IsaacCipher(var36); // L: 2313 - int[] var46 = new int[4]; // L: 2314 - - for (var12 = 0; var12 < 4; ++var12) { // L: 2315 - var46[var12] = var36[var12] + 50; - } - - var2.newIsaacCipher(var46); // L: 2316 - ModeWhere.method6099(6); // L: 2317 - } - - if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 2319 2320 - var44 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2321 - if (var44 == 61) { // L: 2322 - var15 = ((AbstractSocket)var1).available(); // L: 2323 - field504 = var15 == 1 && ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2324 - ModeWhere.method6099(5); // L: 2325 - } - - if (var44 == 21 && gameState == 20) { // L: 2327 - ModeWhere.method6099(12); // L: 2328 - } else if (var44 == 2) { // L: 2330 - ModeWhere.method6099(14); // L: 2331 - } else if (var44 == 15 && gameState == 40) { // L: 2333 - packetWriter.serverPacketLength = -1; // L: 2334 - ModeWhere.method6099(19); // L: 2335 - } else if (var44 == 64) { // L: 2337 - ModeWhere.method6099(10); // L: 2338 - } else if (var44 == 23 && field661 < 1) { // L: 2340 - ++field661; // L: 2341 - ModeWhere.method6099(0); // L: 2342 - } else if (var44 == 29) { // L: 2344 - ModeWhere.method6099(17); // L: 2345 - } else { - if (var44 != 69) { // L: 2347 - ScriptFrame.getLoginError(var44); // L: 2351 - return; // L: 2352 - } - - ModeWhere.method6099(7); // L: 2348 + Canvas.method347(7); // L: 2444 } } - if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 2356 2357 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2358 - var2.offset = 0; // L: 2359 - VertexNormal.field2816 = var2.readUnsignedShort(); // L: 2360 - ModeWhere.method6099(8); // L: 2361 + if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 2452 2453 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2454 + var2.offset = 0; // L: 2455 + AttackOption.field1290 = var2.readUnsignedShort(); // L: 2456 + Canvas.method347(8); // L: 2457 } - if (loginState == 8 && ((AbstractSocket)var1).available() >= VertexNormal.field2816) { // L: 2364 2365 - var2.offset = 0; // L: 2366 - ((AbstractSocket)var1).read(var2.array, var2.offset, VertexNormal.field2816); // L: 2367 - class6[] var34 = new class6[]{class6.field14}; // L: 2370 - class6 var38 = var34[var2.readUnsignedByte()]; // L: 2372 + if (loginState == 8 && ((AbstractSocket)var1).available() >= AttackOption.field1290) { // L: 2460 2461 + var2.offset = 0; // L: 2462 + ((AbstractSocket)var1).read(var2.array, var2.offset, AttackOption.field1290); // L: 2463 + class6[] var31 = new class6[]{class6.field16}; // L: 2466 + class6 var30 = var31[var2.readUnsignedByte()]; // L: 2468 try { - switch(var38.field12) { // L: 2376 + switch(var30.field11) { // L: 2472 case 0: - class0 var5 = new class0(); // L: 2379 - this.field541 = new class7(var2, var5); // L: 2389 - ModeWhere.method6099(9); // L: 2390 + class0 var32 = new class0(); // L: 2479 + this.field592 = new class7(var2, var32); // L: 2485 + Canvas.method347(9); // L: 2486 break; default: - throw new IllegalArgumentException(); // L: 2384 + throw new IllegalArgumentException(); // L: 2475 } - } catch (Exception var25) { // L: 2392 - ScriptFrame.getLoginError(22); // L: 2393 - return; // L: 2394 + } catch (Exception var17) { // L: 2488 + PcmPlayer.getLoginError(22); // L: 2489 + return; // L: 2490 } } - if (loginState == 9 && this.field541.method43()) { // L: 2398 2399 - this.field496 = this.field541.method45(); // L: 2400 - this.field541.method47(); // L: 2401 - this.field541 = null; // L: 2402 - if (this.field496 == null) { // L: 2403 - ScriptFrame.getLoginError(22); // L: 2404 - return; // L: 2405 + if (loginState == 9 && this.field592.method49()) { // L: 2494 2495 + this.field529 = this.field592.method51(); // L: 2496 + this.field592.method50(); // L: 2497 + this.field592 = null; // L: 2498 + if (this.field529 == null) { // L: 2499 + PcmPlayer.getLoginError(22); // L: 2500 + return; // L: 2501 } - packetWriter.clearBuffer(); // L: 2407 - if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 2412 - var33 = new PacketBufferNode(); // L: 2413 - } else { - var33 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 2416 - } - - var33.clientPacket = null; // L: 2419 - var33.clientPacketLength = 0; // L: 2420 - var33.packetBuffer = new PacketBuffer(5000); // L: 2421 - var33.packetBuffer.writeByte(LoginPacket.field3134.id); // L: 2425 - var33.packetBuffer.writeShort(this.field496.offset); // L: 2426 - var33.packetBuffer.method7668(this.field496); // L: 2427 - packetWriter.addNode(var33); // L: 2428 - packetWriter.flush(); // L: 2429 - this.field496 = null; // L: 2430 - ModeWhere.method6099(6); // L: 2431 + packetWriter.clearBuffer(); // L: 2503 + var27 = class162.method3208(); // L: 2504 + var27.packetBuffer.writeByte(LoginPacket.field3195.id); // L: 2505 + var27.packetBuffer.writeShort(this.field529.offset); // L: 2506 + var27.packetBuffer.method7530(this.field529); // L: 2507 + packetWriter.addNode(var27); // L: 2508 + packetWriter.flush(); // L: 2509 + this.field529 = null; // L: 2510 + Canvas.method347(6); // L: 2511 } - if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 2434 2435 - class11.field54 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2436 - ModeWhere.method6099(11); // L: 2437 + if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 2514 2515 + class263.field3070 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2516 + Canvas.method347(11); // L: 2517 } - if (loginState == 11 && ((AbstractSocket)var1).available() >= class11.field54) { // L: 2440 2441 - ((AbstractSocket)var1).read(var2.array, 0, class11.field54); // L: 2442 - var2.offset = 0; // L: 2443 - ModeWhere.method6099(6); // L: 2444 + if (loginState == 11 && ((AbstractSocket)var1).available() >= class263.field3070) { // L: 2520 2521 + ((AbstractSocket)var1).read(var2.array, 0, class263.field3070); // L: 2522 + var2.offset = 0; // L: 2523 + Canvas.method347(6); // L: 2524 } - if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 2447 2448 - field530 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 2449 - ModeWhere.method6099(13); // L: 2450 + if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 2527 2528 + field654 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 2529 + Canvas.method347(13); // L: 2530 } - if (loginState == 13) { // L: 2453 - field528 = 0; // L: 2454 - class4.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field530 / 60 + " seconds."); // L: 2455 - if (--field530 <= 0) { // L: 2456 - ModeWhere.method6099(0); + if (loginState == 13) { // L: 2533 + field626 = 0; // L: 2534 + class345.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field654 / 60 + " seconds."); // L: 2535 + if (--field654 <= 0) { // L: 2536 + Canvas.method347(0); } } else { - if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2459 2460 - class391.field4372 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2461 - ModeWhere.method6099(15); // L: 2462 + if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2539 2540 + Varcs.field1329 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2541 + Canvas.method347(15); // L: 2542 } - if (loginState == 15 && ((AbstractSocket)var1).available() >= class391.field4372) { // L: 2465 2466 - var14 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2467 - ((AbstractSocket)var1).read(var2.array, 0, 4); // L: 2468 - var2.offset = 0; // L: 2469 - boolean var45 = false; // L: 2470 - if (var14) { // L: 2471 - var15 = var2.readByteIsaac() << 24; // L: 2472 - var15 |= var2.readByteIsaac() << 16; // L: 2473 - var15 |= var2.readByteIsaac() << 8; // L: 2474 - var15 |= var2.readByteIsaac(); // L: 2475 - String var42 = Login.Login_username; // L: 2477 - var7 = var42.length(); // L: 2479 - var17 = 0; // L: 2480 - var9 = 0; // L: 2481 - - while (true) { - if (var9 >= var7) { - if (class131.clientPreferences.parameters.size() >= 10 && !class131.clientPreferences.parameters.containsKey(var17)) { // L: 2485 2486 - Iterator var43 = class131.clientPreferences.parameters.entrySet().iterator(); // L: 2487 - var43.next(); // L: 2488 - var43.remove(); // L: 2489 - } - - class131.clientPreferences.parameters.put(var17, var15); // L: 2492 - break; - } - - var17 = (var17 << 5) - var17 + var42.charAt(var9); - ++var9; + int var14; + boolean var41; + if (loginState == 15 && ((AbstractSocket)var1).available() >= Varcs.field1329) { // L: 2545 2546 + var11 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2547 + ((AbstractSocket)var1).read(var2.array, 0, 4); // L: 2548 + var2.offset = 0; // L: 2549 + var41 = false; // L: 2550 + if (var11) { // L: 2551 + var12 = var2.readByteIsaac() << 24; // L: 2552 + var12 |= var2.readByteIsaac() << 16; // L: 2553 + var12 |= var2.readByteIsaac() << 8; // L: 2554 + var12 |= var2.readByteIsaac(); // L: 2555 + var14 = class239.method4810(Login.Login_username); // L: 2556 + if (class12.clientPreferences.parameters.size() >= 10 && !class12.clientPreferences.parameters.containsKey(var14)) { // L: 2557 2558 + Iterator var13 = class12.clientPreferences.parameters.entrySet().iterator(); // L: 2559 + var13.next(); // L: 2560 + var13.remove(); // L: 2561 } + + class12.clientPreferences.parameters.put(var14, var12); // L: 2564 } - if (Login_isUsernameRemembered) { // L: 2494 - class131.clientPreferences.method2286(Login.Login_username); // L: 2495 + if (Login_isUsernameRemembered) { // L: 2566 + class12.clientPreferences.method2297(Login.Login_username); // L: 2567 } else { - class131.clientPreferences.method2286((String)null); // L: 2498 + class12.clientPreferences.method2297((String)null); // L: 2570 } - GameEngine.savePreferences(); // L: 2500 - staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 2501 - playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2502 - localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 2503 - localPlayerIndex <<= 8; // L: 2504 - localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 2505 - field544 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2506 - ((AbstractSocket)var1).read(var2.array, 0, 8); // L: 2507 - var2.offset = 0; // L: 2508 - this.field542 = var2.readLong(); // L: 2509 - if (class391.field4372 >= 29) { // L: 2510 - ((AbstractSocket)var1).read(var2.array, 0, 8); // L: 2511 - var2.offset = 0; // L: 2512 - field623 = var2.readLong(); // L: 2513 + class270.savePreferences(); // L: 2572 + staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 2573 + playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2574 + localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 2575 + localPlayerIndex <<= 8; // L: 2576 + localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 2577 + field610 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2578 + ((AbstractSocket)var1).read(var2.array, 0, 8); // L: 2579 + var2.offset = 0; // L: 2580 + this.field531 = var2.readLong(); // L: 2581 + if (Varcs.field1329 >= 29) { // L: 2582 + ((AbstractSocket)var1).read(var2.array, 0, 8); // L: 2583 + var2.offset = 0; // L: 2584 + field611 = var2.readLong(); // L: 2585 } - ((AbstractSocket)var1).read(var2.array, 0, 1); // L: 2515 - var2.offset = 0; // L: 2516 - ServerPacket[] var37 = class82.ServerPacket_values(); // L: 2517 - int var23 = var2.readSmartByteShortIsaac(); // L: 2518 - if (var23 < 0 || var23 >= var37.length) { // L: 2519 - throw new IOException(var23 + " " + var2.offset); + ((AbstractSocket)var1).read(var2.array, 0, 1); // L: 2587 + var2.offset = 0; // L: 2588 + ServerPacket[] var34 = BuddyRankComparator.ServerPacket_values(); // L: 2589 + var6 = var2.readSmartByteShortIsaac(); // L: 2590 + if (var6 < 0 || var6 >= var34.length) { // L: 2591 + throw new IOException(var6 + " " + var2.offset); } - packetWriter.serverPacket = var37[var23]; // L: 2520 - packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2521 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2522 - var2.offset = 0; // L: 2523 - packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2524 + packetWriter.serverPacket = var34[var6]; // L: 2592 + packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2593 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2594 + var2.offset = 0; // L: 2595 + packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2596 try { - class27.method383(class127.client, "zap"); // L: 2526 - } catch (Throwable var24) { // L: 2528 + class27.method370(class82.client, "zap"); // L: 2598 + } catch (Throwable var16) { // L: 2600 } - ModeWhere.method6099(16); // L: 2529 + Canvas.method347(16); // L: 2601 } - if (loginState == 16) { // L: 2532 - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2533 - var2.offset = 0; // L: 2534 - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2535 - timer.method6564(); // L: 2536 - Renderable.method4925(); // L: 2537 - Fonts.updatePlayer(var2); // L: 2538 - ScriptEvent.field1042 = -1; // L: 2539 - StudioGame.loadRegions(false, var2); // L: 2540 - packetWriter.serverPacket = null; // L: 2541 + if (loginState == 16) { // L: 2604 + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2605 + var2.offset = 0; // L: 2606 + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2607 + timer.method6370(); // L: 2608 + mouseLastLastPressedTimeMillis = -1L; // L: 2611 + Varcs.mouseRecorder.index = 0; // L: 2612 + WorldMapArea.hasFocus = true; // L: 2613 + hadFocus = true; // L: 2614 + field722 = -1L; // L: 2615 + class33.reflectionChecks = new IterableNodeDeque(); // L: 2617 + packetWriter.clearBuffer(); // L: 2619 + packetWriter.packetBuffer.offset = 0; // L: 2620 + packetWriter.serverPacket = null; // L: 2621 + packetWriter.field1351 = null; // L: 2622 + packetWriter.field1340 = null; // L: 2623 + packetWriter.field1345 = null; // L: 2624 + packetWriter.serverPacketLength = 0; // L: 2625 + packetWriter.field1349 = 0; // L: 2626 + rebootTimer = 0; // L: 2627 + logoutTimer = 0; // L: 2628 + hintArrowType = 0; // L: 2629 + menuOptionsCount = 0; // L: 2631 + isMenuOpen = false; // L: 2632 + MouseHandler.MouseHandler_idleCycles = 0; // L: 2635 + class152.method3044(); // L: 2637 + isItemSelected = 0; // L: 2638 + isSpellSelected = false; // L: 2639 + soundEffectCount = 0; // L: 2640 + camAngleY = 0; // L: 2641 + oculusOrbState = 0; // L: 2642 + class127.field1570 = null; // L: 2643 + minimapState = 0; // L: 2644 + field515 = -1; // L: 2645 + destinationX = 0; // L: 2646 + destinationY = 0; // L: 2647 + playerAttackOption = AttackOption.AttackOption_hidden; // L: 2648 + npcAttackOption = AttackOption.AttackOption_hidden; // L: 2649 + npcCount = 0; // L: 2650 + Players.Players_count = 0; // L: 2652 + + for (var40 = 0; var40 < 2048; ++var40) { // L: 2653 + Players.field1307[var40] = null; // L: 2654 + Players.field1302[var40] = class193.field2251; // L: 2655 + } + + for (var40 = 0; var40 < 2048; ++var40) { // L: 2658 + players[var40] = null; + } + + for (var40 = 0; var40 < 32768; ++var40) { // L: 2659 + npcs[var40] = null; + } + + combatTargetPlayerIndex = -1; // L: 2660 + projectiles.clear(); // L: 2661 + graphicsObjects.clear(); // L: 2662 + + for (var40 = 0; var40 < 4; ++var40) { // L: 2663 + for (var12 = 0; var12 < 104; ++var12) { // L: 2664 + for (var14 = 0; var14 < 104; ++var14) { // L: 2665 + groundItems[var40][var12][var14] = null; // L: 2666 + } + } + } + + pendingSpawns = new NodeDeque(); // L: 2670 + BufferedSource.friendSystem.clear(); // L: 2671 + + for (var40 = 0; var40 < VarpDefinition.VarpDefinition_fileCount; ++var40) { // L: 2672 + VarpDefinition var35 = class21.VarpDefinition_get(var40); // L: 2673 + if (var35 != null) { // L: 2674 + Varps.Varps_temp[var40] = 0; // L: 2675 + Varps.Varps_main[var40] = 0; // L: 2676 + } + } + + class125.varcs.clearTransient(); // L: 2679 + followerIndex = -1; // L: 2680 + if (rootInterface != -1) { // L: 2681 + var40 = rootInterface; // L: 2682 + if (var40 != -1 && class120.Widget_loadedInterfaces[var40]) { // L: 2684 2685 + class134.Widget_archive.clearFilesGroup(var40); // L: 2686 + if (NetSocket.Widget_interfaceComponents[var40] != null) { // L: 2687 + var41 = true; // L: 2688 + + for (var14 = 0; var14 < NetSocket.Widget_interfaceComponents[var40].length; ++var14) { // L: 2689 + if (NetSocket.Widget_interfaceComponents[var40][var14] != null) { // L: 2690 + if (NetSocket.Widget_interfaceComponents[var40][var14].type != 2) { // L: 2691 + NetSocket.Widget_interfaceComponents[var40][var14] = null; + } else { + var41 = false; // L: 2692 + } + } + } + + if (var41) { // L: 2695 + NetSocket.Widget_interfaceComponents[var40] = null; + } + + class120.Widget_loadedInterfaces[var40] = false; // L: 2696 + } + } + } + + for (InterfaceParent var39 = (InterfaceParent)interfaceParents.first(); var39 != null; var39 = (InterfaceParent)interfaceParents.next()) { // L: 2699 + NetSocket.closeInterface(var39, true); // L: 2700 + } + + rootInterface = -1; // L: 2702 + interfaceParents = new NodeHashTable(8); // L: 2703 + meslayerContinueWidget = null; // L: 2704 + menuOptionsCount = 0; // L: 2706 + isMenuOpen = false; // L: 2707 + playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2709 + + for (var40 = 0; var40 < 8; ++var40) { // L: 2710 + playerMenuActions[var40] = null; // L: 2711 + playerOptionsPriorities[var40] = false; // L: 2712 + } + + ItemContainer.itemContainers = new NodeHashTable(32); // L: 2715 + isLoading = true; // L: 2717 + + for (var40 = 0; var40 < 100; ++var40) { // L: 2718 + field652[var40] = true; + } + + var27 = WallDecoration.getPacketBufferNode(ClientPacket.field3054, packetWriter.isaacCipher); // L: 2721 + var27.packetBuffer.writeByte(ClanChannelMember.getWindowedMode()); // L: 2722 + var27.packetBuffer.writeShort(GraphicsObject.canvasWidth); // L: 2723 + var27.packetBuffer.writeShort(class433.canvasHeight); // L: 2724 + packetWriter.addNode(var27); // L: 2725 + PcmPlayer.friendsChat = null; // L: 2727 + class358.guestClanSettings = null; // L: 2728 + Arrays.fill(currentClanSettings, (Object)null); // L: 2729 + UserComparator10.guestClanChannel = null; // L: 2730 + Arrays.fill(currentClanChannels, (Object)null); // L: 2731 + + for (var40 = 0; var40 < 8; ++var40) { // L: 2732 + grandExchangeOffers[var40] = new GrandExchangeOffer(); + } + + class120.grandExchangeEvents = null; // L: 2733 + Player.updatePlayer(var2); // L: 2735 + WorldMapSectionType.field2828 = -1; // L: 2736 + class144.loadRegions(false, var2); // L: 2737 + packetWriter.serverPacket = null; // L: 2738 } } else { - if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 2545 2546 - var2.offset = 0; // L: 2547 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2548 - var2.offset = 0; // L: 2549 - SceneTilePaint.field2826 = var2.readUnsignedShort(); // L: 2550 - ModeWhere.method6099(18); // L: 2551 + if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 2742 2743 + var2.offset = 0; // L: 2744 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2745 + var2.offset = 0; // L: 2746 + User.field4323 = var2.readUnsignedShort(); // L: 2747 + Canvas.method347(18); // L: 2748 } - if (loginState == 18 && ((AbstractSocket)var1).available() >= SceneTilePaint.field2826) { // L: 2554 2555 - var2.offset = 0; // L: 2556 - ((AbstractSocket)var1).read(var2.array, 0, SceneTilePaint.field2826); // L: 2557 - var2.offset = 0; // L: 2558 - String var35 = var2.readStringCp1252NullTerminated(); // L: 2559 - String var41 = var2.readStringCp1252NullTerminated(); // L: 2560 - String var39 = var2.readStringCp1252NullTerminated(); // L: 2561 - class4.setLoginResponseString(var35, var41, var39); // L: 2562 - Decimator.updateGameState(10); // L: 2563 + if (loginState == 18 && ((AbstractSocket)var1).available() >= User.field4323) { // L: 2751 2752 + var2.offset = 0; // L: 2753 + ((AbstractSocket)var1).read(var2.array, 0, User.field4323); // L: 2754 + var2.offset = 0; // L: 2755 + String var36 = var2.readStringCp1252NullTerminated(); // L: 2756 + String var33 = var2.readStringCp1252NullTerminated(); // L: 2757 + String var37 = var2.readStringCp1252NullTerminated(); // L: 2758 + class345.setLoginResponseString(var36, var33, var37); // L: 2759 + PendingSpawn.updateGameState(10); // L: 2760 + if (field517.method7790()) { // L: 2761 + class126.method2799(9); // L: 2762 + } } - if (loginState == 19) { // L: 2566 - if (packetWriter.serverPacketLength == -1) { // L: 2567 - if (((AbstractSocket)var1).available() < 2) { // L: 2568 + if (loginState != 19) { // L: 2766 + ++field626; // L: 2813 + if (field626 > 2000) { // L: 2814 + if (field514 < 1) { // L: 2815 + if (Tiles.worldPort == WorldMapRegion.currentPort) { // L: 2816 + WorldMapRegion.currentPort = GrandExchangeEvent.js5Port; + } else { + WorldMapRegion.currentPort = Tiles.worldPort; // L: 2817 + } + + ++field514; // L: 2818 + Canvas.method347(0); // L: 2819 + } else { + PcmPlayer.getLoginError(-3); // L: 2822 + } + } + } else { + if (packetWriter.serverPacketLength == -1) { // L: 2767 + if (((AbstractSocket)var1).available() < 2) { // L: 2768 return; } - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2569 - var2.offset = 0; // L: 2570 - packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2571 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2769 + var2.offset = 0; // L: 2770 + packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2771 } - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2573 - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2574 - var2.offset = 0; // L: 2575 - var44 = packetWriter.serverPacketLength; // L: 2576 - timer.method6566(); // L: 2577 - ReflectionCheck.method1080(); // L: 2578 - Fonts.updatePlayer(var2); // L: 2579 - if (var44 != var2.offset) { // L: 2580 - throw new RuntimeException(); // L: 2581 + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2773 + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2774 + var2.offset = 0; // L: 2775 + var40 = packetWriter.serverPacketLength; // L: 2776 + timer.method6372(); // L: 2777 + packetWriter.clearBuffer(); // L: 2779 + packetWriter.packetBuffer.offset = 0; // L: 2780 + packetWriter.serverPacket = null; // L: 2781 + packetWriter.field1351 = null; // L: 2782 + packetWriter.field1340 = null; // L: 2783 + packetWriter.field1345 = null; // L: 2784 + packetWriter.serverPacketLength = 0; // L: 2785 + packetWriter.field1349 = 0; // L: 2786 + rebootTimer = 0; // L: 2787 + HealthBar.method2336(); // L: 2788 + minimapState = 0; // L: 2789 + destinationX = 0; // L: 2790 + + for (var12 = 0; var12 < 2048; ++var12) { // L: 2791 + players[var12] = null; } - } - } else { - ++field528; // L: 2585 - if (field528 > 2000) { // L: 2586 - if (field661 < 1) { // L: 2587 - if (class329.currentPort == SecureRandomFuture.worldPort) { // L: 2588 - class329.currentPort = UserComparator9.js5Port; - } else { - class329.currentPort = SecureRandomFuture.worldPort; // L: 2589 - } - ++field661; // L: 2590 - ModeWhere.method6099(0); // L: 2591 - } else { - ScriptFrame.getLoginError(-3); // L: 2594 + ModelData0.localPlayer = null; // L: 2792 + + for (var12 = 0; var12 < npcs.length; ++var12) { // L: 2793 + NPC var38 = npcs[var12]; // L: 2794 + if (var38 != null) { // L: 2795 + var38.targetIndex = -1; // L: 2796 + var38.false0 = false; // L: 2797 + } + } + + ItemContainer.itemContainers = new NodeHashTable(32); // L: 2801 + PendingSpawn.updateGameState(30); // L: 2803 + + for (var12 = 0; var12 < 100; ++var12) { // L: 2804 + field652[var12] = true; + } + + class140.method2951(); // L: 2805 + Player.updatePlayer(var2); // L: 2807 + if (var40 != var2.offset) { // L: 2808 + throw new RuntimeException(); // L: 2809 } } } } } - } catch (IOException var29) { // L: 2598 - if (field661 < 1) { // L: 2599 - if (SecureRandomFuture.worldPort == class329.currentPort) { // L: 2600 - class329.currentPort = UserComparator9.js5Port; + } catch (IOException var22) { // L: 2826 + if (field514 < 1) { // L: 2827 + if (Tiles.worldPort == WorldMapRegion.currentPort) { // L: 2828 + WorldMapRegion.currentPort = GrandExchangeEvent.js5Port; } else { - class329.currentPort = SecureRandomFuture.worldPort; // L: 2601 + WorldMapRegion.currentPort = Tiles.worldPort; // L: 2829 } - ++field661; // L: 2602 - ModeWhere.method6099(0); // L: 2603 + ++field514; // L: 2830 + Canvas.method347(0); // L: 2831 } else { - ScriptFrame.getLoginError(-2); // L: 2606 + PcmPlayer.getLoginError(-2); // L: 2834 } } - } // L: 2457 2543 2583 2592 2595 2604 2607 2609 + } // L: 2537 2740 2811 2820 2823 2832 2835 2837 - @ObfuscatedName("fv") + @ObfuscatedName("fc") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "0" + garbageValue = "2" ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { - if (rebootTimer > 1) { // L: 2996 + if (rebootTimer > 1) { // L: 3073 --rebootTimer; } - if (logoutTimer > 0) { // L: 2997 + if (logoutTimer > 0) { // L: 3074 --logoutTimer; } - if (hadNetworkError) { // L: 2998 - hadNetworkError = false; // L: 2999 - ClanChannelMember.method2868(); // L: 3000 + if (hadNetworkError) { // L: 3075 + hadNetworkError = false; // L: 3076 + class129.method2812(); // L: 3077 } else { - if (!isMenuOpen) { // L: 3003 - ByteArrayPool.addCancelMenuEntry(); + if (!isMenuOpen) { // L: 3080 + class20.addCancelMenuEntry(); } int var1; - for (var1 = 0; var1 < 100 && this.method1158(packetWriter); ++var1) { // L: 3004 3005 + for (var1 = 0; var1 < 100 && this.method1254(packetWriter); ++var1) { // L: 3081 3082 } - if (gameState == 30) { // L: 3007 - int var2; - PacketBufferNode var14; - while (WorldMapID.method4360()) { // L: 3008 - var14 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2963, packetWriter.isaacCipher); // L: 3009 - var14.packetBuffer.writeByte(0); // L: 3010 - var2 = var14.packetBuffer.offset; // L: 3011 - class151.performReflectionCheck(var14.packetBuffer); // L: 3012 - var14.packetBuffer.method7774(var14.packetBuffer.offset - var2); // L: 3013 - packetWriter.addNode(var14); // L: 3014 - } - - if (timer.field4179) { // L: 3016 - var14 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2935, packetWriter.isaacCipher); // L: 3018 - var14.packetBuffer.writeByte(0); // L: 3019 - var2 = var14.packetBuffer.offset; // L: 3020 - timer.write(var14.packetBuffer); // L: 3021 - var14.packetBuffer.method7774(var14.packetBuffer.offset - var2); // L: 3022 - packetWriter.addNode(var14); // L: 3023 - timer.method6580(); // L: 3024 - } - - int var3; - int var4; - int var5; - int var6; - int var7; - int var10; - int var11; - synchronized(class120.mouseRecorder.lock) { // L: 3027 - if (!field490) { // L: 3028 - class120.mouseRecorder.index = 0; // L: 3114 - } else if (MouseHandler.MouseHandler_lastButton != 0 || class120.mouseRecorder.index >= 40) { // L: 3029 - PacketBufferNode var15 = null; // L: 3031 - var3 = 0; // L: 3032 - var4 = 0; // L: 3033 - var5 = 0; // L: 3034 - var6 = 0; // L: 3035 - - for (var7 = 0; var7 < class120.mouseRecorder.index && (var15 == null || var15.packetBuffer.offset - var3 < 246); ++var7) { // L: 3036 3037 - var4 = var7; // L: 3038 - int var8 = class120.mouseRecorder.ys[var7]; // L: 3039 - if (var8 < -1) { // L: 3040 - var8 = -1; - } else if (var8 > 65534) { // L: 3041 - var8 = 65534; - } - - int var9 = class120.mouseRecorder.xs[var7]; // L: 3042 - if (var9 < -1) { // L: 3043 - var9 = -1; - } else if (var9 > 65534) { // L: 3044 - var9 = 65534; - } - - if (var9 != field508 || var8 != field509) { // L: 3045 - if (var15 == null) { // L: 3048 - var15 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2965, packetWriter.isaacCipher); // L: 3049 - var15.packetBuffer.writeByte(0); // L: 3050 - var3 = var15.packetBuffer.offset; // L: 3051 - PacketBuffer var10000 = var15.packetBuffer; // L: 3052 - var10000.offset += 2; - var5 = 0; // L: 3053 - var6 = 0; // L: 3054 - } - - int var12; - if (field510 != -1L) { // L: 3059 - var10 = var9 - field508; // L: 3060 - var11 = var8 - field509; // L: 3061 - var12 = (int)((class120.mouseRecorder.millis[var7] - field510) / 20L); // L: 3062 - var5 = (int)((long)var5 + (class120.mouseRecorder.millis[var7] - field510) % 20L); // L: 3063 - } else { - var10 = var9; // L: 3066 - var11 = var8; // L: 3067 - var12 = Integer.MAX_VALUE; // L: 3068 - } - - field508 = var9; // L: 3070 - field509 = var8; // L: 3071 - if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 3072 - var10 += 32; // L: 3073 - var11 += 32; // L: 3074 - var15.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 3075 - } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 3077 - var10 += 128; // L: 3078 - var11 += 128; // L: 3079 - var15.packetBuffer.writeByte(var12 + 128); // L: 3080 - var15.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 3081 - } else if (var12 < 32) { // L: 3083 - var15.packetBuffer.writeByte(var12 + 192); // L: 3084 - if (var9 != -1 && var8 != -1) { // L: 3085 - var15.packetBuffer.writeInt(var9 | var8 << 16); // L: 3086 - } else { - var15.packetBuffer.writeInt(Integer.MIN_VALUE); - } - } else { - var15.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 3089 - if (var9 != -1 && var8 != -1) { // L: 3090 - var15.packetBuffer.writeInt(var9 | var8 << 16); // L: 3091 - } else { - var15.packetBuffer.writeInt(Integer.MIN_VALUE); - } - } - - ++var6; // L: 3093 - field510 = class120.mouseRecorder.millis[var7]; // L: 3094 - } - } - - if (var15 != null) { // L: 3096 - var15.packetBuffer.method7774(var15.packetBuffer.offset - var3); // L: 3097 - var7 = var15.packetBuffer.offset; // L: 3098 - var15.packetBuffer.offset = var3; // L: 3099 - var15.packetBuffer.writeByte(var5 / var6); // L: 3100 - var15.packetBuffer.writeByte(var5 % var6); // L: 3101 - var15.packetBuffer.offset = var7; // L: 3102 - packetWriter.addNode(var15); // L: 3103 - } - - if (var4 >= class120.mouseRecorder.index) { // L: 3105 - class120.mouseRecorder.index = 0; - } else { - MouseRecorder var41 = class120.mouseRecorder; // L: 3107 - var41.index -= var4; - System.arraycopy(class120.mouseRecorder.xs, var4, class120.mouseRecorder.xs, 0, class120.mouseRecorder.index); // L: 3108 - System.arraycopy(class120.mouseRecorder.ys, var4, class120.mouseRecorder.ys, 0, class120.mouseRecorder.index); // L: 3109 - System.arraycopy(class120.mouseRecorder.millis, var4, class120.mouseRecorder.millis, 0, class120.mouseRecorder.index); // L: 3110 - } - } - } - - PacketBufferNode var18; - if (MouseHandler.MouseHandler_lastButton == 1 || !GameBuild.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 3116 - long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 3117 - if (var16 > 32767L) { // L: 3118 - var16 = 32767L; - } - - mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 3119 - var3 = MouseHandler.MouseHandler_lastPressedY; // L: 3120 - if (var3 < 0) { // L: 3121 - var3 = 0; - } else if (var3 > class321.canvasHeight) { // L: 3122 - var3 = class321.canvasHeight; - } - - var4 = MouseHandler.MouseHandler_lastPressedX; // L: 3123 - if (var4 < 0) { // L: 3124 - var4 = 0; - } else if (var4 > InvDefinition.canvasWidth) { // L: 3125 - var4 = InvDefinition.canvasWidth; - } - - var5 = (int)var16; // L: 3126 - var18 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2976, packetWriter.isaacCipher); // L: 3127 - var18.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); // L: 3128 - var18.packetBuffer.writeShort(var4); // L: 3129 - var18.packetBuffer.writeShort(var3); // L: 3130 - packetWriter.addNode(var18); // L: 3131 - } - - if (KeyHandler.field118 > 0) { // L: 3133 - var14 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2899, packetWriter.isaacCipher); // L: 3134 - var14.packetBuffer.writeShort(0); // L: 3135 - var2 = var14.packetBuffer.offset; // L: 3136 - long var19 = class136.method2931(); // L: 3137 - - for (var5 = 0; var5 < KeyHandler.field118; ++var5) { // L: 3138 - long var21 = var19 - field585; // L: 3139 - if (var21 > 16777215L) { // L: 3140 - var21 = 16777215L; - } - - field585 = var19; // L: 3141 - var14.packetBuffer.writeByte(KeyHandler.field143[var5]); // L: 3142 - var14.packetBuffer.method7680((int)var21); // L: 3143 - } - - var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var2); // L: 3145 - packetWriter.addNode(var14); // L: 3146 - } - - if (field588 > 0) { // L: 3148 - --field588; - } - - if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3149 - field589 = true; - } - - if (field589 && field588 <= 0) { // L: 3150 - field588 = 20; // L: 3151 - field589 = false; // L: 3152 - var14 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2990, packetWriter.isaacCipher); // L: 3154 - var14.packetBuffer.method7711(camAngleY); // L: 3155 - var14.packetBuffer.writeShort(camAngleX); // L: 3156 - packetWriter.addNode(var14); // L: 3157 - } - - if (Varcs.hasFocus && !hadFocus) { // L: 3159 - hadFocus = true; // L: 3160 - var14 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2978, packetWriter.isaacCipher); // L: 3162 - var14.packetBuffer.writeByte(1); // L: 3163 - packetWriter.addNode(var14); // L: 3164 - } - - if (!Varcs.hasFocus && hadFocus) { // L: 3166 - hadFocus = false; // L: 3167 - var14 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2978, packetWriter.isaacCipher); // L: 3169 - var14.packetBuffer.writeByte(0); // L: 3170 - packetWriter.addNode(var14); // L: 3171 - } - - if (ScriptFrame.worldMap != null) { // L: 3174 - ScriptFrame.worldMap.method7215(); - } - - if (Interpreter.ClanChat_inClanChat) { // L: 3176 - if (ClientPacket.friendsChat != null) { // L: 3177 - ClientPacket.friendsChat.sort(); // L: 3178 - } - - ModeWhere.method6102(); // L: 3180 - Interpreter.ClanChat_inClanChat = false; // L: 3181 - } - - class19.method287(); // L: 3184 - if (field714 != class18.Client_plane) { // L: 3186 - field714 = class18.Client_plane; // L: 3187 - var1 = class18.Client_plane; // L: 3188 - int[] var33 = HealthBarUpdate.sceneMinimapSprite.pixels; // L: 3190 - var3 = var33.length; // L: 3191 - - for (var4 = 0; var4 < var3; ++var4) { // L: 3192 - var33[var4] = 0; - } - - for (var4 = 1; var4 < 103; ++var4) { // L: 3193 - var5 = (103 - var4) * 2048 + 24628; // L: 3194 - - for (var6 = 1; var6 < 103; ++var6) { // L: 3195 - if ((Tiles.Tiles_renderFlags[var1][var6][var4] & 24) == 0) { // L: 3196 - ArchiveLoader.scene.drawTileMinimap(var33, var5, 512, var1, var6, var4); - } - - if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var6][var4] & 8) != 0) { // L: 3197 - ArchiveLoader.scene.drawTileMinimap(var33, var5, 512, var1 + 1, var6, var4); - } - - var5 += 4; // L: 3198 - } - } - - var4 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); // L: 3201 - var5 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 3202 - HealthBarUpdate.sceneMinimapSprite.setRaster(); // L: 3203 - - for (var6 = 1; var6 < 103; ++var6) { // L: 3204 - for (var7 = 1; var7 < 103; ++var7) { // L: 3205 - if ((Tiles.Tiles_renderFlags[var1][var7][var6] & 24) == 0) { // L: 3206 - GrandExchangeOfferUnitPriceComparator.drawObject(var1, var7, var6, var4, var5); - } - - if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var7][var6] & 8) != 0) { // L: 3207 - GrandExchangeOfferUnitPriceComparator.drawObject(var1 + 1, var7, var6, var4, var5); - } - } - } - - mapIconCount = 0; // L: 3210 - - for (var6 = 0; var6 < 104; ++var6) { // L: 3211 - for (var7 = 0; var7 < 104; ++var7) { // L: 3212 - long var23 = ArchiveLoader.scene.getFloorDecorationTag(class18.Client_plane, var6, var7); // L: 3213 - if (0L != var23) { // L: 3214 - var10 = FileSystem.Entity_unpackID(var23); // L: 3215 - var11 = class146.getObjectDefinition(var10).mapIconId; // L: 3216 - if (var11 >= 0 && UserComparator7.WorldMapElement_get(var11).field1823) { // L: 3217 3218 - mapIcons[mapIconCount] = UserComparator7.WorldMapElement_get(var11).getSpriteBool(false); // L: 3221 - mapIconXs[mapIconCount] = var6; // L: 3222 - mapIconYs[mapIconCount] = var7; // L: 3223 - ++mapIconCount; // L: 3224 - } - } - } - } - - FontName.rasterProvider.apply(); // L: 3229 - } - - if (gameState == 30) { // L: 3233 - MenuAction.method1907(); // L: 3234 - class136.method2923(); // L: 3235 - ++packetWriter.field1322; // L: 3236 - if (packetWriter.field1322 > 750) { // L: 3237 - ClanChannelMember.method2868(); // L: 3238 + if (gameState == 30) { // L: 3084 + while (true) { + ReflectionCheck var2 = (ReflectionCheck)class33.reflectionChecks.last(); // L: 3088 + boolean var30; + if (var2 == null) { // L: 3089 + var30 = false; // L: 3090 } else { - class92.method2362(); // L: 3241 + var30 = true; // L: 3093 + } - for (var1 = 0; var1 < npcCount; ++var1) { // L: 3243 - var2 = npcIndices[var1]; // L: 3244 - NPC var25 = npcs[var2]; // L: 3245 - if (var25 != null) { // L: 3246 - class149.updateActorSequence(var25, var25.definition.size); // L: 3247 - } + int var3; + PacketBufferNode var31; + if (!var30) { // L: 3095 + PacketBufferNode var14; + int var15; + if (timer.field4235) { // L: 3103 + var14 = WallDecoration.getPacketBufferNode(ClientPacket.field3009, packetWriter.isaacCipher); // L: 3105 + var14.packetBuffer.writeByte(0); // L: 3106 + var15 = var14.packetBuffer.offset; // L: 3107 + timer.write(var14.packetBuffer); // L: 3108 + var14.packetBuffer.method7740(var14.packetBuffer.offset - var15); // L: 3109 + packetWriter.addNode(var14); // L: 3110 + timer.method6371(); // L: 3111 } - int[] var31 = Players.Players_indices; // L: 3252 + int var4; + int var5; + int var6; + int var7; + int var8; + int var9; + int var10; + int var11; + int var12; + PacketBuffer var10000; + synchronized(Varcs.mouseRecorder.lock) { // L: 3114 + if (!field659) { // L: 3115 + Varcs.mouseRecorder.index = 0; // L: 3201 + } else if (MouseHandler.MouseHandler_lastButton != 0 || Varcs.mouseRecorder.index >= 40) { // L: 3116 + var31 = null; // L: 3118 + var3 = 0; // L: 3119 + var4 = 0; // L: 3120 + var5 = 0; // L: 3121 + var6 = 0; // L: 3122 - for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 3253 - Player var35 = players[var31[var2]]; // L: 3254 - if (var35 != null && var35.overheadTextCyclesRemaining > 0) { // L: 3255 - --var35.overheadTextCyclesRemaining; // L: 3256 - if (var35.overheadTextCyclesRemaining == 0) { // L: 3257 - var35.overheadText = null; + for (var7 = 0; var7 < Varcs.mouseRecorder.index && (var31 == null || var31.packetBuffer.offset - var3 < 246); ++var7) { // L: 3123 3124 + var4 = var7; // L: 3125 + var8 = Varcs.mouseRecorder.ys[var7]; // L: 3126 + if (var8 < -1) { // L: 3127 + var8 = -1; + } else if (var8 > 65534) { // L: 3128 + var8 = 65534; + } + + var9 = Varcs.mouseRecorder.xs[var7]; // L: 3129 + if (var9 < -1) { // L: 3130 + var9 = -1; + } else if (var9 > 65534) { // L: 3131 + var9 = 65534; + } + + if (var9 != field492 || var8 != field681) { // L: 3132 + if (var31 == null) { // L: 3135 + var31 = WallDecoration.getPacketBufferNode(ClientPacket.field2952, packetWriter.isaacCipher); // L: 3136 + var31.packetBuffer.writeByte(0); // L: 3137 + var3 = var31.packetBuffer.offset; // L: 3138 + var10000 = var31.packetBuffer; // L: 3139 + var10000.offset += 2; + var5 = 0; // L: 3140 + var6 = 0; // L: 3141 + } + + if (-1L != field494) { // L: 3146 + var10 = var9 - field492; // L: 3147 + var11 = var8 - field681; // L: 3148 + var12 = (int)((Varcs.mouseRecorder.millis[var7] - field494) / 20L); // L: 3149 + var5 = (int)((long)var5 + (Varcs.mouseRecorder.millis[var7] - field494) % 20L); // L: 3150 + } else { + var10 = var9; // L: 3153 + var11 = var8; // L: 3154 + var12 = Integer.MAX_VALUE; // L: 3155 + } + + field492 = var9; // L: 3157 + field681 = var8; // L: 3158 + if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 3159 + var10 += 32; // L: 3160 + var11 += 32; // L: 3161 + var31.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 3162 + } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 3164 + var10 += 128; // L: 3165 + var11 += 128; // L: 3166 + var31.packetBuffer.writeByte(var12 + 128); // L: 3167 + var31.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 3168 + } else if (var12 < 32) { // L: 3170 + var31.packetBuffer.writeByte(var12 + 192); // L: 3171 + if (var9 != -1 && var8 != -1) { // L: 3172 + var31.packetBuffer.writeInt(var9 | var8 << 16); // L: 3173 + } else { + var31.packetBuffer.writeInt(Integer.MIN_VALUE); + } + } else { + var31.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 3176 + if (var9 != -1 && var8 != -1) { // L: 3177 + var31.packetBuffer.writeInt(var9 | var8 << 16); // L: 3178 + } else { + var31.packetBuffer.writeInt(Integer.MIN_VALUE); + } + } + + ++var6; // L: 3180 + field494 = Varcs.mouseRecorder.millis[var7]; // L: 3181 + } + } + + if (var31 != null) { // L: 3183 + var31.packetBuffer.method7740(var31.packetBuffer.offset - var3); // L: 3184 + var7 = var31.packetBuffer.offset; // L: 3185 + var31.packetBuffer.offset = var3; // L: 3186 + var31.packetBuffer.writeByte(var5 / var6); // L: 3187 + var31.packetBuffer.writeByte(var5 % var6); // L: 3188 + var31.packetBuffer.offset = var7; // L: 3189 + packetWriter.addNode(var31); // L: 3190 + } + + if (var4 >= Varcs.mouseRecorder.index) { // L: 3192 + Varcs.mouseRecorder.index = 0; + } else { + MouseRecorder var54 = Varcs.mouseRecorder; // L: 3194 + var54.index -= var4; + System.arraycopy(Varcs.mouseRecorder.xs, var4, Varcs.mouseRecorder.xs, 0, Varcs.mouseRecorder.index); // L: 3195 + System.arraycopy(Varcs.mouseRecorder.ys, var4, Varcs.mouseRecorder.ys, 0, Varcs.mouseRecorder.index); // L: 3196 + System.arraycopy(Varcs.mouseRecorder.millis, var4, Varcs.mouseRecorder.millis, 0, Varcs.mouseRecorder.index); // L: 3197 } } } - for (var2 = 0; var2 < npcCount; ++var2) { // L: 3260 - var3 = npcIndices[var2]; // L: 3261 - NPC var26 = npcs[var3]; // L: 3262 - if (var26 != null && var26.overheadTextCyclesRemaining > 0) { // L: 3263 - --var26.overheadTextCyclesRemaining; // L: 3264 - if (var26.overheadTextCyclesRemaining == 0) { // L: 3265 - var26.overheadText = null; + PacketBufferNode var18; + if (MouseHandler.MouseHandler_lastButton == 1 || !Login.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 3203 + long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 3204 + if (var16 > 32767L) { // L: 3205 + var16 = 32767L; + } + + mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 3206 + var3 = MouseHandler.MouseHandler_lastPressedY; // L: 3207 + if (var3 < 0) { // L: 3208 + var3 = 0; + } else if (var3 > class433.canvasHeight) { // L: 3209 + var3 = class433.canvasHeight; + } + + var4 = MouseHandler.MouseHandler_lastPressedX; // L: 3210 + if (var4 < 0) { // L: 3211 + var4 = 0; + } else if (var4 > GraphicsObject.canvasWidth) { // L: 3212 + var4 = GraphicsObject.canvasWidth; + } + + var5 = (int)var16; // L: 3213 + var18 = WallDecoration.getPacketBufferNode(ClientPacket.field3051, packetWriter.isaacCipher); // L: 3214 + var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); // L: 3215 + var18.packetBuffer.writeShort(var4); // L: 3216 + var18.packetBuffer.writeShort(var3); // L: 3217 + packetWriter.addNode(var18); // L: 3218 + } + + if (KeyHandler.field139 > 0) { // L: 3220 + var14 = WallDecoration.getPacketBufferNode(ClientPacket.field2949, packetWriter.isaacCipher); // L: 3221 + var14.packetBuffer.writeShort(0); // L: 3222 + var15 = var14.packetBuffer.offset; // L: 3223 + long var19 = class113.method2624(); // L: 3224 + + for (var5 = 0; var5 < KeyHandler.field139; ++var5) { // L: 3225 + long var21 = var19 - field722; // L: 3226 + if (var21 > 16777215L) { // L: 3227 + var21 = 16777215L; + } + + field722 = var19; // L: 3228 + var14.packetBuffer.method7559((int)var21); // L: 3229 + var14.packetBuffer.writeByte(KeyHandler.field138[var5]); // L: 3230 + } + + var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var15); // L: 3232 + packetWriter.addNode(var14); // L: 3233 + } + + if (field576 > 0) { // L: 3235 + --field576; + } + + if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3236 + field557 = true; + } + + if (field557 && field576 <= 0) { // L: 3237 + field576 = 20; // L: 3238 + field557 = false; // L: 3239 + var14 = WallDecoration.getPacketBufferNode(ClientPacket.field3035, packetWriter.isaacCipher); // L: 3241 + var14.packetBuffer.writeShort(camAngleY); // L: 3242 + var14.packetBuffer.writeShort(camAngleX); // L: 3243 + packetWriter.addNode(var14); // L: 3244 + } + + if (WorldMapArea.hasFocus && !hadFocus) { // L: 3246 + hadFocus = true; // L: 3247 + var14 = WallDecoration.getPacketBufferNode(ClientPacket.field3038, packetWriter.isaacCipher); // L: 3249 + var14.packetBuffer.writeByte(1); // L: 3250 + packetWriter.addNode(var14); // L: 3251 + } + + if (!WorldMapArea.hasFocus && hadFocus) { // L: 3253 + hadFocus = false; // L: 3254 + var14 = WallDecoration.getPacketBufferNode(ClientPacket.field3038, packetWriter.isaacCipher); // L: 3256 + var14.packetBuffer.writeByte(0); // L: 3257 + packetWriter.addNode(var14); // L: 3258 + } + + if (ServerPacket.worldMap != null) { // L: 3261 + ServerPacket.worldMap.method7023(); + } + + WorldMapSection1.method4839(); // L: 3262 + HealthBar.method2334(); // L: 3263 + if (field515 != class128.Client_plane) { // L: 3265 + field515 = class128.Client_plane; // L: 3266 + GraphicsDefaults.method6732(class128.Client_plane); // L: 3267 + } + + if (gameState != 30) { // L: 3270 + return; + } + + Tiles.method2031(); // L: 3271 + + int var10002; + for (var1 = 0; var1 < soundEffectCount; ++var1) { // L: 3273 + var10002 = queuedSoundEffectDelays[var1]--; // L: 3274 + if (queuedSoundEffectDelays[var1] >= -10) { // L: 3275 + SoundEffect var32 = soundEffects[var1]; // L: 3287 + if (var32 == null) { // L: 3288 + var10000 = null; // L: 3289 + var32 = SoundEffect.readSoundEffect(MouseHandler.archive4, soundEffectIds[var1], 0); + if (var32 == null) { // L: 3290 + continue; + } + + int[] var55 = queuedSoundEffectDelays; // L: 3291 + var55[var1] += var32.calculateDelay(); + soundEffects[var1] = var32; // L: 3292 + } + + if (queuedSoundEffectDelays[var1] < 0) { // L: 3298 + if (soundLocations[var1] != 0) { // L: 3300 + var4 = (soundLocations[var1] & 255) * 128; // L: 3301 + var5 = soundLocations[var1] >> 16 & 255; // L: 3302 + var6 = var5 * 128 + 64 - ModelData0.localPlayer.x; // L: 3303 + if (var6 < 0) { // L: 3304 + var6 = -var6; + } + + var7 = soundLocations[var1] >> 8 & 255; // L: 3305 + var8 = var7 * 128 + 64 - ModelData0.localPlayer.y; // L: 3306 + if (var8 < 0) { // L: 3307 + var8 = -var8; + } + + var9 = var6 + var8 - 128; // L: 3308 + if (var9 > var4) { // L: 3309 + queuedSoundEffectDelays[var1] = -100; // L: 3310 + continue; // L: 3311 + } + + if (var9 < 0) { // L: 3313 + var9 = 0; + } + + var3 = (var4 - var9) * class12.clientPreferences.method2239() / var4; // L: 3314 + } else { + var3 = class12.clientPreferences.method2244(); // L: 3316 + } + + if (var3 > 0) { // L: 3317 + RawSound var23 = var32.toRawSound().resample(class403.decimator); // L: 3318 + RawPcmStream var24 = RawPcmStream.createRawPcmStream(var23, 100, var3); // L: 3319 + var24.setNumLoops(queuedSoundEffectLoops[var1] - 1); // L: 3320 + class122.pcmStreamMixer.addSubStream(var24); // L: 3321 + } + + queuedSoundEffectDelays[var1] = -100; // L: 3323 + } + } else { + --soundEffectCount; // L: 3276 + + for (var15 = var1; var15 < soundEffectCount; ++var15) { // L: 3277 + soundEffectIds[var15] = soundEffectIds[var15 + 1]; // L: 3278 + soundEffects[var15] = soundEffects[var15 + 1]; // L: 3279 + queuedSoundEffectLoops[var15] = queuedSoundEffectLoops[var15 + 1]; // L: 3280 + queuedSoundEffectDelays[var15] = queuedSoundEffectDelays[var15 + 1]; // L: 3281 + soundLocations[var15] = soundLocations[var15 + 1]; // L: 3282 + } + + --var1; // L: 3284 + } + } + + if (playingJingle && !Coord.method5370()) { // L: 3326 + if (class12.clientPreferences.method2248() != 0 && currentTrackGroupId != -1) { // L: 3327 + UserComparator8.method2574(AbstractUserComparator.archive6, currentTrackGroupId, 0, class12.clientPreferences.method2248(), false); + } + + playingJingle = false; // L: 3328 + } + + ++packetWriter.field1349; // L: 3331 + if (packetWriter.field1349 > 750) { // L: 3332 + class129.method2812(); // L: 3333 + return; // L: 3334 + } + + var1 = Players.Players_count; // L: 3337 + int[] var33 = Players.Players_indices; // L: 3338 + + for (var3 = 0; var3 < var1; ++var3) { // L: 3339 + Player var45 = players[var33[var3]]; // L: 3340 + if (var45 != null) { // L: 3341 + class301.updateActorSequence(var45, 1); // L: 3342 + } + } + + for (var1 = 0; var1 < npcCount; ++var1) { // L: 3347 + var15 = npcIndices[var1]; // L: 3348 + NPC var25 = npcs[var15]; // L: 3349 + if (var25 != null) { // L: 3350 + class301.updateActorSequence(var25, var25.definition.size); // L: 3351 + } + } + + int[] var40 = Players.Players_indices; // L: 3356 + + for (var15 = 0; var15 < Players.Players_count; ++var15) { // L: 3357 + Player var51 = players[var40[var15]]; // L: 3358 + if (var51 != null && var51.overheadTextCyclesRemaining > 0) { // L: 3359 + --var51.overheadTextCyclesRemaining; // L: 3360 + if (var51.overheadTextCyclesRemaining == 0) { // L: 3361 + var51.overheadText = null; } } } - ++field556; // L: 3269 - if (mouseCrossColor != 0) { // L: 3270 - mouseCrossState += 20; // L: 3271 - if (mouseCrossState >= 400) { // L: 3272 + for (var15 = 0; var15 < npcCount; ++var15) { // L: 3364 + var3 = npcIndices[var15]; // L: 3365 + NPC var46 = npcs[var3]; // L: 3366 + if (var46 != null && var46.overheadTextCyclesRemaining > 0) { // L: 3367 + --var46.overheadTextCyclesRemaining; // L: 3368 + if (var46.overheadTextCyclesRemaining == 0) { // L: 3369 + var46.overheadText = null; + } + } + } + + ++field727; // L: 3373 + if (mouseCrossColor != 0) { // L: 3374 + mouseCrossState += 20; // L: 3375 + if (mouseCrossState >= 400) { // L: 3376 mouseCrossColor = 0; } } - if (GrandExchangeOfferAgeComparator.field4011 != null) { // L: 3274 - ++field610; // L: 3275 - if (field610 >= 15) { // L: 3276 - class346.invalidateWidget(GrandExchangeOfferAgeComparator.field4011); // L: 3277 - GrandExchangeOfferAgeComparator.field4011 = null; // L: 3278 + if (NPCComposition.field1991 != null) { // L: 3378 + ++field598; // L: 3379 + if (field598 >= 15) { // L: 3380 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(NPCComposition.field1991); // L: 3381 + NPCComposition.field1991 = null; // L: 3382 } } - Widget var32 = DevicePcmPlayerProvider.mousedOverWidgetIf1; // L: 3281 - Widget var34 = GrandExchangeOfferOwnWorldComparator.field486; // L: 3282 - DevicePcmPlayerProvider.mousedOverWidgetIf1 = null; // L: 3283 - GrandExchangeOfferOwnWorldComparator.field486 = null; // L: 3284 - draggedOnWidget = null; // L: 3285 - field687 = false; // L: 3286 - field696 = false; // L: 3287 - field731 = 0; // L: 3288 + Widget var41 = class144.mousedOverWidgetIf1; // L: 3385 + Widget var34 = class113.field1422; // L: 3386 + class144.mousedOverWidgetIf1 = null; // L: 3387 + class113.field1422 = null; // L: 3388 + draggedOnWidget = null; // L: 3389 + field675 = false; // L: 3390 + field574 = false; // L: 3391 + field719 = 0; // L: 3392 - while (SecureRandomCallable.isKeyDown() && field731 < 128) { // L: 3289 - if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && GameEngine.field218 == 66) { // L: 3290 - String var36 = TextureProvider.method4950(); // L: 3291 - class127.client.method452(var36); // L: 3292 - } else if (oculusOrbState != 1 || ItemComposition.field2121 <= 0) { // L: 3295 - field733[field731] = GameEngine.field218; // L: 3298 - field732[field731] = ItemComposition.field2121; // L: 3299 - ++field731; // L: 3300 - } - } + while (TaskHandler.isKeyDown() && field719 < 128) { // L: 3393 + if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && class12.field61 == 66) { // L: 3394 + StringBuilder var47 = new StringBuilder(); // L: 3397 - if (class113.method2651() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 3302 - var3 = GrandExchangeEvents.localPlayer.plane - mouseWheelRotation; // L: 3303 - if (var3 < 0) { // L: 3304 - var3 = 0; - } else if (var3 > 3) { // L: 3305 - var3 = 3; - } - - if (var3 != GrandExchangeEvents.localPlayer.plane) { // L: 3306 - StructComposition.method3619(GrandExchangeEvents.localPlayer.pathX[0] + GrandExchangeOfferOwnWorldComparator.baseX, GrandExchangeEvents.localPlayer.pathY[0] + VarcInt.baseY, var3, false); // L: 3307 - } - - mouseWheelRotation = 0; // L: 3309 - } - - if (rootInterface != -1) { // L: 3311 - Language.updateRootInterface(rootInterface, 0, 0, InvDefinition.canvasWidth, class321.canvasHeight, 0, 0); - } - - ++cycleCntr; // L: 3312 - - while (true) { - Widget var27; - ScriptEvent var37; - Widget var38; - do { - var37 = (ScriptEvent)field710.removeLast(); // L: 3314 - if (var37 == null) { // L: 3315 - while (true) { - do { - var37 = (ScriptEvent)field711.removeLast(); // L: 3326 - if (var37 == null) { // L: 3327 - while (true) { - do { - var37 = (ScriptEvent)scriptEvents.removeLast(); // L: 3338 - if (var37 == null) { // L: 3339 - this.menu(); // L: 3349 - if (ScriptFrame.worldMap != null) { // L: 3351 - ScriptFrame.worldMap.method7327(class18.Client_plane, (GrandExchangeEvents.localPlayer.x >> 7) + GrandExchangeOfferOwnWorldComparator.baseX, (GrandExchangeEvents.localPlayer.y >> 7) + VarcInt.baseY, false); // L: 3352 - ScriptFrame.worldMap.loadCache(); // L: 3353 - } - - if (clickedWidget != null) { // L: 3356 - this.method1164(); - } - - PacketBufferNode var40; - if (class142.dragInventoryWidget != null) { // L: 3357 - class346.invalidateWidget(class142.dragInventoryWidget); // L: 3358 - ++itemDragDuration; // L: 3359 - if (MouseHandler.MouseHandler_currentButton == 0) { // L: 3360 - if (field767) { // L: 3361 - if (class142.dragInventoryWidget == GrandExchangeEvent.hoveredItemContainer && dragItemSlotSource != dragItemSlotDestination) { // L: 3362 - Widget var39 = class142.dragInventoryWidget; // L: 3363 - byte var30 = 0; // L: 3364 - if (field524 == 1 && var39.contentType == 206) { // L: 3365 - var30 = 1; - } - - if (var39.itemIds[dragItemSlotDestination] <= 0) { // L: 3366 - var30 = 0; - } - - if (ReflectionCheck.method1079(class326.getWidgetFlags(var39))) { // L: 3367 - var5 = dragItemSlotSource; // L: 3368 - var6 = dragItemSlotDestination; // L: 3369 - var39.itemIds[var6] = var39.itemIds[var5]; // L: 3370 - var39.itemQuantities[var6] = var39.itemQuantities[var5]; // L: 3371 - var39.itemIds[var5] = -1; // L: 3372 - var39.itemQuantities[var5] = 0; // L: 3373 - } else if (var30 == 1) { // L: 3375 - var5 = dragItemSlotSource; // L: 3376 - var6 = dragItemSlotDestination; // L: 3377 - - while (var6 != var5) { // L: 3378 - if (var5 > var6) { // L: 3379 - var39.swapItems(var5 - 1, var5); // L: 3380 - --var5; // L: 3381 - } else if (var5 < var6) { // L: 3383 - var39.swapItems(var5 + 1, var5); // L: 3384 - ++var5; // L: 3385 - } - } - } else { - var39.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 3390 - } - - var40 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2996, packetWriter.isaacCipher); // L: 3393 - var40.packetBuffer.method7712(dragItemSlotDestination); // L: 3394 - var40.packetBuffer.method7710(dragItemSlotSource); // L: 3395 - var40.packetBuffer.method7721(class142.dragInventoryWidget.id); // L: 3396 - var40.packetBuffer.method7804(var30); // L: 3397 - packetWriter.addNode(var40); // L: 3398 - } - } else if (this.shouldLeftClickOpenMenu()) { // L: 3402 - this.openMenu(draggedWidgetX, draggedWidgetY); // L: 3403 - } else if (menuOptionsCount > 0) { // L: 3405 - UrlRequest.method2551(draggedWidgetX, draggedWidgetY); // L: 3406 - } - - field610 = 10; // L: 3409 - MouseHandler.MouseHandler_lastButton = 0; // L: 3410 - class142.dragInventoryWidget = null; // L: 3411 - } 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: 3414 3415 - field767 = true; // L: 3416 - } - } - - if (Scene.shouldSendWalk()) { // L: 3421 - var3 = Scene.Scene_selectedX; // L: 3422 - var4 = Scene.Scene_selectedY; // L: 3423 - var40 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2911, packetWriter.isaacCipher); // L: 3425 - var40.packetBuffer.writeByte(5); // L: 3426 - var40.packetBuffer.method7710(var3 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 3427 - var40.packetBuffer.writeShort(var4 + VarcInt.baseY); // L: 3428 - var40.packetBuffer.method7703(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3429 - packetWriter.addNode(var40); // L: 3430 - Scene.method4771(); // L: 3431 - mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 3432 - mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 3433 - mouseCrossColor = 1; // L: 3434 - mouseCrossState = 0; // L: 3435 - destinationX = var3; // L: 3436 - destinationY = var4; // L: 3437 - } - - if (var32 != DevicePcmPlayerProvider.mousedOverWidgetIf1) { // L: 3439 - if (var32 != null) { // L: 3440 - class346.invalidateWidget(var32); - } - - if (DevicePcmPlayerProvider.mousedOverWidgetIf1 != null) { // L: 3441 - class346.invalidateWidget(DevicePcmPlayerProvider.mousedOverWidgetIf1); - } - } - - if (var34 != GrandExchangeOfferOwnWorldComparator.field486 && field657 == field656) { // L: 3443 - if (var34 != null) { // L: 3444 - class346.invalidateWidget(var34); - } - - if (GrandExchangeOfferOwnWorldComparator.field486 != null) { // L: 3445 - class346.invalidateWidget(GrandExchangeOfferOwnWorldComparator.field486); - } - } - - if (GrandExchangeOfferOwnWorldComparator.field486 != null) { // L: 3447 - if (field656 < field657) { // L: 3448 - ++field656; // L: 3449 - if (field656 == field657) { // L: 3450 - class346.invalidateWidget(GrandExchangeOfferOwnWorldComparator.field486); - } - } - } else if (field656 > 0) { // L: 3453 - --field656; - } - - class135.method2920(); // L: 3454 - if (field754) { // L: 3455 - SpotAnimationDefinition.method3545(); - } else if (isCameraLocked) { // L: 3456 - GrandExchangeOfferOwnWorldComparator.method1128(); - } - - for (var3 = 0; var3 < 5; ++var3) { // L: 3457 - int var10002 = field600[var3]++; - } - - class160.varcs.tryWrite(); // L: 3458 - var3 = World.method1677(); // L: 3459 - var4 = KeyHandler.KeyHandler_idleCycles; // L: 3462 - if (var3 > 15000 && var4 > 15000) { // L: 3465 - logoutTimer = 250; // L: 3466 - ClientPacket.method5176(14500); // L: 3467 - var18 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2979, packetWriter.isaacCipher); // L: 3469 - packetWriter.addNode(var18); // L: 3470 - } - - Decimator.friendSystem.processFriendUpdates(); // L: 3472 - ++packetWriter.pendingWrites; // L: 3473 - if (packetWriter.pendingWrites > 50) { // L: 3474 - var18 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2950, packetWriter.isaacCipher); // L: 3476 - packetWriter.addNode(var18); // L: 3477 - } - - try { - packetWriter.flush(); // L: 3480 - } catch (IOException var28) { // L: 3482 - ClanChannelMember.method2868(); // L: 3483 - } - - return; // L: 3485 - } - - var38 = var37.widget; // L: 3340 - if (var38.childIndex < 0) { // L: 3341 - break; - } - - var27 = class127.getWidget(var38.parentId); // L: 3342 - } while(var27 == null || var27.children == null || var38.childIndex >= var27.children.length || var38 != var27.children[var38.childIndex]); // L: 3343 - - ClanSettings.runScriptEvent(var37); // L: 3347 - } - } - - var38 = var37.widget; // L: 3328 - if (var38.childIndex < 0) { // L: 3329 - break; - } - - var27 = class127.getWidget(var38.parentId); // L: 3330 - } while(var27 == null || var27.children == null || var38.childIndex >= var27.children.length || var38 != var27.children[var38.childIndex]); // L: 3331 - - ClanSettings.runScriptEvent(var37); // L: 3335 + Message var42; + for (Iterator var48 = Messages.Messages_hashTable.iterator(); var48.hasNext(); var47.append(var42.text).append('\n')) { // L: 3398 3404 + var42 = (Message)var48.next(); // L: 3399 + if (var42.sender != null && !var42.sender.isEmpty()) { // L: 3401 + var47.append(var42.sender).append(':'); // L: 3402 } } - var38 = var37.widget; // L: 3316 - if (var38.childIndex < 0) { // L: 3317 + String var53 = var47.toString(); // L: 3407 + class82.client.method429(var53); // L: 3410 + } else if (oculusOrbState != 1 || InvDefinition.field1850 <= 0) { // L: 3413 + field721[field719] = class12.field61; // L: 3416 + field720[field719] = InvDefinition.field1850; // L: 3417 + ++field719; // L: 3418 + } + } + + boolean var35 = staffModLevel >= 2; // L: 3422 + if (var35 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 3424 + var4 = ModelData0.localPlayer.plane - mouseWheelRotation; // L: 3425 + if (var4 < 0) { // L: 3426 + var4 = 0; + } else if (var4 > 3) { // L: 3427 + var4 = 3; + } + + if (var4 != ModelData0.localPlayer.plane) { // L: 3428 + class123.method2781(ModelData0.localPlayer.pathX[0] + SecureRandomCallable.baseX, ModelData0.localPlayer.pathY[0] + GrandExchangeOfferOwnWorldComparator.baseY, var4, false); // L: 3429 + } + + mouseWheelRotation = 0; // L: 3431 + } + + if (rootInterface != -1) { // L: 3433 + class4.updateRootInterface(rootInterface, 0, 0, GraphicsObject.canvasWidth, class433.canvasHeight, 0, 0); + } + + ++cycleCntr; // L: 3434 + + while (true) { + Widget var43; + ScriptEvent var49; + Widget var50; + do { + var49 = (ScriptEvent)field698.removeLast(); // L: 3436 + if (var49 == null) { // L: 3437 + while (true) { + do { + var49 = (ScriptEvent)field701.removeLast(); // L: 3448 + if (var49 == null) { // L: 3449 + while (true) { + do { + var49 = (ScriptEvent)scriptEvents.removeLast(); // L: 3460 + if (var49 == null) { // L: 3461 + this.menu(); // L: 3471 + if (ServerPacket.worldMap != null) { // L: 3473 + ServerPacket.worldMap.method7033(class128.Client_plane, (ModelData0.localPlayer.x >> 7) + SecureRandomCallable.baseX, (ModelData0.localPlayer.y >> 7) + GrandExchangeOfferOwnWorldComparator.baseY, false); // L: 3474 + ServerPacket.worldMap.loadCache(); // L: 3475 + } + + if (clickedWidget != null) { // L: 3478 + this.method1150(); + } + + if (Canvas.dragInventoryWidget != null) { // L: 3479 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(Canvas.dragInventoryWidget); // L: 3480 + ++itemDragDuration; // L: 3481 + if (MouseHandler.MouseHandler_currentButton == 0) { // L: 3482 + if (field604) { // L: 3483 + if (Canvas.dragInventoryWidget == class155.hoveredItemContainer && dragItemSlotSource != dragItemSlotDestination) { // L: 3484 + Widget var52 = Canvas.dragInventoryWidget; // L: 3485 + byte var36 = 0; // L: 3486 + if (field480 == 1 && var52.contentType == 206) { // L: 3487 + var36 = 1; + } + + if (var52.itemIds[dragItemSlotDestination] <= 0) { // L: 3488 + var36 = 0; + } + + var7 = UrlRequester.getWidgetFlags(var52); // L: 3490 + boolean var37 = (var7 >> 29 & 1) != 0; // L: 3492 + if (var37) { // L: 3494 + var8 = dragItemSlotSource; // L: 3495 + var9 = dragItemSlotDestination; // L: 3496 + var52.itemIds[var9] = var52.itemIds[var8]; // L: 3497 + var52.itemQuantities[var9] = var52.itemQuantities[var8]; // L: 3498 + var52.itemIds[var8] = -1; // L: 3499 + var52.itemQuantities[var8] = 0; // L: 3500 + } else if (var36 == 1) { // L: 3502 + var8 = dragItemSlotSource; // L: 3503 + var9 = dragItemSlotDestination; // L: 3504 + + while (var8 != var9) { // L: 3505 + if (var8 > var9) { // L: 3506 + var52.swapItems(var8 - 1, var8); // L: 3507 + --var8; // L: 3508 + } else if (var8 < var9) { // L: 3510 + var52.swapItems(var8 + 1, var8); // L: 3511 + ++var8; // L: 3512 + } + } + } else { + var52.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 3517 + } + + PacketBufferNode var26 = WallDecoration.getPacketBufferNode(ClientPacket.field3042, packetWriter.isaacCipher); // L: 3520 + var26.packetBuffer.writeShort(dragItemSlotSource); // L: 3521 + var26.packetBuffer.writeShort(dragItemSlotDestination); // L: 3522 + var26.packetBuffer.writeByte(var36); // L: 3523 + var26.packetBuffer.writeInt(Canvas.dragInventoryWidget.id); // L: 3524 + packetWriter.addNode(var26); // L: 3525 + } + } else if (this.shouldLeftClickOpenMenu()) { // L: 3529 + this.openMenu(draggedWidgetX, draggedWidgetY); // L: 3530 + } else if (menuOptionsCount > 0) { // L: 3532 + var4 = draggedWidgetX; // L: 3533 + var5 = draggedWidgetY; // L: 3534 + MenuAction var44 = class116.tempMenuAction; // L: 3536 + if (var44 != null) { // L: 3538 + ModeWhere.menuAction(var44.param0, var44.param1, var44.opcode, var44.identifier, var44.action, var44.action, var4, var5); // L: 3539 + } + + class116.tempMenuAction = null; // L: 3542 + } + + field598 = 10; // L: 3546 + MouseHandler.MouseHandler_lastButton = 0; // L: 3547 + Canvas.dragInventoryWidget = null; // L: 3548 + } 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: 3551 3552 + field604 = true; // L: 3553 + } + } + + if (Scene.shouldSendWalk()) { // L: 3558 + var4 = Scene.Scene_selectedX; // L: 3559 + var5 = Scene.Scene_selectedY; // L: 3560 + var18 = WallDecoration.getPacketBufferNode(ClientPacket.field2957, packetWriter.isaacCipher); // L: 3562 + var18.packetBuffer.writeByte(5); // L: 3563 + var18.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3564 + var18.packetBuffer.method7641(var5 + GrandExchangeOfferOwnWorldComparator.baseY); // L: 3565 + var18.packetBuffer.writeShort(var4 + SecureRandomCallable.baseX); // L: 3566 + packetWriter.addNode(var18); // L: 3567 + Scene.method4066(); // L: 3568 + mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 3569 + mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 3570 + mouseCrossColor = 1; // L: 3571 + mouseCrossState = 0; // L: 3572 + destinationX = var4; // L: 3573 + destinationY = var5; // L: 3574 + } + + if (var41 != class144.mousedOverWidgetIf1) { // L: 3576 + if (var41 != null) { // L: 3577 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var41); + } + + if (class144.mousedOverWidgetIf1 != null) { // L: 3578 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(class144.mousedOverWidgetIf1); + } + } + + if (var34 != class113.field1422 && field645 == field702) { // L: 3580 + if (var34 != null) { // L: 3581 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var34); + } + + if (class113.field1422 != null) { // L: 3582 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(class113.field1422); + } + } + + if (class113.field1422 != null) { // L: 3584 + if (field645 < field702) { // L: 3585 + ++field645; // L: 3586 + if (field645 == field702) { // L: 3587 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(class113.field1422); + } + } + } else if (field645 > 0) { // L: 3590 + --field645; + } + + if (oculusOrbState == 0) { // L: 3592 + var4 = ModelData0.localPlayer.x; // L: 3593 + var5 = ModelData0.localPlayer.y; // L: 3594 + if (HorizontalAlignment.oculusOrbFocalPointX - var4 < -500 || HorizontalAlignment.oculusOrbFocalPointX - var4 > 500 || class28.oculusOrbFocalPointY - var5 < -500 || class28.oculusOrbFocalPointY - var5 > 500) { // L: 3595 + HorizontalAlignment.oculusOrbFocalPointX = var4; // L: 3596 + class28.oculusOrbFocalPointY = var5; // L: 3597 + } + + if (var4 != HorizontalAlignment.oculusOrbFocalPointX) { // L: 3599 + HorizontalAlignment.oculusOrbFocalPointX += (var4 - HorizontalAlignment.oculusOrbFocalPointX) / 16; + } + + if (var5 != class28.oculusOrbFocalPointY) { // L: 3600 + class28.oculusOrbFocalPointY += (var5 - class28.oculusOrbFocalPointY) / 16; + } + + var6 = HorizontalAlignment.oculusOrbFocalPointX >> 7; // L: 3601 + var7 = class28.oculusOrbFocalPointY >> 7; // L: 3602 + var8 = class202.getTileHeight(HorizontalAlignment.oculusOrbFocalPointX, class28.oculusOrbFocalPointY, class128.Client_plane); // L: 3603 + var9 = 0; // L: 3604 + if (var6 > 3 && var7 > 3 && var6 < 100 && var7 < 100) { // L: 3605 + for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { // L: 3606 + for (var11 = var7 - 4; var11 <= var7 + 4; ++var11) { // L: 3607 + var12 = class128.Client_plane; // L: 3608 + if (var12 < 3 && (Tiles.Tiles_renderFlags[1][var10][var11] & 2) == 2) { // L: 3609 + ++var12; + } + + int var27 = var8 - Tiles.Tiles_heights[var12][var10][var11]; // L: 3610 + if (var27 > var9) { // L: 3611 + var9 = var27; + } + } + } + } + + var10 = var9 * 192; // L: 3615 + if (var10 > 98048) { // L: 3616 + var10 = 98048; + } + + if (var10 < 32768) { // L: 3617 + var10 = 32768; + } + + if (var10 > field578) { // L: 3618 + field578 += (var10 - field578) / 24; + } else if (var10 < field578) { // L: 3619 + field578 += (var10 - field578) / 80; + } + + class140.field1666 = class202.getTileHeight(ModelData0.localPlayer.x, ModelData0.localPlayer.y, class128.Client_plane) - camFollowHeight; // L: 3620 + } else if (oculusOrbState == 1) { // L: 3622 + if (field575 && ModelData0.localPlayer != null) { // L: 3624 + var4 = ModelData0.localPlayer.pathX[0]; // L: 3625 + var5 = ModelData0.localPlayer.pathY[0]; // L: 3626 + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 3627 + HorizontalAlignment.oculusOrbFocalPointX = ModelData0.localPlayer.x; // L: 3628 + var6 = class202.getTileHeight(ModelData0.localPlayer.x, ModelData0.localPlayer.y, class128.Client_plane) - camFollowHeight; // L: 3629 + if (var6 < class140.field1666) { // L: 3630 + class140.field1666 = var6; + } + + class28.oculusOrbFocalPointY = ModelData0.localPlayer.y; // L: 3631 + field575 = false; // L: 3632 + } + } + + short var38 = -1; // L: 3635 + if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 3636 + var38 = 0; + } else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 3637 + var38 = 1024; + } + + if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 3638 + if (var38 == 0) { // L: 3639 + var38 = 1792; + } else if (var38 == 1024) { // L: 3640 + var38 = 1280; + } else { + var38 = 1536; // L: 3641 + } + } else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 3643 + if (var38 == 0) { // L: 3644 + var38 = 256; + } else if (var38 == 1024) { // L: 3645 + var38 = 768; + } else { + var38 = 512; // L: 3646 + } + } + + byte var39 = 0; // L: 3648 + if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 3649 + var39 = -1; + } else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 3650 + var39 = 1; + } + + var6 = 0; // L: 3651 + if (var38 >= 0 || var39 != 0) { // L: 3652 + var6 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed * -175885413 * -1650197869 : oculusOrbNormalSpeed * 208832309 * 1073664797; // L: 3653 + var6 *= 16; // L: 3654 + field567 = var38; // L: 3655 + field571 = var39; // L: 3656 + } + + if (field569 < var6) { // L: 3658 + field569 += var6 / 8; // L: 3659 + if (field569 > var6) { // L: 3660 + field569 = var6; + } + } else if (field569 > var6) { // L: 3662 + field569 = field569 * 9 / 10; + } + + if (field569 > 0) { // L: 3663 + var7 = field569 / 16; // L: 3664 + if (field567 >= 0) { // L: 3665 + var4 = field567 - StudioGame.cameraYaw & 2047; // L: 3666 + var8 = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 3667 + var9 = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 3668 + HorizontalAlignment.oculusOrbFocalPointX += var8 * var7 / 65536; // L: 3669 + class28.oculusOrbFocalPointY += var9 * var7 / 65536; // L: 3670 + } + + if (field571 != 0) { // L: 3672 + class140.field1666 += var7 * field571; // L: 3673 + if (class140.field1666 > 0) { // L: 3674 + class140.field1666 = 0; + } + } + } else { + field567 = -1; // L: 3678 + field571 = -1; // L: 3679 + } + + if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 3681 + class4.method22(); // L: 3682 + } + } + + if (MouseHandler.MouseHandler_currentButton == 4 && Login.mouseCam) { // L: 3685 + var4 = MouseHandler.MouseHandler_y - mouseCamClickedY; // L: 3686 + camAngleDX = var4 * 2; // L: 3687 + mouseCamClickedY = var4 != -1 && var4 != 1 ? (MouseHandler.MouseHandler_y + mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y * -1263316171 * -1077369059; // L: 3688 + var5 = mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 3689 + camAngleDY = var5 * 2; // L: 3690 + mouseCamClickedX = var5 != -1 && var5 != 1 ? (mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * 1681939429 * -130913811; // L: 3691 + } else { + if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 3694 + camAngleDY += (-24 - camAngleDY) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 3695 + camAngleDY += (24 - camAngleDY) / 2; + } else { + camAngleDY /= 2; // L: 3696 + } + + if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 3697 + camAngleDX += (12 - camAngleDX) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3698 + camAngleDX += (-12 - camAngleDX) / 2; + } else { + camAngleDX /= 2; // L: 3699 + } + + mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 3700 + mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 3701 + } + + camAngleY = camAngleDY / 2 + camAngleY & 2047; // L: 3703 + camAngleX += camAngleDX / 2; // L: 3704 + if (camAngleX < 128) { // L: 3705 + camAngleX = 128; + } + + if (camAngleX > 383) { // L: 3706 + camAngleX = 383; + } + + if (field742) { // L: 3708 + class422.method7303(class271.field3221, Message.field469, NPC.field1262); // L: 3709 + class241.method4813(Interpreter.field838, Timer.field4239); // L: 3710 + if (class271.field3221 == class343.cameraX && class295.cameraY == Message.field469 && FaceNormal.cameraZ == NPC.field1262 && Interpreter.field838 == GameEngine.cameraPitch && StudioGame.cameraYaw == Timer.field4239) { // L: 3711 + field742 = false; // L: 3712 + isCameraLocked = false; // L: 3713 + class267.field3206 = 0; // L: 3714 + AbstractWorldMapData.field2851 = 0; // L: 3715 + ScriptFrame.field457 = 0; // L: 3716 + class17.field88 = 0; // L: 3717 + PacketBufferNode.field3083 = 0; // L: 3718 + HitSplatDefinition.field2077 = 0; // L: 3719 + class229.field2805 = 0; // L: 3720 + Players.field1317 = 0; // L: 3721 + TileItem.field1292 = 0; // L: 3722 + WorldMapSection1.field2898 = 0; // L: 3723 + } + } else if (isCameraLocked) { // L: 3727 + class1.method11(); + } + + for (var4 = 0; var4 < 5; ++var4) { // L: 3728 + var10002 = field677[var4]++; + } + + class125.varcs.tryWrite(); // L: 3729 + var4 = class293.method5429(); // L: 3730 + var5 = ObjectSound.method1734(); // L: 3731 + if (var4 > 15000 && var5 > 15000) { // L: 3732 + logoutTimer = 250; // L: 3733 + MouseHandler.MouseHandler_idleCycles = 14500; // L: 3735 + var18 = WallDecoration.getPacketBufferNode(ClientPacket.field3027, packetWriter.isaacCipher); // L: 3738 + packetWriter.addNode(var18); // L: 3739 + } + + BufferedSource.friendSystem.processFriendUpdates(); // L: 3741 + ++packetWriter.pendingWrites; // L: 3742 + if (packetWriter.pendingWrites > 50) { // L: 3743 + var18 = WallDecoration.getPacketBufferNode(ClientPacket.field2982, packetWriter.isaacCipher); // L: 3745 + packetWriter.addNode(var18); // L: 3746 + } + + try { + packetWriter.flush(); // L: 3749 + } catch (IOException var28) { // L: 3751 + class129.method2812(); // L: 3752 + } + + return; // L: 3754 + } + + var50 = var49.widget; // L: 3462 + if (var50.childIndex < 0) { // L: 3463 + break; + } + + var43 = class92.getWidget(var50.parentId); // L: 3464 + } while(var43 == null || var43.children == null || var50.childIndex >= var43.children.length || var50 != var43.children[var50.childIndex]); // L: 3465 + + class144.runScriptEvent(var49); // L: 3469 + } + } + + var50 = var49.widget; // L: 3450 + if (var50.childIndex < 0) { // L: 3451 + break; + } + + var43 = class92.getWidget(var50.parentId); // L: 3452 + } while(var43 == null || var43.children == null || var50.childIndex >= var43.children.length || var50 != var43.children[var50.childIndex]); // L: 3453 + + class144.runScriptEvent(var49); // L: 3457 + } + } + + var50 = var49.widget; // L: 3438 + if (var50.childIndex < 0) { // L: 3439 break; } - var27 = class127.getWidget(var38.parentId); // L: 3318 - } while(var27 == null || var27.children == null || var38.childIndex >= var27.children.length || var38 != var27.children[var38.childIndex]); // L: 3319 + var43 = class92.getWidget(var50.parentId); // L: 3440 + } while(var43 == null || var43.children == null || var50.childIndex >= var43.children.length || var50 != var43.children[var50.childIndex]); // L: 3441 - ClanSettings.runScriptEvent(var37); // L: 3323 + class144.runScriptEvent(var49); // L: 3445 } } + + var31 = WallDecoration.getPacketBufferNode(ClientPacket.field3047, packetWriter.isaacCipher); // L: 3096 + var31.packetBuffer.writeByte(0); // L: 3097 + var3 = var31.packetBuffer.offset; // L: 3098 + UserComparator3.performReflectionCheck(var31.packetBuffer); // L: 3099 + var31.packetBuffer.method7740(var31.packetBuffer.offset - var3); // L: 3100 + packetWriter.addNode(var31); // L: 3101 } } } - } // L: 3001 3239 + } // L: 3078 @ObfuscatedName("ga") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1620064665" + garbageValue = "-1836577440" ) @Export("resizeJS") void resizeJS() { - int var1 = InvDefinition.canvasWidth; // L: 4291 - int var2 = class321.canvasHeight; // L: 4292 - if (super.contentWidth < var1) { // L: 4293 + int var1 = GraphicsObject.canvasWidth; // L: 4381 + int var2 = class433.canvasHeight; // L: 4382 + if (super.contentWidth < var1) { // L: 4383 var1 = super.contentWidth; } if (super.contentHeight < var2) { - var2 = super.contentHeight; // L: 4294 + var2 = super.contentHeight; // L: 4384 } - if (class131.clientPreferences != null) { // L: 4295 + if (class12.clientPreferences != null) { // L: 4385 try { - Client var3 = class127.client; // L: 4297 - Object[] var4 = new Object[]{getWindowedMode()}; // L: 4298 - JSObject.getWindow(var3).call("resize", var4); // L: 4301 - } catch (Throwable var5) { // L: 4304 + Client var3 = class82.client; // L: 4387 + Object[] var4 = new Object[]{ClanChannelMember.getWindowedMode()}; // L: 4388 + JSObject.getWindow(var3).call("resize", var4); // L: 4391 + } catch (Throwable var5) { // L: 4394 } } - } // L: 4306 + } // L: 4396 - @ObfuscatedName("gu") + @ObfuscatedName("go") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-27115" + descriptor = "(I)V", + garbageValue = "296030878" ) @Export("drawLoggedIn") final void drawLoggedIn() { - if (rootInterface != -1) { // L: 4309 - class115.method2680(rootInterface); - } - int var1; - for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4310 - if (field715[var1]) { // L: 4311 - field716[var1] = true; - } - - field717[var1] = field715[var1]; // L: 4312 - field715[var1] = false; // L: 4313 - } - - field540 = cycle; // L: 4315 - viewportX = -1; // L: 4316 - viewportY = -1; // L: 4317 - GrandExchangeEvent.hoveredItemContainer = null; // L: 4318 - if (rootInterface != -1) { // L: 4319 - rootWidgetCount = 0; // L: 4320 - class131.drawWidgets(rootInterface, 0, 0, InvDefinition.canvasWidth, class321.canvasHeight, 0, 0, -1); // L: 4321 - } - - Rasterizer2D.Rasterizer2D_resetClip(); // L: 4323 - if (showMouseCross) { // L: 4324 - if (mouseCrossColor == 1) { // L: 4325 - class11.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4326 - } - - if (mouseCrossColor == 2) { // L: 4328 - class11.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4329 + if (rootInterface != -1) { // L: 4399 + var1 = rootInterface; // L: 4400 + if (WorldMapDecoration.loadInterface(var1)) { // L: 4402 + class342.drawModelComponents(NetSocket.Widget_interfaceComponents[var1], -1); // L: 4403 } } - if (!isMenuOpen) { // L: 4332 - if (viewportX != -1) { // L: 4333 - UrlRequester.method2537(viewportX, viewportY); + for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4406 + if (field652[var1]) { // L: 4407 + field704[var1] = true; + } + + field524[var1] = field652[var1]; // L: 4408 + field652[var1] = false; // L: 4409 + } + + field694 = cycle; // L: 4411 + viewportX = -1; // L: 4412 + viewportY = -1; // L: 4413 + class155.hoveredItemContainer = null; // L: 4414 + if (rootInterface != -1) { // L: 4415 + rootWidgetCount = 0; // L: 4416 + class175.drawWidgets(rootInterface, 0, 0, GraphicsObject.canvasWidth, class433.canvasHeight, 0, 0, -1); // L: 4417 + } + + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4419 + if (showMouseCross) { // L: 4420 + if (mouseCrossColor == 1) { // L: 4421 + Projectile.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4422 + } + + if (mouseCrossColor == 2) { // L: 4424 + Projectile.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4425 + } + } + + int var2; + int var3; + int var4; + int var6; + int var7; + int var8; + if (!isMenuOpen) { // L: 4428 + if (viewportX != -1) { // L: 4429 + var1 = viewportX; // L: 4430 + var2 = viewportY; // L: 4431 + if ((menuOptionsCount >= 2 || isItemSelected != 0 || isSpellSelected) && showMouseOverText) { // L: 4433 4434 + var3 = menuOptionsCount - 1; // L: 4437 + String var13; + if (isItemSelected == 1 && menuOptionsCount < 2) { // L: 4441 + var13 = "Use" + " " + selectedItemName + " " + "->"; + } else if (isSpellSelected && menuOptionsCount < 2) { // L: 4442 + var13 = selectedSpellActionName + " " + selectedSpellName + " " + "->"; + } else { + String var14; + if (var3 < 0) { // L: 4446 + var14 = ""; // L: 4447 + } else if (menuTargets[var3].length() > 0) { // L: 4450 + var14 = menuActions[var3] + " " + menuTargets[var3]; + } else { + var14 = menuActions[var3]; // L: 4451 + } + + var13 = var14; // L: 4453 + } + + if (menuOptionsCount > 2) { // L: 4455 + var13 = var13 + class166.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; + } + + ChatChannel.fontBold12.drawRandomAlphaAndSpacing(var13, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); // L: 4456 + } } } else { - Coord.method5531(); // L: 4335 + var1 = BuddyRankComparator.menuX; // L: 4461 + var2 = FontName.menuY; // L: 4462 + var3 = KeyHandler.menuWidth; // L: 4463 + var4 = class7.menuHeight; // L: 4464 + int var5 = 6116423; // L: 4465 + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var5); // L: 4466 + Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0); // L: 4467 + Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0); // L: 4468 + ChatChannel.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var5, -1); // L: 4469 + var6 = MouseHandler.MouseHandler_x; // L: 4470 + var7 = MouseHandler.MouseHandler_y; // L: 4471 + + for (var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 4472 + int var9 = var2 + (menuOptionsCount - 1 - var8) * 15 + 31; // L: 4473 + int var10 = 16777215; // L: 4474 + if (var6 > var1 && var6 < var1 + var3 && var7 > var9 - 13 && var7 < var9 + 3) { // L: 4475 + var10 = 16776960; + } + + Font var11 = ChatChannel.fontBold12; // L: 4476 + String var12; + if (var8 < 0) { // L: 4479 + var12 = ""; // L: 4480 + } else if (menuTargets[var8].length() > 0) { // L: 4483 + var12 = menuActions[var8] + " " + menuTargets[var8]; + } else { + var12 = menuActions[var8]; // L: 4484 + } + + var11.draw(var12, var1 + 3, var9, var10, 0); // L: 4486 + } + + ItemContainer.method2061(BuddyRankComparator.menuX, FontName.menuY, KeyHandler.menuWidth, class7.menuHeight); // L: 4488 } - if (gameDrawingMode == 3) { // L: 4336 - for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4337 - if (field717[var1]) { // L: 4338 - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 4339 - } else if (field716[var1]) { // L: 4341 - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 4342 + if (gameDrawingMode == 3) { // L: 4490 + for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4491 + if (field524[var1]) { // L: 4492 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 4493 + } else if (field704[var1]) { // L: 4495 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 4496 } } } - var1 = class18.Client_plane; // L: 4346 - int var2 = GrandExchangeEvents.localPlayer.x; // L: 4347 - int var3 = GrandExchangeEvents.localPlayer.y; // L: 4348 - int var4 = field556; // L: 4349 + var1 = class128.Client_plane; // L: 4500 + var2 = ModelData0.localPlayer.x; // L: 4501 + var3 = ModelData0.localPlayer.y; // L: 4502 + var4 = field727; // L: 4503 - for (ObjectSound var5 = (ObjectSound)ObjectSound.objectSounds.last(); var5 != null; var5 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 4351 - if (var5.soundEffectId != -1 || var5.soundEffectIds != null) { // L: 4352 - int var6 = 0; // L: 4353 - if (var2 > var5.maxX) { // L: 4354 - var6 += var2 - var5.maxX; - } else if (var2 < var5.x) { // L: 4355 - var6 += var5.x - var2; + for (ObjectSound var19 = (ObjectSound)ObjectSound.objectSounds.last(); var19 != null; var19 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 4505 + if (var19.soundEffectId != -1 || var19.soundEffectIds != null) { // L: 4506 + var6 = 0; // L: 4507 + if (var2 > var19.maxX) { // L: 4508 + var6 += var2 - var19.maxX; + } else if (var2 < var19.x) { // L: 4509 + var6 += var19.x - var2; } - if (var3 > var5.maxY) { // L: 4356 - var6 += var3 - var5.maxY; - } else if (var3 < var5.y) { // L: 4357 - var6 += var5.y - var3; + if (var3 > var19.maxY) { + var6 += var3 - var19.maxY; // L: 4510 + } else if (var3 < var19.y) { // L: 4511 + var6 += var19.y - var3; } - if (var6 - 64 <= var5.field814 && class131.clientPreferences.method2270() != 0 && var1 == var5.plane) { // L: 4358 - var6 -= 64; // L: 4369 - if (var6 < 0) { // L: 4370 + if (var6 - 64 <= var19.field817 && class12.clientPreferences.method2239() != 0 && var1 == var19.plane) { // L: 4512 + var6 -= 64; // L: 4523 + if (var6 < 0) { // L: 4524 var6 = 0; } - int var7 = (var5.field814 - var6) * class131.clientPreferences.method2270() / var5.field814; // L: 4371 + var7 = (var19.field817 - var6) * class12.clientPreferences.method2239() / var19.field817; // L: 4525 Object var10000; - if (var5.stream1 == null) { // L: 4372 - if (var5.soundEffectId >= 0) { // L: 4373 - var10000 = null; // L: 4374 - SoundEffect var8 = SoundEffect.readSoundEffect(class182.archive4, var5.soundEffectId, 0); - if (var8 != null) { // L: 4375 - RawSound var9 = var8.toRawSound().resample(WorldMapRectangle.decimator); // L: 4376 - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var7); // L: 4377 - var10.setNumLoops(-1); // L: 4378 - StructComposition.pcmStreamMixer.addSubStream(var10); // L: 4379 - var5.stream1 = var10; // L: 4380 + if (var19.stream1 == null) { // L: 4526 + if (var19.soundEffectId >= 0) { // L: 4527 + var10000 = null; // L: 4528 + SoundEffect var15 = SoundEffect.readSoundEffect(MouseHandler.archive4, var19.soundEffectId, 0); + if (var15 != null) { // L: 4529 + RawSound var16 = var15.toRawSound().resample(class403.decimator); // L: 4530 + RawPcmStream var17 = RawPcmStream.createRawPcmStream(var16, 100, var7); // L: 4531 + var17.setNumLoops(-1); // L: 4532 + class122.pcmStreamMixer.addSubStream(var17); // L: 4533 + var19.stream1 = var17; // L: 4534 } } } else { - var5.stream1.method929(var7); // L: 4384 + var19.stream1.method802(var7); // L: 4538 } - if (var5.stream2 == null) { // L: 4385 - if (var5.soundEffectIds != null && (var5.field821 -= var4) <= 0) { // L: 4386 - int var12 = (int)(Math.random() * (double)var5.soundEffectIds.length); // L: 4387 - var10000 = null; // L: 4388 - SoundEffect var13 = SoundEffect.readSoundEffect(class182.archive4, var5.soundEffectIds[var12], 0); - if (var13 != null) { // L: 4389 - RawSound var14 = var13.toRawSound().resample(WorldMapRectangle.decimator); // L: 4390 - RawPcmStream var11 = RawPcmStream.createRawPcmStream(var14, 100, var7); // L: 4391 - var11.setNumLoops(0); // L: 4392 - StructComposition.pcmStreamMixer.addSubStream(var11); // L: 4393 - var5.stream2 = var11; // L: 4394 - var5.field821 = var5.field818 + (int)(Math.random() * (double)(var5.field810 - var5.field818)); // L: 4395 + if (var19.stream2 == null) { // L: 4539 + if (var19.soundEffectIds != null && (var19.field810 -= var4) <= 0) { // L: 4540 + var8 = (int)(Math.random() * (double)var19.soundEffectIds.length); // L: 4541 + var10000 = null; // L: 4542 + SoundEffect var20 = SoundEffect.readSoundEffect(MouseHandler.archive4, var19.soundEffectIds[var8], 0); + if (var20 != null) { // L: 4543 + RawSound var21 = var20.toRawSound().resample(class403.decimator); // L: 4544 + RawPcmStream var18 = RawPcmStream.createRawPcmStream(var21, 100, var7); // L: 4545 + var18.setNumLoops(0); // L: 4546 + class122.pcmStreamMixer.addSubStream(var18); // L: 4547 + var19.stream2 = var18; // L: 4548 + var19.field810 = var19.field813 + (int)(Math.random() * (double)(var19.field808 - var19.field813)); // L: 4549 } } } else { - var5.stream2.method929(var7); // L: 4400 - if (!var5.stream2.hasNext()) { // L: 4401 - var5.stream2 = null; // L: 4402 + var19.stream2.method802(var7); // L: 4554 + if (!var19.stream2.hasNext()) { // L: 4555 + var19.stream2 = null; // L: 4556 } } } else { - if (var5.stream1 != null) { // L: 4359 - StructComposition.pcmStreamMixer.removeSubStream(var5.stream1); // L: 4360 - var5.stream1 = null; // L: 4361 + if (var19.stream1 != null) { // L: 4513 + class122.pcmStreamMixer.removeSubStream(var19.stream1); // L: 4514 + var19.stream1 = null; // L: 4515 } - if (var5.stream2 != null) { // L: 4363 - StructComposition.pcmStreamMixer.removeSubStream(var5.stream2); // L: 4364 - var5.stream2 = null; // L: 4365 + if (var19.stream2 != null) { // L: 4517 + class122.pcmStreamMixer.removeSubStream(var19.stream2); // L: 4518 + var19.stream2 = null; // L: 4519 } } } } - field556 = 0; // L: 4407 - } // L: 4408 + field727 = 0; // L: 4561 + } // L: 4562 - @ObfuscatedName("hp") + @ObfuscatedName("hw") @ObfuscatedSignature( - descriptor = "(Lcl;B)Z", - garbageValue = "1" + descriptor = "(Lcz;I)Z", + garbageValue = "1953749853" ) - final boolean method1158(PacketWriter var1) { - AbstractSocket var2 = var1.getSocket(); // L: 5999 - PacketBuffer var3 = var1.packetBuffer; // L: 6000 - if (var2 == null) { // L: 6001 + final boolean method1254(PacketWriter var1) { + AbstractSocket var2 = var1.getSocket(); // L: 6121 + PacketBuffer var3 = var1.packetBuffer; // L: 6122 + if (var2 == null) { // L: 6123 return false; } else { int var6; String var21; try { int var5; - if (var1.serverPacket == null) { // L: 6003 - if (var1.field1317) { // L: 6004 - if (!var2.isAvailable(1)) { // L: 6005 + if (var1.serverPacket == null) { // L: 6125 + if (var1.field1348) { // L: 6126 + if (!var2.isAvailable(1)) { // L: 6127 return false; } - var2.read(var1.packetBuffer.array, 0, 1); // L: 6006 - var1.field1322 = 0; // L: 6007 - var1.field1317 = false; // L: 6008 + var2.read(var1.packetBuffer.array, 0, 1); // L: 6128 + var1.field1349 = 0; // L: 6129 + var1.field1348 = false; // L: 6130 } - var3.offset = 0; // L: 6010 - if (var3.method7622()) { // L: 6011 - if (!var2.isAvailable(1)) { // L: 6012 + var3.offset = 0; // L: 6132 + if (var3.method7495()) { // L: 6133 + if (!var2.isAvailable(1)) { // L: 6134 return false; } - var2.read(var1.packetBuffer.array, 1, 1); // L: 6013 - var1.field1322 = 0; // L: 6014 + var2.read(var1.packetBuffer.array, 1, 1); // L: 6135 + var1.field1349 = 0; // L: 6136 } - var1.field1317 = true; // L: 6016 - ServerPacket[] var4 = class82.ServerPacket_values(); // L: 6017 - var5 = var3.readSmartByteShortIsaac(); // L: 6018 - if (var5 < 0 || var5 >= var4.length) { // L: 6019 + var1.field1348 = true; // L: 6138 + ServerPacket[] var4 = BuddyRankComparator.ServerPacket_values(); // L: 6139 + var5 = var3.readSmartByteShortIsaac(); // L: 6140 + if (var5 < 0 || var5 >= var4.length) { // L: 6141 throw new IOException(var5 + " " + var3.offset); } - var1.serverPacket = var4[var5]; // L: 6020 - var1.serverPacketLength = var1.serverPacket.length; // L: 6021 + var1.serverPacket = var4[var5]; // L: 6142 + var1.serverPacketLength = var1.serverPacket.length; // L: 6143 } - if (var1.serverPacketLength == -1) { // L: 6023 - if (!var2.isAvailable(1)) { // L: 6024 + if (var1.serverPacketLength == -1) { // L: 6145 + if (!var2.isAvailable(1)) { // L: 6146 return false; } - var1.getSocket().read(var3.array, 0, 1); // L: 6025 - var1.serverPacketLength = var3.array[0] & 255; // L: 6026 + var1.getSocket().read(var3.array, 0, 1); // L: 6147 + var1.serverPacketLength = var3.array[0] & 255; // L: 6148 } - if (var1.serverPacketLength == -2) { // L: 6028 - if (!var2.isAvailable(2)) { // L: 6029 + if (var1.serverPacketLength == -2) { // L: 6150 + if (!var2.isAvailable(2)) { // L: 6151 return false; } - var1.getSocket().read(var3.array, 0, 2); // L: 6030 - var3.offset = 0; // L: 6031 - var1.serverPacketLength = var3.readUnsignedShort(); // L: 6032 + var1.getSocket().read(var3.array, 0, 2); // L: 6152 + var3.offset = 0; // L: 6153 + var1.serverPacketLength = var3.readUnsignedShort(); // L: 6154 } - if (!var2.isAvailable(var1.serverPacketLength)) { // L: 6034 + if (!var2.isAvailable(var1.serverPacketLength)) { // L: 6156 return false; } - var3.offset = 0; // L: 6035 - var2.read(var3.array, 0, var1.serverPacketLength); // L: 6036 - var1.field1322 = 0; // L: 6037 - timer.method6574(); // L: 6038 - var1.field1313 = var1.field1325; // L: 6039 - var1.field1325 = var1.field1324; // L: 6040 - var1.field1324 = var1.serverPacket; // L: 6041 - if (ServerPacket.field3108 == var1.serverPacket) { // L: 6042 - ClanMate.method6700(class263.field3007); // L: 6043 - var1.serverPacket = null; // L: 6044 - return true; // L: 6045 + var3.offset = 0; // L: 6157 + var2.read(var3.array, 0, var1.serverPacketLength); // L: 6158 + var1.field1349 = 0; // L: 6159 + timer.method6374(); // L: 6160 + var1.field1345 = var1.field1340; // L: 6161 + var1.field1340 = var1.field1351; // L: 6162 + var1.field1351 = var1.serverPacket; // L: 6163 + if (ServerPacket.field3141 == var1.serverPacket) { // L: 6164 + UserComparator8.field1378 = new class392(class221.HitSplatDefinition_cached); // L: 6165 + var1.serverPacket = null; // L: 6166 + return true; // L: 6167 } - if (ServerPacket.field3113 == var1.serverPacket) { // L: 6047 - class431.field4602 = true; // L: 6048 - WorldMapSection1.updateNpcs(false, var3); // L: 6049 - var1.serverPacket = null; // L: 6050 - return true; // L: 6051 + int var67; + if (ServerPacket.field3131 == var1.serverPacket) { // L: 6169 + var67 = var3.readInt(); // L: 6170 + if (var67 != field482) { // L: 6171 + field482 = var67; // L: 6172 + class134.method2850(); // L: 6173 + } + + var1.serverPacket = null; // L: 6175 + return true; // L: 6176 } - int var20; - if (ServerPacket.field3073 == var1.serverPacket) { // L: 6053 - for (var20 = 0; var20 < VarpDefinition.VarpDefinition_fileCount; ++var20) { // L: 6054 - VarpDefinition var84 = class134.VarpDefinition_get(var20); // L: 6055 - if (var84 != null) { // L: 6056 - Varps.Varps_temp[var20] = 0; // L: 6057 - Varps.Varps_main[var20] = 0; // L: 6058 + if (ServerPacket.field3099 == var1.serverPacket) { // L: 6178 + class119.method2737(); // L: 6179 + runEnergy = var3.readUnsignedByte(); // L: 6180 + field695 = cycleCntr; // L: 6181 + var1.serverPacket = null; // L: 6182 + return true; // L: 6183 + } + + if (ServerPacket.field3113 == var1.serverPacket) { // L: 6185 + var67 = var3.readUnsignedByte(); // L: 6186 + var21 = var3.readStringCp1252NullTerminated(); // L: 6187 + var6 = var3.method7593(); // L: 6188 + if (var6 >= 1 && var6 <= 8) { // L: 6189 + if (var21.equalsIgnoreCase("null")) { // L: 6190 + var21 = null; } + + playerMenuActions[var6 - 1] = var21; // L: 6191 + playerOptionsPriorities[var6 - 1] = var67 == 0; // L: 6192 } - class143.method3072(); // L: 6061 - changedVarpCount += 32; // L: 6062 - var1.serverPacket = null; // L: 6063 - return true; // L: 6064 + var1.serverPacket = null; // L: 6194 + return true; // L: 6195 } - if (ServerPacket.field3120 == var1.serverPacket) { // L: 6066 - Decimator.friendSystem.method1726(); // L: 6067 - field701 = cycleCntr; // L: 6068 - var1.serverPacket = null; // L: 6069 - return true; // L: 6070 - } - - if (ServerPacket.field3040 == var1.serverPacket) { // L: 6072 - var20 = var3.readInt(); // L: 6073 - InterfaceParent var82 = (InterfaceParent)interfaceParents.get((long)var20); // L: 6074 - if (var82 != null) { // L: 6075 - Script.closeInterface(var82, true); + Widget var22; + if (ServerPacket.field3148 == var1.serverPacket) { // L: 6197 + var67 = var3.method7568(); // L: 6198 + var5 = var3.method7576(); // L: 6199 + var22 = class92.getWidget(var67); // L: 6200 + if (var22.modelType != 1 || var5 != var22.modelId) { // L: 6201 + var22.modelType = 1; // L: 6202 + var22.modelId = var5; // L: 6203 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var22); // L: 6204 } - if (meslayerContinueWidget != null) { // L: 6076 - class346.invalidateWidget(meslayerContinueWidget); // L: 6077 - meslayerContinueWidget = null; // L: 6078 - } - - var1.serverPacket = null; // L: 6080 - return true; // L: 6081 + var1.serverPacket = null; // L: 6206 + return true; // L: 6207 } - Widget var60; - if (ServerPacket.field3071 == var1.serverPacket) { // L: 6083 - var20 = var3.method7714(); // L: 6084 - var5 = var3.method7715(); // L: 6085 - var6 = var3.method7827(); // L: 6086 - var60 = class127.getWidget(var6); // L: 6087 - var60.field3392 = var5 + (var20 << 16); // L: 6088 - var1.serverPacket = null; // L: 6089 - return true; // L: 6090 + if (ServerPacket.field3092 == var1.serverPacket) { // L: 6209 + BufferedSource.friendSystem.method1667(); // L: 6210 + field689 = cycleCntr; // L: 6211 + var1.serverPacket = null; // L: 6212 + return true; // L: 6213 } - if (ServerPacket.field3090 == var1.serverPacket) { // L: 6092 - ClanMate.method6700(class263.field3011); // L: 6093 - var1.serverPacket = null; // L: 6094 - return true; // L: 6095 - } - - if (ServerPacket.field3055 == var1.serverPacket) { // L: 6097 - class29.field181 = var3.method7875(); // L: 6098 - PlayerComposition.field3307 = var3.method7742(); // L: 6099 - var1.serverPacket = null; // L: 6100 - return true; // L: 6101 - } - - if (ServerPacket.field3024 == var1.serverPacket) { // L: 6103 - var20 = var3.method7837(); // L: 6104 - var5 = var3.readShort(); // L: 6105 - var6 = var3.method7716(); // L: 6106 - var60 = class127.getWidget(var20); // L: 6107 - if (var5 != var60.rawX || var6 != var60.rawY || var60.xAlignment != 0 || var60.yAlignment != 0) { // L: 6108 - var60.rawX = var5; // L: 6109 - var60.rawY = var6; // L: 6110 - var60.xAlignment = 0; // L: 6111 - var60.yAlignment = 0; // L: 6112 - class346.invalidateWidget(var60); // L: 6113 - this.alignWidget(var60); // L: 6114 - if (var60.type == 0) { // L: 6115 - AbstractByteArrayCopier.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var20 >> 16], var60, false); - } - } - - var1.serverPacket = null; // L: 6117 - return true; // L: 6118 - } - - if (ServerPacket.field3104 == var1.serverPacket) { // L: 6120 - isCameraLocked = true; // L: 6121 - field754 = false; // L: 6122 - class286.field3274 = var3.readUnsignedByte(); // L: 6123 - class54.field447 = var3.readUnsignedByte(); // L: 6124 - BZip2State.field4662 = var3.readUnsignedShort(); // L: 6125 - Script.field955 = var3.readUnsignedByte(); // L: 6126 - ArchiveDisk.field4309 = var3.readUnsignedByte(); // L: 6127 - if (ArchiveDisk.field4309 >= 100) { // L: 6128 - WorldMapLabelSize.cameraX = class286.field3274 * 128 + 64; // L: 6129 - class154.cameraZ = class54.field447 * 128 + 64; // L: 6130 - ItemContainer.cameraY = WorldMapLabel.getTileHeight(WorldMapLabelSize.cameraX, class154.cameraZ, class18.Client_plane) - BZip2State.field4662; // L: 6131 - } - - var1.serverPacket = null; // L: 6133 - return true; // L: 6134 - } - - if (ServerPacket.field3066 == var1.serverPacket) { // L: 6136 - ClanMate.method6700(class263.field3009); // L: 6137 - var1.serverPacket = null; // L: 6138 - return true; // L: 6139 - } - - String var52; - if (ServerPacket.field3030 == var1.serverPacket) { // L: 6141 - var52 = var3.readStringCp1252NullTerminated(); // L: 6142 - var21 = AbstractFont.escapeBrackets(MouseHandler.method584(class193.method3883(var3))); // L: 6143 - Actor.addGameMessage(6, var52, var21); // L: 6144 - var1.serverPacket = null; // L: 6145 - return true; // L: 6146 - } - - if (ServerPacket.field3114 == var1.serverPacket) { // L: 6148 - class29.field181 = var3.method7875(); // L: 6149 - PlayerComposition.field3307 = var3.readUnsignedByte(); // L: 6150 - - for (var20 = PlayerComposition.field3307; var20 < PlayerComposition.field3307 + 8; ++var20) { // L: 6151 - for (var5 = class29.field181; var5 < class29.field181 + 8; ++var5) { // L: 6152 - if (groundItems[class18.Client_plane][var20][var5] != null) { // L: 6153 - groundItems[class18.Client_plane][var20][var5] = null; // L: 6154 - UserComparator3.updateItemPile(var20, var5); // L: 6155 - } - } - } - - for (PendingSpawn var54 = (PendingSpawn)pendingSpawns.last(); var54 != null; var54 = (PendingSpawn)pendingSpawns.previous()) { // L: 6159 6160 6162 - if (var54.x >= PlayerComposition.field3307 && var54.x < PlayerComposition.field3307 + 8 && var54.y >= class29.field181 && var54.y < class29.field181 + 8 && var54.plane == class18.Client_plane) { // L: 6161 - var54.hitpoints = 0; - } - } - - var1.serverPacket = null; // L: 6164 - return true; // L: 6165 - } - - int var8; - int var11; - int var22; - int var61; - int var62; - if (ServerPacket.field3123 == var1.serverPacket) { // L: 6167 - var6 = var3.method7752(); // L: 6176 - var20 = var6 >> 16; // L: 6177 - var5 = var6 >> 8 & 255; // L: 6178 - var22 = var20 + (var6 >> 4 & 7); // L: 6179 - var8 = var5 + (var6 & 7); // L: 6180 - var62 = var3.readUnsignedByte(); // L: 6181 - var11 = var3.readUnsignedShort(); // L: 6182 - var61 = var3.method7715(); // L: 6183 - if (var22 >= 0 && var8 >= 0 && var22 < 104 && var8 < 104) { // L: 6184 - var22 = var22 * 128 + 64; // L: 6185 - var8 = var8 * 128 + 64; // L: 6186 - GraphicsObject var64 = new GraphicsObject(var61, class18.Client_plane, var22, var8, WorldMapLabel.getTileHeight(var22, var8, class18.Client_plane) - var62, var11, cycle); // L: 6187 - graphicsObjects.addFirst(var64); // L: 6188 - } - - var1.serverPacket = null; // L: 6190 - return true; // L: 6191 - } - - Widget var74; - if (ServerPacket.field3052 == var1.serverPacket) { // L: 6193 - var20 = var3.readInt(); // L: 6194 - var5 = var3.method7717(); // L: 6195 - var74 = class127.getWidget(var20); // L: 6196 - if (var5 != var74.sequenceId || var5 == -1) { // L: 6197 - var74.sequenceId = var5; // L: 6198 - var74.modelFrame = 0; // L: 6199 - var74.modelFrameCycle = 0; // L: 6200 - class346.invalidateWidget(var74); // L: 6201 - } - - var1.serverPacket = null; // L: 6203 - return true; // L: 6204 - } - - int var13; + GameObject var14; int var15; - int var24; - if (ServerPacket.field3122 == var1.serverPacket) { // L: 6206 - var6 = var3.method7752(); // L: 6217 - var20 = var6 >> 16; // L: 6218 - var5 = var6 >> 8 & 255; // L: 6219 - var22 = var20 + (var6 >> 4 & 7); // L: 6220 - var8 = var5 + (var6 & 7); // L: 6221 - var61 = var3.method7875(); // L: 6222 - var62 = var61 >> 2; // L: 6223 - var11 = var61 & 3; // L: 6224 - var24 = field748[var62]; // L: 6225 - var13 = var3.readUnsignedShort(); // L: 6226 - if (var22 >= 0 && var8 >= 0 && var22 < 103 && var8 < 103) { // L: 6227 - if (var24 == 0) { // L: 6228 - BoundaryObject var69 = ArchiveLoader.scene.method4754(class18.Client_plane, var22, var8); // L: 6229 - if (var69 != null) { // L: 6230 - var15 = FileSystem.Entity_unpackID(var69.tag); // L: 6231 - if (var62 == 2) { // L: 6232 - var69.renderable1 = new DynamicObject(var15, 2, var11 + 4, class18.Client_plane, var22, var8, var13, false, var69.renderable1); // L: 6233 - var69.renderable2 = new DynamicObject(var15, 2, var11 + 1 & 3, class18.Client_plane, var22, var8, var13, false, var69.renderable2); // L: 6234 - } else { - var69.renderable1 = new DynamicObject(var15, var62, var11, class18.Client_plane, var22, var8, var13, false, var69.renderable1); // L: 6236 - } - } - } else if (var24 == 1) { // L: 6239 - WallDecoration var68 = ArchiveLoader.scene.method4860(class18.Client_plane, var22, var8); // L: 6240 - if (var68 != null) { // L: 6241 - var15 = FileSystem.Entity_unpackID(var68.tag); // L: 6242 - if (var62 != 4 && var62 != 5) { // L: 6243 - if (var62 == 6) { // L: 6246 - var68.renderable1 = new DynamicObject(var15, 4, var11 + 4, class18.Client_plane, var22, var8, var13, false, var68.renderable1); // L: 6247 - } else if (var62 == 7) { // L: 6249 - var68.renderable1 = new DynamicObject(var15, 4, (var11 + 2 & 3) + 4, class18.Client_plane, var22, var8, var13, false, var68.renderable1); // L: 6250 - } else if (var62 == 8) { // L: 6252 - var68.renderable1 = new DynamicObject(var15, 4, var11 + 4, class18.Client_plane, var22, var8, var13, false, var68.renderable1); // L: 6253 - var68.renderable2 = new DynamicObject(var15, 4, (var11 + 2 & 3) + 4, class18.Client_plane, var22, var8, var13, false, var68.renderable2); // L: 6254 - } - } else { - var68.renderable1 = new DynamicObject(var15, 4, var11, class18.Client_plane, var22, var8, var13, false, var68.renderable1); // L: 6244 - } - } - } else if (var24 == 2) { // L: 6258 - GameObject var66 = ArchiveLoader.scene.getGameObject(class18.Client_plane, var22, var8); // L: 6259 - if (var62 == 11) { // L: 6260 - var62 = 10; // L: 6261 - } - - if (var66 != null) { // L: 6263 - var66.renderable = new DynamicObject(FileSystem.Entity_unpackID(var66.tag), var62, var11, class18.Client_plane, var22, var8, var13, false, var66.renderable); // L: 6264 - } - } else if (var24 == 3) { // L: 6267 - FloorDecoration var67 = ArchiveLoader.scene.getFloorDecoration(class18.Client_plane, var22, var8); // L: 6268 - if (var67 != null) { // L: 6269 - var67.renderable = new DynamicObject(FileSystem.Entity_unpackID(var67.tag), 22, var11, class18.Client_plane, var22, var8, var13, false, var67.renderable); // L: 6270 - } - } - } - - var1.serverPacket = null; // L: 6274 - return true; // L: 6275 - } - - if (ServerPacket.field3119 == var1.serverPacket) { // L: 6277 - publicChatMode = var3.method7742(); // L: 6278 - tradeChatMode = var3.method7875(); // L: 6279 - var1.serverPacket = null; // L: 6280 - return true; // L: 6281 - } - - if (ServerPacket.field3101 == var1.serverPacket) { // L: 6283 - var20 = var3.readUnsignedByte(); // L: 6284 - Tile.method4603(var20); // L: 6285 - var1.serverPacket = null; // L: 6286 - return true; // L: 6287 - } - - if (ServerPacket.field3051 == var1.serverPacket) { // L: 6289 - for (var20 = 0; var20 < Varps.Varps_main.length; ++var20) { // L: 6290 - if (Varps.Varps_main[var20] != Varps.Varps_temp[var20]) { // L: 6291 - Varps.Varps_main[var20] = Varps.Varps_temp[var20]; // L: 6292 - WorldMapLabel.changeGameOptions(var20); // L: 6293 - changedVarps[++changedVarpCount - 1 & 31] = var20; // L: 6294 - } - } - - var1.serverPacket = null; // L: 6297 - return true; // L: 6298 - } - - if (ServerPacket.field3048 == var1.serverPacket) { // L: 6300 - var20 = var3.method7715(); // L: 6301 - if (var20 == 65535) { // L: 6302 - var20 = -1; - } - - SoundCache.playSong(var20); // L: 6303 - var1.serverPacket = null; // L: 6304 - return true; // L: 6305 - } - - if (ServerPacket.field3045 == var1.serverPacket) { // L: 6307 - var20 = var3.method7793(); // L: 6308 - var5 = var3.method7715(); // L: 6309 - if (var5 == 65535) { // L: 6310 - var5 = -1; - } - - Players.method2419(var5, var20); // L: 6311 - var1.serverPacket = null; // L: 6312 - return true; // L: 6313 - } - - if (ServerPacket.field3094 == var1.serverPacket) { // L: 6315 - HorizontalAlignment.field1885 = null; // L: 6316 - var1.serverPacket = null; // L: 6317 - return true; // L: 6318 - } - - if (ServerPacket.field3031 == var1.serverPacket) { // L: 6320 - var20 = var3.method7827(); // L: 6321 - var5 = var3.readUnsignedShort(); // L: 6322 - Varps.Varps_temp[var5] = var20; // L: 6323 - if (Varps.Varps_main[var5] != var20) { // L: 6324 - Varps.Varps_main[var5] = var20; // L: 6325 - } - - WorldMapLabel.changeGameOptions(var5); // L: 6327 - changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 6328 - var1.serverPacket = null; // L: 6329 - return true; // L: 6330 - } - - if (ServerPacket.field3080 == var1.serverPacket) { // L: 6332 - HorizontalAlignment.field1885 = new class391(DirectByteArrayCopier.HitSplatDefinition_cached); // L: 6333 - var1.serverPacket = null; // L: 6334 - return true; // L: 6335 - } - - if (ServerPacket.field3036 == var1.serverPacket) { // L: 6337 - ClanMate.method6700(class263.field3012); // L: 6338 - var1.serverPacket = null; // L: 6339 - return true; // L: 6340 - } - - if (ServerPacket.field3074 == var1.serverPacket) { // L: 6342 - var20 = var3.readInt(); // L: 6343 - var5 = var3.readUnsignedShort(); // L: 6344 - if (var20 < -70000) { // L: 6345 - var5 += 32768; - } - - if (var20 >= 0) { // L: 6347 - var74 = class127.getWidget(var20); + int var16; + byte var20; + String var25; + if (ServerPacket.field3103 == var1.serverPacket) { // L: 6215 + var20 = var3.readByte(); // L: 6216 + var21 = var3.readStringCp1252NullTerminated(); // L: 6217 + long var23 = (long)var3.readUnsignedShort(); // L: 6218 + long var8 = (long)var3.readMedium(); // L: 6219 + PlayerType var59 = (PlayerType)class291.findEnumerated(class118.PlayerType_values(), var3.readUnsignedByte()); // L: 6220 + long var11 = var8 + (var23 << 32); // L: 6221 + boolean var64 = false; // L: 6222 + var14 = null; // L: 6223 + ClanChannel var66 = var20 >= 0 ? currentClanChannels[var20] : UserComparator10.guestClanChannel; // L: 6225 + if (var66 == null) { // L: 6226 + var64 = true; // L: 6227 } else { - var74 = null; // L: 6348 - } + var15 = 0; - if (var74 != null) { // L: 6349 - for (var22 = 0; var22 < var74.itemIds.length; ++var22) { // L: 6350 - var74.itemIds[var22] = 0; // L: 6351 - var74.itemQuantities[var22] = 0; // L: 6352 + while (true) { + if (var15 >= 100) { + if (var59.isUser && BufferedSource.friendSystem.isIgnored(new Username(var21, class391.loginType))) { // L: 6236 6237 + var64 = true; + } + break; + } + + if (crossWorldMessageIds[var15] == var11) { // L: 6231 + var64 = true; // L: 6232 + break; // L: 6233 + } + + ++var15; // L: 6230 } } - WorldMapSection1.clearItemContainer(var5); // L: 6355 - var22 = var3.readUnsignedShort(); // L: 6356 - - for (var8 = 0; var8 < var22; ++var8) { // L: 6357 - var61 = var3.readUnsignedShort(); // L: 6358 - var62 = var3.method7875(); // L: 6359 - if (var62 == 255) { // L: 6360 - var62 = var3.readInt(); - } - - if (var74 != null && var8 < var74.itemIds.length) { // L: 6361 6362 - var74.itemIds[var8] = var61; // L: 6363 - var74.itemQuantities[var8] = var62; // L: 6364 - } - - ChatChannel.itemContainerSetItem(var5, var8, var61 - 1, var62); // L: 6367 - } - - if (var74 != null) { // L: 6369 - class346.invalidateWidget(var74); - } - - class143.method3072(); // L: 6370 - changedItemContainers[++field695 - 1 & 31] = var5 & 32767; // L: 6371 - var1.serverPacket = null; // L: 6372 - return true; // L: 6373 - } - - if (ServerPacket.field3058 == var1.serverPacket) { // L: 6375 - var52 = var3.readStringCp1252NullTerminated(); // L: 6376 - Object[] var79 = new Object[var52.length() + 1]; // L: 6377 - - for (var6 = var52.length() - 1; var6 >= 0; --var6) { // L: 6378 - if (var52.charAt(var6) == 's') { // L: 6379 - var79[var6 + 1] = var3.readStringCp1252NullTerminated(); + if (!var64) { // L: 6240 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var11; // L: 6241 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6242 + var25 = AbstractFont.escapeBrackets(LoginPacket.method5025(var3)); // L: 6243 + var16 = var20 >= 0 ? 41 : 44; // L: 6244 + if (var59.modIcon != -1) { // L: 6245 + UserComparator7.addChatMessage(var16, StudioGame.method5590(var59.modIcon) + var21, var25, var66.name); } else { - var79[var6 + 1] = new Integer(var3.readInt()); // L: 6380 + UserComparator7.addChatMessage(var16, var21, var25, var66.name); // L: 6246 } } - var79[0] = new Integer(var3.readInt()); // L: 6382 - ScriptEvent var88 = new ScriptEvent(); // L: 6383 - var88.args = var79; // L: 6384 - ClanSettings.runScriptEvent(var88); // L: 6385 - var1.serverPacket = null; // L: 6386 - return true; // L: 6387 + var1.serverPacket = null; // L: 6248 + return true; // L: 6249 } - if (ServerPacket.field3110 == var1.serverPacket) { // L: 6389 - var20 = var3.method7837(); // L: 6390 - var5 = var3.method7714(); // L: 6391 - var74 = class127.getWidget(var20); // L: 6392 - if (var74 != null && var74.type == 0) { // L: 6393 - if (var5 > var74.scrollHeight - var74.height) { // L: 6394 - var5 = var74.scrollHeight - var74.height; + if (ServerPacket.field3155 == var1.serverPacket) { // L: 6251 + var67 = var3.readUnsignedByte(); // L: 6252 + class193.method3800(var67); // L: 6253 + var1.serverPacket = null; // L: 6254 + return true; // L: 6255 + } + + if (ServerPacket.field3122 == var1.serverPacket) { // L: 6257 + UserComparator8.field1378 = null; // L: 6258 + var1.serverPacket = null; // L: 6259 + return true; // L: 6260 + } + + Widget var55; + if (ServerPacket.field3174 == var1.serverPacket) { // L: 6262 + var67 = var3.method7576(); // L: 6263 + if (var67 == 65535) { // L: 6264 + var67 = -1; + } + + var5 = var3.method7701(); // L: 6265 + var6 = var3.method7701(); // L: 6266 + var55 = class92.getWidget(var6); // L: 6267 + ItemComposition var81; + if (!var55.isIf3) { // L: 6268 + if (var67 == -1) { // L: 6269 + var55.modelType = 0; // L: 6270 + var1.serverPacket = null; // L: 6271 + return true; // L: 6272 } - if (var5 < 0) { // L: 6395 - var5 = 0; + var81 = FileSystem.ItemDefinition_get(var67); // L: 6274 + var55.modelType = 4; // L: 6275 + var55.modelId = var67; // L: 6276 + var55.modelAngleX = var81.xan2d; // L: 6277 + var55.modelAngleY = var81.yan2d; // L: 6278 + var55.modelZoom = var81.zoom2d * 100 / var5; // L: 6279 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var55); // L: 6280 + } else { + var55.itemId = var67; // L: 6283 + var55.itemQuantity = var5; // L: 6284 + var81 = FileSystem.ItemDefinition_get(var67); // L: 6285 + var55.modelAngleX = var81.xan2d; // L: 6286 + var55.modelAngleY = var81.yan2d; // L: 6287 + var55.modelAngleZ = var81.zan2d; // L: 6288 + var55.modelOffsetX = var81.offsetX2d; // L: 6289 + var55.modelOffsetY = var81.offsetY2d; // L: 6290 + var55.modelZoom = var81.zoom2d; // L: 6291 + if (var81.isStackable == 1) { // L: 6292 + var55.itemQuantityMode = 1; + } else { + var55.itemQuantityMode = 2; // L: 6293 } - if (var5 != var74.scrollY) { // L: 6396 - var74.scrollY = var5; // L: 6397 - class346.invalidateWidget(var74); // L: 6398 + if (var55.field3406 > 0) { // L: 6294 + var55.modelZoom = var55.modelZoom * 32 / var55.field3406; + } else if (var55.rawWidth > 0) { // L: 6295 + var55.modelZoom = var55.modelZoom * 32 / var55.rawWidth; + } + + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var55); // L: 6296 + } + + var1.serverPacket = null; // L: 6298 + return true; // L: 6299 + } + + if (ServerPacket.field3091 == var1.serverPacket) { // L: 6301 + class145.field1690 = var3.method7546(); // L: 6302 + class321.field4076 = var3.readUnsignedByte(); // L: 6303 + + while (var3.offset < var1.serverPacketLength) { // L: 6304 + var67 = var3.readUnsignedByte(); // L: 6305 + class263 var78 = class194.method3807()[var67]; // L: 6306 + Occluder.method4222(var78); // L: 6307 + } + + var1.serverPacket = null; // L: 6309 + return true; // L: 6310 + } + + if (ServerPacket.field3095 == var1.serverPacket) { // L: 6312 + PendingSpawn.readReflectionCheck(var3, var1.serverPacketLength); // L: 6313 + var1.serverPacket = null; // L: 6314 + return true; // L: 6315 + } + + int var9; + int var27; + int var28; + int var29; + int var86; + if (ServerPacket.field3158 == var1.serverPacket) { // L: 6317 + var6 = var3.readMedium(); // L: 6326 + var67 = var6 >> 16; // L: 6327 + var5 = var6 >> 8 & 255; // L: 6328 + var27 = var67 + (var6 >> 4 & 7); // L: 6329 + var28 = var5 + (var6 & 7); // L: 6330 + var9 = var3.readUnsignedShort(); // L: 6331 + var29 = var3.method7593(); // L: 6332 + var86 = var3.method7716(); // L: 6333 + if (var27 >= 0 && var28 >= 0 && var27 < 104 && var28 < 104) { // L: 6334 + var27 = var27 * 128 + 64; // L: 6335 + var28 = var28 * 128 + 64; // L: 6336 + GraphicsObject var60 = new GraphicsObject(var9, class128.Client_plane, var27, var28, class202.getTileHeight(var27, var28, class128.Client_plane) - var29, var86, cycle); // L: 6337 + graphicsObjects.addFirst(var60); // L: 6338 + } + + var1.serverPacket = null; // L: 6340 + return true; // L: 6341 + } + + if (ServerPacket.field3182 == var1.serverPacket) { // L: 6343 + var67 = var3.readInt(); // L: 6344 + InterfaceParent var77 = (InterfaceParent)interfaceParents.get((long)var67); // L: 6345 + if (var77 != null) { // L: 6346 + NetSocket.closeInterface(var77, true); + } + + if (meslayerContinueWidget != null) { // L: 6347 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(meslayerContinueWidget); // L: 6348 + meslayerContinueWidget = null; // L: 6349 + } + + var1.serverPacket = null; // L: 6351 + return true; // L: 6352 + } + + if (ServerPacket.field3098 == var1.serverPacket) { // L: 6354 + var20 = var3.readByte(); // L: 6355 + var5 = var3.method7576(); // L: 6356 + Varps.Varps_temp[var5] = var20; // L: 6357 + if (Varps.Varps_main[var5] != var20) { // L: 6358 + Varps.Varps_main[var5] = var20; // L: 6359 + } + + class321.changeGameOptions(var5); // L: 6361 + changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 6362 + var1.serverPacket = null; // L: 6363 + return true; // L: 6364 + } + + if (ServerPacket.field3165 == var1.serverPacket) { // L: 6366 + var67 = var3.method7554(); // L: 6367 + if (var67 == 65535) { // L: 6368 + var67 = -1; + } + + WorldMapIcon_0.playSong(var67); // L: 6369 + var1.serverPacket = null; // L: 6370 + return true; // L: 6371 + } + + if (ServerPacket.field3096 == var1.serverPacket) { // L: 6373 + var67 = var3.readUnsignedShort(); // L: 6374 + if (var67 == 65535) { // L: 6375 + var67 = -1; + } + + var5 = var3.method7503(); // L: 6376 + class306.method5593(var67, var5); // L: 6377 + var1.serverPacket = null; // L: 6378 + return true; // L: 6379 + } + + if (ServerPacket.field3112 == var1.serverPacket) { // L: 6381 + class119.method2737(); // L: 6382 + var67 = var3.method7701(); // L: 6383 + var5 = var3.method7545(); // L: 6384 + var6 = var3.method7545(); // L: 6385 + experience[var5] = var67; // L: 6386 + currentLevels[var5] = var6; // L: 6387 + levels[var5] = 1; // L: 6388 + + for (var27 = 0; var27 < 98; ++var27) { // L: 6389 + if (var67 >= Skills.Skills_experienceTable[var27]) { + levels[var5] = var27 + 2; } } - var1.serverPacket = null; // L: 6401 - return true; // L: 6402 + changedSkills[++changedSkillsCount - 1 & 31] = var5; // L: 6390 + var1.serverPacket = null; // L: 6391 + return true; // L: 6392 } - if (ServerPacket.field3091 == var1.serverPacket) { // L: 6404 - if (rootInterface != -1) { // L: 6405 - MouseRecorder.runIntfCloseListeners(rootInterface, 0); + boolean var84; + if (ServerPacket.field3140 == var1.serverPacket) { // L: 6394 + var84 = var3.readBoolean(); // L: 6395 + if (var84) { // L: 6396 + if (class127.field1570 == null) { // L: 6397 + class127.field1570 = new class326(); + } + } else { + class127.field1570 = null; // L: 6399 } - var1.serverPacket = null; // L: 6406 - return true; // L: 6407 + var1.serverPacket = null; // L: 6400 + return true; // L: 6401 } - if (ServerPacket.field3061 == var1.serverPacket) { // L: 6409 - class431.field4602 = true; // L: 6410 - WorldMapSection1.updateNpcs(true, var3); // L: 6411 + String var48; + if (ServerPacket.field3163 == var1.serverPacket) { // L: 6403 + var48 = var3.readStringCp1252NullTerminated(); // L: 6404 + var21 = AbstractFont.escapeBrackets(WorldMapManager.method4679(LoginPacket.method5025(var3))); // L: 6405 + WorldMapEvent.addGameMessage(6, var48, var21); // L: 6406 + var1.serverPacket = null; // L: 6407 + return true; // L: 6408 + } + + if (ServerPacket.field3166 == var1.serverPacket) { // L: 6410 + class144.loadRegions(false, var1.packetBuffer); // L: 6411 var1.serverPacket = null; // L: 6412 return true; // L: 6413 } - if (ServerPacket.field3085 == var1.serverPacket) { // L: 6415 - isCameraLocked = false; // L: 6416 - - for (var20 = 0; var20 < 5; ++var20) { // L: 6417 - field546[var20] = false; - } - - var1.serverPacket = null; // L: 6418 - return true; // L: 6419 + if (ServerPacket.field3162 == var1.serverPacket) { // L: 6415 + Occluder.method4222(class263.field3058); // L: 6416 + var1.serverPacket = null; // L: 6417 + return true; // L: 6418 } - String var23; - boolean var56; - if (ServerPacket.field3062 == var1.serverPacket) { // L: 6421 - var20 = var3.readUShortSmart(); // L: 6422 - var56 = var3.readUnsignedByte() == 1; // L: 6423 - var23 = ""; // L: 6424 - boolean var85 = false; // L: 6425 - if (var56) { // L: 6426 - var23 = var3.readStringCp1252NullTerminated(); // L: 6427 - if (Decimator.friendSystem.isIgnored(new Username(var23, class122.loginType))) { // L: 6428 - var85 = true; - } + if (ServerPacket.field3147 == var1.serverPacket) { // L: 6420 + isCameraLocked = false; // L: 6421 + + for (var67 = 0; var67 < 5; ++var67) { // L: 6422 + field743[var67] = false; } - String var86 = var3.readStringCp1252NullTerminated(); // L: 6430 - if (!var85) { // L: 6431 - Actor.addGameMessage(var20, var23, var86); - } - - var1.serverPacket = null; // L: 6432 - return true; // L: 6433 + var1.serverPacket = null; // L: 6423 + return true; // L: 6424 } - if (ServerPacket.field3112 == var1.serverPacket) { // L: 6435 - class119.method2760(var3.readStringCp1252NullTerminated()); // L: 6436 + if (ServerPacket.field3186 == var1.serverPacket) { // L: 6426 + var67 = var3.readInt(); // L: 6427 + var5 = var3.readInt(); // L: 6428 + var6 = class17.getGcDuration(); // L: 6429 + PacketBufferNode var58 = WallDecoration.getPacketBufferNode(ClientPacket.field3053, packetWriter.isaacCipher); // L: 6431 + var58.packetBuffer.method7565(var67); // L: 6432 + var58.packetBuffer.method7565(var5); // L: 6433 + var58.packetBuffer.method7596(GameEngine.fps); // L: 6434 + var58.packetBuffer.method7596(var6); // L: 6435 + packetWriter.addNode(var58); // L: 6436 var1.serverPacket = null; // L: 6437 return true; // L: 6438 } - if (ServerPacket.field3107 == var1.serverPacket) { // L: 6440 - if (var1.serverPacketLength == 0) { // L: 6441 - ClientPacket.friendsChat = null; // L: 6442 - } else { - if (ClientPacket.friendsChat == null) { // L: 6445 - ClientPacket.friendsChat = new FriendsChat(class122.loginType, class127.client); // L: 6446 - } + if (ServerPacket.field3169 == var1.serverPacket) { // L: 6440 + Occluder.method4222(class263.field3059); // L: 6441 + var1.serverPacket = null; // L: 6442 + return true; // L: 6443 + } - ClientPacket.friendsChat.readUpdate(var3); // L: 6448 + if (ServerPacket.field3177 == var1.serverPacket) { // L: 6445 + Occluder.method4222(class263.field3067); // L: 6446 + var1.serverPacket = null; // L: 6447 + return true; // L: 6448 + } + + if (ServerPacket.field3134 == var1.serverPacket) { // L: 6450 + var84 = var3.method7593() == 1; // L: 6451 + var5 = var3.method7567(); // L: 6452 + var22 = class92.getWidget(var5); // L: 6453 + if (var84 != var22.isHidden) { // L: 6454 + var22.isHidden = var84; // L: 6455 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var22); // L: 6456 } - SecureRandomCallable.method2050(); // L: 6450 - var1.serverPacket = null; // L: 6451 - return true; // L: 6452 + var1.serverPacket = null; // L: 6458 + return true; // L: 6459 } - if (ServerPacket.field3032 == var1.serverPacket) { // L: 6454 - ClanMate.method6700(class263.field3013); // L: 6455 - var1.serverPacket = null; // L: 6456 - return true; // L: 6457 - } + if (ServerPacket.field3132 == var1.serverPacket && isCameraLocked) { // L: 6461 6462 + field742 = true; // L: 6463 + class229.field2805 = var3.readUnsignedByte(); // L: 6464 + HitSplatDefinition.field2077 = var3.readUnsignedByte(); // L: 6465 + class17.field88 = var3.readUnsignedByte(); // L: 6466 + PacketBufferNode.field3083 = var3.readUnsignedByte(); // L: 6467 - if (ServerPacket.field3037 == var1.serverPacket) { // L: 6459 - var20 = var3.method7705(); // L: 6460 - var21 = var3.readStringCp1252NullTerminated(); // L: 6461 - var74 = class127.getWidget(var20); // L: 6462 - if (!var21.equals(var74.text)) { // L: 6463 - var74.text = var21; // L: 6464 - class346.invalidateWidget(var74); // L: 6465 + for (var67 = 0; var67 < 5; ++var67) { // L: 6468 + field743[var67] = false; } - var1.serverPacket = null; // L: 6467 - return true; // L: 6468 + var1.serverPacket = null; // L: 6469 + return true; // L: 6470 } - if (ServerPacket.field3128 == var1.serverPacket) { // L: 6470 - hintArrowType = var3.readUnsignedByte(); // L: 6471 - if (hintArrowType == 1) { // L: 6472 - hintArrowNpcIndex = var3.readUnsignedShort(); + String var76; + if (ServerPacket.field3184 == var1.serverPacket) { // L: 6473 + byte[] var52 = new byte[var1.serverPacketLength]; // L: 6474 + var3.method7460(var52, 0, var52.length); // L: 6475 + Buffer var75 = new Buffer(var52); // L: 6476 + var76 = var75.readStringCp1252NullTerminated(); // L: 6477 + ScriptEvent.openURL(var76, true, false); // L: 6478 + var1.serverPacket = null; // L: 6479 + return true; // L: 6480 + } + + if (ServerPacket.field3084 == var1.serverPacket) { // L: 6482 + if (PcmPlayer.friendsChat != null) { // L: 6483 + PcmPlayer.friendsChat.method6463(var3); // L: 6484 } - if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 6473 - if (hintArrowType == 2) { // L: 6474 - hintArrowSubX = 64; // L: 6475 - hintArrowSubY = 64; // L: 6476 - } - - if (hintArrowType == 3) { // L: 6478 - hintArrowSubX = 0; // L: 6479 - hintArrowSubY = 64; // L: 6480 - } - - if (hintArrowType == 4) { // L: 6482 - hintArrowSubX = 128; // L: 6483 - hintArrowSubY = 64; // L: 6484 - } - - if (hintArrowType == 5) { // L: 6486 - hintArrowSubX = 64; // L: 6487 - hintArrowSubY = 0; // L: 6488 - } - - if (hintArrowType == 6) { // L: 6490 - hintArrowSubX = 64; // L: 6491 - hintArrowSubY = 128; // L: 6492 - } - - hintArrowType = 2; // L: 6494 - hintArrowX = var3.readUnsignedShort(); // L: 6495 - hintArrowY = var3.readUnsignedShort(); // L: 6496 - hintArrowHeight = var3.readUnsignedByte(); // L: 6497 - } - - if (hintArrowType == 10) { // L: 6499 - hintArrowPlayerIndex = var3.readUnsignedShort(); - } - - var1.serverPacket = null; // L: 6500 - return true; // L: 6501 + class194.method3804(); // L: 6486 + var1.serverPacket = null; // L: 6487 + return true; // L: 6488 } - if (ServerPacket.field3063 == var1.serverPacket) { // L: 6503 - ClanMate.method6700(class263.field3004); // L: 6504 - var1.serverPacket = null; // L: 6505 - return true; // L: 6506 + if (ServerPacket.field3187 == var1.serverPacket) { // L: 6490 + class393.field4428 = true; // L: 6491 + HorizontalAlignment.updateNpcs(false, var3); // L: 6492 + var1.serverPacket = null; // L: 6493 + return true; // L: 6494 } - if (ServerPacket.field3057 == var1.serverPacket) { // L: 6508 - World var53 = new World(); // L: 6509 - var53.host = var3.readStringCp1252NullTerminated(); // L: 6510 - var53.id = var3.readUnsignedShort(); // L: 6511 - var5 = var3.readInt(); // L: 6512 - var53.properties = var5; // L: 6513 - Decimator.updateGameState(45); // L: 6514 - var2.close(); // L: 6515 - var2 = null; // L: 6516 - PlatformInfo.changeWorld(var53); // L: 6517 - var1.serverPacket = null; // L: 6518 - return false; // L: 6519 - } - - if (ServerPacket.field3081 == var1.serverPacket) { // L: 6521 - minimapState = var3.readUnsignedByte(); // L: 6522 - var1.serverPacket = null; // L: 6523 - return true; // L: 6524 - } - - if (ServerPacket.field3077 == var1.serverPacket) { // L: 6526 - var20 = var3.readUnsignedByte(); // L: 6527 - var5 = var3.readUnsignedByte(); // L: 6528 - var6 = var3.readUnsignedByte(); // L: 6529 - var22 = var3.readUnsignedByte(); // L: 6530 - field546[var20] = true; // L: 6531 - field756[var20] = var5; // L: 6532 - field636[var20] = var6; // L: 6533 - field674[var20] = var22; // L: 6534 - field600[var20] = 0; // L: 6535 - var1.serverPacket = null; // L: 6536 - return true; // L: 6537 - } - - if (ServerPacket.field3075 == var1.serverPacket) { // L: 6539 - class143.method3072(); // L: 6540 - weight = var3.readShort(); // L: 6541 - field707 = cycleCntr; // L: 6542 - var1.serverPacket = null; // L: 6543 - return true; // L: 6544 - } - - byte var72; - if (ServerPacket.field3043 == var1.serverPacket) { // L: 6546 - field755 = cycleCntr; // L: 6547 - var72 = var3.readByte(); // L: 6548 - class145 var77 = new class145(var3); // L: 6549 - ClanChannel var87; - if (var72 >= 0) { // L: 6551 - var87 = currentClanChannels[var72]; - } else { - var87 = class21.guestClanChannel; // L: 6552 - } - - var77.method3086(var87); // L: 6553 - var1.serverPacket = null; // L: 6554 - return true; // L: 6555 - } - - NPC var57; - if (ServerPacket.field3121 == var1.serverPacket) { // L: 6557 - var6 = var3.method7773(); // L: 6561 - var20 = var3.method7715(); // L: 6562 - var5 = var3.method7714(); // L: 6563 - if (var5 == 65535) { // L: 6564 - var5 = -1; // L: 6565 - } - - var57 = npcs[var20]; // L: 6567 - if (var57 != null) { // L: 6568 - if (var5 == var57.sequence && var5 != -1) { // L: 6569 - var8 = class163.SequenceDefinition_get(var5).field2161; // L: 6570 - if (var8 == 1) { // L: 6571 - var57.sequenceFrame = 0; // L: 6572 - var57.sequenceFrameCycle = 0; // L: 6573 - var57.sequenceDelay = var6; // L: 6574 - var57.field1152 = 0; // L: 6575 - } else if (var8 == 2) { // L: 6577 - var57.field1152 = 0; // L: 6578 - } - } else if (var5 == -1 || var57.sequence == -1 || class163.SequenceDefinition_get(var5).field2155 >= class163.SequenceDefinition_get(var57.sequence).field2155) { // L: 6581 - var57.sequence = var5; // L: 6582 - var57.sequenceFrame = 0; // L: 6583 - var57.sequenceFrameCycle = 0; // L: 6584 - var57.sequenceDelay = var6; // L: 6585 - var57.field1152 = 0; // L: 6586 - var57.field1170 = var57.pathLength; // L: 6587 + if (ServerPacket.field3152 == var1.serverPacket) { // L: 6496 + for (var67 = 0; var67 < players.length; ++var67) { // L: 6497 + if (players[var67] != null) { // L: 6498 + players[var67].sequence = -1; } } - var1.serverPacket = null; // L: 6591 - return true; // L: 6592 - } - - if (ServerPacket.field3042 == var1.serverPacket) { // L: 6594 - class426.method7546(); // L: 6595 - var72 = var3.readByte(); // L: 6596 - class131 var75 = new class131(var3); // L: 6597 - ClanSettings var83; - if (var72 >= 0) { // L: 6599 - var83 = currentClanSettings[var72]; - } else { - var83 = class154.guestClanSettings; // L: 6600 - } - - var75.method2873(var83); // L: 6601 - var1.serverPacket = null; // L: 6602 - return true; // L: 6603 - } - - if (ServerPacket.field3083 == var1.serverPacket) { // L: 6605 - var20 = var3.readUnsignedByte(); // L: 6606 - var21 = var3.readStringCp1252NullTerminated(); // L: 6607 - var6 = var3.method7875(); // L: 6608 - if (var20 >= 1 && var20 <= 8) { // L: 6609 - if (var21.equalsIgnoreCase("null")) { // L: 6610 - var21 = null; - } - - playerMenuActions[var20 - 1] = var21; // L: 6611 - playerOptionsPriorities[var20 - 1] = var6 == 0; // L: 6612 - } - - var1.serverPacket = null; // L: 6614 - return true; // L: 6615 - } - - if (ServerPacket.field3096 == var1.serverPacket) { // L: 6617 - ClanMate.method6700(class263.field3005); // L: 6618 - var1.serverPacket = null; // L: 6619 - return true; // L: 6620 - } - - long var26; - long var28; - long var30; - String var32; - int var33; - if (ServerPacket.field3067 == var1.serverPacket) { // L: 6622 - var72 = var3.readByte(); // L: 6623 - var26 = (long)var3.readUnsignedShort(); // L: 6624 - var28 = (long)var3.readMedium(); // L: 6625 - var30 = (var26 << 32) + var28; // L: 6626 - boolean var63 = false; // L: 6627 - ClanChannel var12 = var72 >= 0 ? currentClanChannels[var72] : class21.guestClanChannel; // L: 6628 - if (var12 == null) { // L: 6629 - var63 = true; - } else { - for (var13 = 0; var13 < 100; ++var13) { // L: 6631 - if (var30 == crossWorldMessageIds[var13]) { // L: 6632 - var63 = true; // L: 6633 - break; // L: 6634 - } + for (var67 = 0; var67 < npcs.length; ++var67) { // L: 6500 + if (npcs[var67] != null) { // L: 6501 + npcs[var67].sequence = -1; } } - if (!var63) { // L: 6638 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var30; // L: 6639 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6640 - var32 = class193.method3883(var3); // L: 6641 - var33 = var72 >= 0 ? 43 : 46; // L: 6642 - class301.addChatMessage(var33, "", var32, var12.name); // L: 6643 - } - - var1.serverPacket = null; // L: 6645 - return true; // L: 6646 + var1.serverPacket = null; // L: 6503 + return true; // L: 6504 } - InterfaceParent var7; - long var35; - if (ServerPacket.field3068 == var1.serverPacket) { // L: 6648 - var20 = var3.offset + var1.serverPacketLength; // L: 6649 - var5 = var3.readUnsignedShort(); // L: 6650 - var6 = var3.readUnsignedShort(); // L: 6651 - if (var5 != rootInterface) { // L: 6652 - rootInterface = var5; // L: 6653 - this.resizeRoot(false); // L: 6654 - class29.Widget_resetModelFrames(rootInterface); // L: 6655 - class145.runWidgetOnLoadListener(rootInterface); // L: 6656 + if (ServerPacket.field3157 == var1.serverPacket) { // L: 6506 + var67 = var3.method7554(); // L: 6507 + var5 = var3.readInt(); // L: 6508 + var6 = var3.method7716(); // L: 6509 + var55 = class92.getWidget(var5); // L: 6510 + var55.field3451 = var6 + (var67 << 16); // L: 6511 + var1.serverPacket = null; // L: 6512 + return true; // L: 6513 + } - for (var22 = 0; var22 < 100; ++var22) { // L: 6657 - field715[var22] = true; + if (ServerPacket.field3097 == var1.serverPacket) { // L: 6515 + var67 = var3.method7568(); // L: 6516 + var5 = var3.method7716(); // L: 6517 + var22 = class92.getWidget(var67); // L: 6518 + if (var22 != null && var22.type == 0) { // L: 6519 + if (var5 > var22.scrollHeight - var22.height) { // L: 6520 + var5 = var22.scrollHeight - var22.height; + } + + if (var5 < 0) { // L: 6521 + var5 = 0; + } + + if (var5 != var22.scrollY) { // L: 6522 + var22.scrollY = var5; // L: 6523 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var22); // L: 6524 } } - InterfaceParent var91; - for (; var6-- > 0; var91.field1028 = true) { // L: 6659 6669 - var22 = var3.readInt(); // L: 6660 - var8 = var3.readUnsignedShort(); // L: 6661 - var61 = var3.readUnsignedByte(); // L: 6662 - var91 = (InterfaceParent)interfaceParents.get((long)var22); // L: 6663 - if (var91 != null && var8 != var91.group) { // L: 6664 - Script.closeInterface(var91, true); // L: 6665 - var91 = null; // L: 6666 - } + var1.serverPacket = null; // L: 6527 + return true; // L: 6528 + } - if (var91 == null) { // L: 6668 - var91 = class4.method16(var22, var8, var61); - } + if (ServerPacket.field3116 == var1.serverPacket) { // L: 6530 + if (UserComparator8.field1378 == null) { // L: 6531 + UserComparator8.field1378 = new class392(class221.HitSplatDefinition_cached); } - for (var7 = (InterfaceParent)interfaceParents.first(); var7 != null; var7 = (InterfaceParent)interfaceParents.next()) { // L: 6671 - if (var7.field1028) { // L: 6672 - var7.field1028 = false; + class447 var51 = class221.HitSplatDefinition_cached.method6920(var3); // L: 6532 + UserComparator8.field1378.field4427.vmethod7295(var51.field4741, var51.field4742); // L: 6533 + field686[++field687 - 1 & 31] = var51.field4741; // L: 6534 + var1.serverPacket = null; // L: 6535 + return true; // L: 6536 + } + + if (ServerPacket.field3089 == var1.serverPacket) { // L: 6538 + var48 = var3.readStringCp1252NullTerminated(); // L: 6539 + Object[] var74 = new Object[var48.length() + 1]; // L: 6540 + + for (var6 = var48.length() - 1; var6 >= 0; --var6) { // L: 6541 + if (var48.charAt(var6) == 's') { // L: 6542 + var74[var6 + 1] = var3.readStringCp1252NullTerminated(); } else { - Script.closeInterface(var7, true); // L: 6674 + var74[var6 + 1] = new Integer(var3.readInt()); // L: 6543 } } - widgetFlags = new NodeHashTable(512); // L: 6677 - - while (var3.offset < var20) { // L: 6678 - var22 = var3.readInt(); // L: 6679 - var8 = var3.readUnsignedShort(); // L: 6680 - var61 = var3.readUnsignedShort(); // L: 6681 - var62 = var3.readInt(); // L: 6682 - - for (var11 = var8; var11 <= var61; ++var11) { // L: 6683 - var35 = (long)var11 + ((long)var22 << 32); // L: 6684 - widgetFlags.put(new IntegerNode(var62), var35); // L: 6685 - } - } - - var1.serverPacket = null; // L: 6688 - return true; // L: 6689 + var74[0] = new Integer(var3.readInt()); // L: 6545 + ScriptEvent var83 = new ScriptEvent(); // L: 6546 + var83.args = var74; // L: 6547 + class144.runScriptEvent(var83); // L: 6548 + var1.serverPacket = null; // L: 6549 + return true; // L: 6550 } - if (ServerPacket.field3025 == var1.serverPacket) { // L: 6691 - GameEngine.privateChatMode = class166.method3343(var3.readUnsignedByte()); // L: 6692 - var1.serverPacket = null; // L: 6693 - return true; // L: 6694 + if (ServerPacket.field3090 == var1.serverPacket) { // L: 6552 + class119.method2737(); // L: 6553 + weight = var3.readShort(); // L: 6554 + field695 = cycleCntr; // L: 6555 + var1.serverPacket = null; // L: 6556 + return true; // L: 6557 } - if (ServerPacket.field3026 == var1.serverPacket) { // L: 6696 - WorldMapSection1.updateNpcs(true, var3); // L: 6697 - var1.serverPacket = null; // L: 6698 - return true; // L: 6699 + if (ServerPacket.field3175 == var1.serverPacket) { // L: 6559 + Occluder.method4222(class263.field3066); // L: 6560 + var1.serverPacket = null; // L: 6561 + return true; // L: 6562 } - Widget var25; - if (ServerPacket.field3097 == var1.serverPacket) { // L: 6701 - var20 = var3.method7705(); // L: 6702 - var5 = var3.method7827(); // L: 6703 - InterfaceParent var81 = (InterfaceParent)interfaceParents.get((long)var20); // L: 6704 - var7 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6705 - if (var7 != null) { // L: 6706 - Script.closeInterface(var7, var81 == null || var7.group != var81.group); - } - - if (var81 != null) { // L: 6707 - var81.remove(); // L: 6708 - interfaceParents.put(var81, (long)var5); // L: 6709 - } - - var25 = class127.getWidget(var20); // L: 6711 - if (var25 != null) { // L: 6712 - class346.invalidateWidget(var25); - } - - var25 = class127.getWidget(var5); // L: 6713 - if (var25 != null) { // L: 6714 - class346.invalidateWidget(var25); // L: 6715 - AbstractByteArrayCopier.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var25.id >>> 16], var25, true); // L: 6716 - } - - if (rootInterface != -1) { // L: 6718 - MouseRecorder.runIntfCloseListeners(rootInterface, 1); - } - - var1.serverPacket = null; // L: 6719 - return true; // L: 6720 + if (ServerPacket.field3150 == var1.serverPacket) { // L: 6564 + Occluder.method4222(class263.field3071); // L: 6565 + var1.serverPacket = null; // L: 6566 + return true; // L: 6567 } - if (ServerPacket.field3093 == var1.serverPacket) { // L: 6722 - ClanMate.method6700(class263.field3015); // L: 6723 - var1.serverPacket = null; // L: 6724 - return true; // L: 6725 - } - - if (ServerPacket.field3116 == var1.serverPacket) { // L: 6727 - var20 = var3.readInt(); // L: 6728 - if (var20 != field586) { // L: 6729 - field586 = var20; // L: 6730 - ObjectSound.method1757(); // L: 6731 - } - - var1.serverPacket = null; // L: 6733 - return true; // L: 6734 - } - - if (ServerPacket.field3082 == var1.serverPacket) { // L: 6736 - AbstractWorldMapData.readReflectionCheck(var3, var1.serverPacketLength); // L: 6737 - var1.serverPacket = null; // L: 6738 - return true; // L: 6739 - } - - boolean var78; - if (ServerPacket.field3027 == var1.serverPacket) { // L: 6741 - var78 = var3.readBoolean(); // L: 6742 - if (var78) { // L: 6743 - if (VarcInt.field1841 == null) { // L: 6744 - VarcInt.field1841 = new class326(); - } - } else { - VarcInt.field1841 = null; // L: 6746 - } - - var1.serverPacket = null; // L: 6747 - return true; // L: 6748 - } - - if (ServerPacket.field3054 == var1.serverPacket) { // L: 6750 - var20 = var3.method7713(); // L: 6751 - if (var20 == 65535) { // L: 6752 - var20 = -1; - } - - var5 = var3.method7837(); // L: 6753 - var6 = var3.method7827(); // L: 6754 - var60 = class127.getWidget(var6); // L: 6755 - ItemComposition var80; - if (!var60.isIf3) { // L: 6756 - if (var20 == -1) { // L: 6757 - var60.modelType = 0; // L: 6758 - var1.serverPacket = null; // L: 6759 - return true; // L: 6760 - } - - var80 = class19.ItemDefinition_get(var20); // L: 6762 - var60.modelType = 4; // L: 6763 - var60.modelId = var20; // L: 6764 - var60.modelAngleX = var80.xan2d; // L: 6765 - var60.modelAngleY = var80.yan2d; // L: 6766 - var60.modelZoom = var80.zoom2d * 100 / var5; // L: 6767 - class346.invalidateWidget(var60); // L: 6768 - } else { - var60.itemId = var20; // L: 6771 - var60.itemQuantity = var5; // L: 6772 - var80 = class19.ItemDefinition_get(var20); // L: 6773 - var60.modelAngleX = var80.xan2d; // L: 6774 - var60.modelAngleY = var80.yan2d; // L: 6775 - var60.modelAngleZ = var80.zan2d; // L: 6776 - var60.modelOffsetX = var80.offsetX2d; // L: 6777 - var60.modelOffsetY = var80.offsetY2d; // L: 6778 - var60.modelZoom = var80.zoom2d; // L: 6779 - if (var80.isStackable == 1) { // L: 6780 - var60.itemQuantityMode = 1; + if (ServerPacket.field3115 == var1.serverPacket) { // L: 6569 + field692 = cycleCntr; // L: 6570 + var20 = var3.readByte(); // L: 6571 + if (var1.serverPacketLength == 1) { // L: 6572 + if (var20 >= 0) { // L: 6573 + currentClanChannels[var20] = null; } else { - var60.itemQuantityMode = 2; // L: 6781 + UserComparator10.guestClanChannel = null; // L: 6574 } - if (var60.field3467 > 0) { // L: 6782 - var60.modelZoom = var60.modelZoom * 32 / var60.field3467; - } else if (var60.rawWidth > 0) { // L: 6783 - var60.modelZoom = var60.modelZoom * 32 / var60.rawWidth; + var1.serverPacket = null; // L: 6575 + return true; // L: 6576 + } + + if (var20 >= 0) { // L: 6578 + currentClanChannels[var20] = new ClanChannel(var3); // L: 6579 + } else { + UserComparator10.guestClanChannel = new ClanChannel(var3); // L: 6582 + } + + var1.serverPacket = null; // L: 6584 + return true; // L: 6585 + } + + if (ServerPacket.field3126 == var1.serverPacket) { // L: 6587 + var3.offset += 28; // L: 6588 + if (var3.checkCrc()) { // L: 6589 + ViewportMouse.method4374(var3, var3.offset - 28); + } + + var1.serverPacket = null; // L: 6590 + return true; // L: 6591 + } + + if (ServerPacket.field3183 == var1.serverPacket) { // L: 6593 + HorizontalAlignment.updateNpcs(false, var3); // L: 6594 + var1.serverPacket = null; // L: 6595 + return true; // L: 6596 + } + + if (ServerPacket.field3142 == var1.serverPacket) { // L: 6598 + var67 = var3.readInt(); // L: 6599 + var5 = var3.readUnsignedShort(); // L: 6600 + var22 = class92.getWidget(var67); // L: 6601 + if (var22.modelType != 2 || var5 != var22.modelId) { // L: 6602 + var22.modelType = 2; // L: 6603 + var22.modelId = var5; // L: 6604 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var22); // L: 6605 + } + + var1.serverPacket = null; // L: 6607 + return true; // L: 6608 + } + + int var13; + long var31; + long var33; + String var39; + if (ServerPacket.field3086 == var1.serverPacket) { // L: 6610 + var48 = var3.readStringCp1252NullTerminated(); // L: 6611 + var31 = (long)var3.readUnsignedShort(); // L: 6612 + var33 = (long)var3.readMedium(); // L: 6613 + PlayerType var35 = (PlayerType)class291.findEnumerated(class118.PlayerType_values(), var3.readUnsignedByte()); // L: 6614 + long var36 = var33 + (var31 << 32); // L: 6615 + boolean var87 = false; // L: 6616 + + for (var13 = 0; var13 < 100; ++var13) { // L: 6617 + if (var36 == crossWorldMessageIds[var13]) { // L: 6618 + var87 = true; // L: 6619 + break; // L: 6620 + } + } + + if (BufferedSource.friendSystem.isIgnored(new Username(var48, class391.loginType))) { // L: 6623 + var87 = true; + } + + if (!var87 && field606 == 0) { // L: 6624 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var36; // L: 6625 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6626 + var39 = AbstractFont.escapeBrackets(WorldMapManager.method4679(LoginPacket.method5025(var3))); // L: 6627 + byte var89; + if (var35.isPrivileged) { // L: 6629 + var89 = 7; + } else { + var89 = 3; // L: 6630 } - class346.invalidateWidget(var60); // L: 6784 + if (var35.modIcon != -1) { // L: 6631 + WorldMapEvent.addGameMessage(var89, StudioGame.method5590(var35.modIcon) + var48, var39); + } else { + WorldMapEvent.addGameMessage(var89, var48, var39); // L: 6632 + } } - var1.serverPacket = null; // L: 6786 - return true; // L: 6787 + var1.serverPacket = null; // L: 6634 + return true; // L: 6635 } - if (ServerPacket.field3102 == var1.serverPacket) { // L: 6789 - var20 = var3.readInt(); // L: 6790 - var5 = var3.readInt(); // L: 6791 - var6 = Tile.getGcDuration(); // L: 6792 - PacketBufferNode var59 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2983, packetWriter.isaacCipher); // L: 6794 - var59.packetBuffer.method7723(var20); // L: 6795 - var59.packetBuffer.method7721(var5); // L: 6796 - var59.packetBuffer.method7703(GameEngine.fps); // L: 6797 - var59.packetBuffer.method7703(var6); // L: 6798 - packetWriter.addNode(var59); // L: 6799 - var1.serverPacket = null; // L: 6800 - return true; // L: 6801 - } - - Widget var73; - if (ServerPacket.field3086 == var1.serverPacket) { // L: 6803 - var20 = var3.method7837(); // L: 6804 - var73 = class127.getWidget(var20); // L: 6805 - - for (var6 = 0; var6 < var73.itemIds.length; ++var6) { // L: 6806 - var73.itemIds[var6] = -1; // L: 6807 - var73.itemIds[var6] = 0; // L: 6808 + if (ServerPacket.field3087 == var1.serverPacket) { // L: 6637 + var67 = var3.readShort(); // L: 6638 + var5 = var3.readInt(); // L: 6639 + var22 = class92.getWidget(var5); // L: 6640 + if (var67 != var22.sequenceId || var67 == -1) { // L: 6641 + var22.sequenceId = var67; // L: 6642 + var22.modelFrame = 0; // L: 6643 + var22.modelFrameCycle = 0; // L: 6644 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var22); // L: 6645 } - class346.invalidateWidget(var73); // L: 6810 + var1.serverPacket = null; // L: 6647 + return true; // L: 6648 + } + + if (ServerPacket.field3119 == var1.serverPacket) { // L: 6650 + isCameraLocked = true; // L: 6651 + field742 = false; // L: 6652 + class267.field3206 = var3.readUnsignedByte(); // L: 6653 + AbstractWorldMapData.field2851 = var3.readUnsignedByte(); // L: 6654 + ScriptFrame.field457 = var3.readUnsignedShort(); // L: 6655 + class17.field88 = var3.readUnsignedByte(); // L: 6656 + PacketBufferNode.field3083 = var3.readUnsignedByte(); // L: 6657 + if (PacketBufferNode.field3083 >= 100) { // L: 6658 + var67 = class267.field3206 * 128 + 64; // L: 6659 + var5 = AbstractWorldMapData.field2851 * 128 + 64; // L: 6660 + var6 = class202.getTileHeight(var67, var5, class128.Client_plane) - ScriptFrame.field457; // L: 6661 + var27 = var67 - class343.cameraX; // L: 6662 + var28 = var6 - class295.cameraY; // L: 6663 + var9 = var5 - FaceNormal.cameraZ; // L: 6664 + var29 = (int)Math.sqrt((double)(var9 * var9 + var27 * var27)); // L: 6665 + GameEngine.cameraPitch = (int)(Math.atan2((double)var28, (double)var29) * 325.9490051269531D) & 2047; // L: 6666 + StudioGame.cameraYaw = (int)(Math.atan2((double)var27, (double)var9) * -325.9490051269531D) & 2047; // L: 6667 + if (GameEngine.cameraPitch < 128) { // L: 6668 + GameEngine.cameraPitch = 128; + } + + if (GameEngine.cameraPitch > 383) { // L: 6669 + GameEngine.cameraPitch = 383; + } + } + + var1.serverPacket = null; // L: 6671 + return true; // L: 6672 + } + + if (ServerPacket.field3139 == var1.serverPacket) { // L: 6674 + World var50 = new World(); // L: 6675 + var50.host = var3.readStringCp1252NullTerminated(); // L: 6676 + var50.id = var3.readUnsignedShort(); // L: 6677 + var5 = var3.readInt(); // L: 6678 + var50.properties = var5; // L: 6679 + PendingSpawn.updateGameState(45); // L: 6680 + var2.close(); // L: 6681 + var2 = null; // L: 6682 + InvDefinition.changeWorld(var50); // L: 6683 + var1.serverPacket = null; // L: 6684 + return false; // L: 6685 + } + + if (ServerPacket.field3161 == var1.serverPacket) { // L: 6687 + var67 = var3.method7716(); // L: 6688 + ScriptFrame.method1066(var67); // L: 6689 + changedItemContainers[++field683 - 1 & 31] = var67 & 32767; // L: 6690 + var1.serverPacket = null; // L: 6691 + return true; // L: 6692 + } + + NPC var54; + if (ServerPacket.field3123 == var1.serverPacket) { // L: 6694 + var6 = var3.method7716(); // L: 6699 + var67 = var3.readUnsignedShort(); // L: 6700 + var54 = npcs[var67]; // L: 6701 + var5 = var3.method7567(); // L: 6702 + if (var54 != null) { // L: 6703 + var54.spotAnimation = var6; // L: 6704 + var54.spotAnimationHeight = var5 >> 16; // L: 6705 + var54.field1185 = (var5 & 65535) + cycle; // L: 6706 + var54.spotAnimationFrame = 0; // L: 6707 + var54.spotAnimationFrameCycle = 0; // L: 6708 + if (var54.field1185 > cycle) { // L: 6709 + var54.spotAnimationFrame = -1; // L: 6710 + } + + if (var54.spotAnimation == 65535) { // L: 6712 + var54.spotAnimation = -1; // L: 6713 + } + } + + var1.serverPacket = null; // L: 6716 + return true; // L: 6717 + } + + Widget var26; + if (ServerPacket.field3153 == var1.serverPacket) { // L: 6719 + var67 = var3.method7716(); // L: 6720 + var5 = var3.method7716(); // L: 6721 + var6 = var3.method7568(); // L: 6722 + var27 = var3.method7554(); // L: 6723 + var26 = class92.getWidget(var6); // L: 6724 + if (var27 != var26.modelAngleX || var67 != var26.modelAngleY || var5 != var26.modelZoom) { // L: 6725 + var26.modelAngleX = var27; // L: 6726 + var26.modelAngleY = var67; // L: 6727 + var26.modelZoom = var5; // L: 6728 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var26); // L: 6729 + } + + var1.serverPacket = null; // L: 6731 + return true; // L: 6732 + } + + if (ServerPacket.field3106 == var1.serverPacket) { // L: 6734 + BufferedSource.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 6735 + field689 = cycleCntr; // L: 6736 + var1.serverPacket = null; // L: 6737 + return true; // L: 6738 + } + + if (ServerPacket.field3172 == var1.serverPacket) { // L: 6740 + var67 = var3.method7576(); // L: 6745 + Player var56; + if (var67 == localPlayerIndex) { // L: 6746 + var56 = ModelData0.localPlayer; // L: 6747 + } else { + var56 = players[var67]; // L: 6750 + } + + var6 = var3.readInt(); // L: 6752 + var5 = var3.method7716(); // L: 6753 + if (var56 != null) { // L: 6754 + var56.spotAnimation = var5; // L: 6755 + var56.spotAnimationHeight = var6 >> 16; // L: 6756 + var56.field1185 = (var6 & 65535) + cycle; // L: 6757 + var56.spotAnimationFrame = 0; // L: 6758 + var56.spotAnimationFrameCycle = 0; // L: 6759 + if (var56.field1185 > cycle) { // L: 6760 + var56.spotAnimationFrame = -1; // L: 6761 + } + + if (var56.spotAnimation == 65535) { // L: 6763 + var56.spotAnimation = -1; // L: 6764 + } + } + + var1.serverPacket = null; // L: 6767 + return true; // L: 6768 + } + + if (ServerPacket.field3118 == var1.serverPacket) { // L: 6770 + var67 = var3.method7576(); // L: 6771 + var5 = var3.method7701(); // L: 6772 + Varps.Varps_temp[var67] = var5; // L: 6773 + if (Varps.Varps_main[var67] != var5) { // L: 6774 + Varps.Varps_main[var67] = var5; // L: 6775 + } + + class321.changeGameOptions(var67); // L: 6777 + changedVarps[++changedVarpCount - 1 & 31] = var67; // L: 6778 + var1.serverPacket = null; // L: 6779 + return true; // L: 6780 + } + + if (ServerPacket.field3146 == var1.serverPacket) { // L: 6782 + minimapState = var3.readUnsignedByte(); // L: 6783 + var1.serverPacket = null; // L: 6784 + return true; // L: 6785 + } + + if (ServerPacket.field3154 == var1.serverPacket) { // L: 6787 + Occluder.method4222(class263.field3062); // L: 6788 + var1.serverPacket = null; // L: 6789 + return true; // L: 6790 + } + + if (ServerPacket.field3121 == var1.serverPacket) { // L: 6792 + var67 = var3.readShort(); // L: 6793 + var5 = var3.method7567(); // L: 6794 + var6 = var3.method7522(); // L: 6795 + var55 = class92.getWidget(var5); // L: 6796 + if (var67 != var55.rawX || var6 != var55.rawY || var55.xAlignment != 0 || var55.yAlignment != 0) { // L: 6797 + var55.rawX = var67; // L: 6798 + var55.rawY = var6; // L: 6799 + var55.xAlignment = 0; // L: 6800 + var55.yAlignment = 0; // L: 6801 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var55); // L: 6802 + this.alignWidget(var55); // L: 6803 + if (var55.type == 0) { // L: 6804 + UserComparator8.revalidateWidgetScroll(NetSocket.Widget_interfaceComponents[var5 >> 16], var55, false); + } + } + + var1.serverPacket = null; // L: 6806 + return true; // L: 6807 + } + + if (ServerPacket.field3180 == var1.serverPacket) { // L: 6809 + HorizontalAlignment.updateNpcs(true, var3); // L: 6810 var1.serverPacket = null; // L: 6811 return true; // L: 6812 } - if (ServerPacket.field3044 == var1.serverPacket) { // L: 6814 - var20 = var3.readInt(); // L: 6815 - var5 = var3.readUnsignedShort(); // L: 6816 - if (var20 < -70000) { // L: 6817 - var5 += 32768; + int var38; + int var40; + if (ServerPacket.field3085 == var1.serverPacket) { // L: 6814 + byte var61 = var3.readByte(); // L: 6830 + var38 = var3.method7716(); // L: 6831 + var6 = var3.method7561(); // L: 6832 + var67 = var6 >> 16; // L: 6833 + var5 = var6 >> 8 & 255; // L: 6834 + var27 = var67 + (var6 >> 4 & 7); // L: 6835 + var28 = var5 + (var6 & 7); // L: 6836 + var86 = var3.method7558(); // L: 6837 + int var18 = var3.readUnsignedByte(); // L: 6838 + byte var85 = var3.method7547(); // L: 6839 + var40 = var3.method7546() * 4; // L: 6840 + var16 = var3.method7716(); // L: 6841 + int var17 = var3.method7545(); // L: 6842 + var15 = var3.method7716(); // L: 6843 + var13 = var3.readUnsignedByte() * 4; // L: 6844 + var9 = var61 + var27; // L: 6845 + var29 = var85 + var28; // L: 6846 + if (var27 >= 0 && var28 >= 0 && var27 < 104 && var28 < 104 && var9 >= 0 && var29 >= 0 && var9 < 104 && var29 < 104 && var38 != 65535) { // L: 6847 + var27 = var27 * 128 + 64; // L: 6848 + var28 = var28 * 128 + 64; // L: 6849 + var9 = var9 * 128 + 64; // L: 6850 + var29 = var29 * 128 + 64; // L: 6851 + Projectile var19 = new Projectile(var38, class128.Client_plane, var27, var28, class202.getTileHeight(var27, var28, class128.Client_plane) - var13, var15 + cycle, var16 + cycle, var17, var18, var86, var40); // L: 6852 + var19.setDestination(var9, var29, class202.getTileHeight(var9, var29, class128.Client_plane) - var40, var15 + cycle); // L: 6853 + projectiles.addFirst(var19); // L: 6854 } - if (var20 >= 0) { // L: 6819 - var74 = class127.getWidget(var20); + var1.serverPacket = null; // L: 6856 + return true; // L: 6857 + } + + if (ServerPacket.field3111 == var1.serverPacket) { // L: 6859 + var67 = var3.readUnsignedByte(); // L: 6860 + Varcs.forceDisconnect(var67); // L: 6861 + var1.serverPacket = null; // L: 6862 + return false; // L: 6863 + } + + if (ServerPacket.field3179 == var1.serverPacket) { // L: 6865 + var84 = var3.readUnsignedByte() == 1; // L: 6866 + if (var84) { // L: 6867 + UserComparator8.field1380 = class113.method2624() - var3.readLong(); // L: 6868 + class120.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 6869 } else { - var74 = null; // L: 6820 + class120.grandExchangeEvents = null; // L: 6871 } - for (; var3.offset < var1.serverPacketLength; ChatChannel.itemContainerSetItem(var5, var22, var8 - 1, var61)) { // L: 6821 6835 - var22 = var3.readUShortSmart(); // L: 6822 - var8 = var3.readUnsignedShort(); // L: 6823 - var61 = 0; // L: 6824 - if (var8 != 0) { // L: 6825 - var61 = var3.readUnsignedByte(); // L: 6826 - if (var61 == 255) { // L: 6827 - var61 = var3.readInt(); - } - } - - if (var74 != null && var22 >= 0 && var22 < var74.itemIds.length) { // L: 6829 6830 - var74.itemIds[var22] = var8; // L: 6831 - var74.itemQuantities[var22] = var61; // L: 6832 - } - } - - if (var74 != null) { // L: 6837 - class346.invalidateWidget(var74); - } - - class143.method3072(); // L: 6838 - changedItemContainers[++field695 - 1 & 31] = var5 & 32767; // L: 6839 - var1.serverPacket = null; // L: 6840 - return true; // L: 6841 + field512 = cycleCntr; // L: 6872 + var1.serverPacket = null; // L: 6873 + return true; // L: 6874 } - if (ServerPacket.field3095 == var1.serverPacket) { // L: 6843 - var20 = var3.method7837(); // L: 6844 - var73 = class127.getWidget(var20); // L: 6845 - var73.modelType = 3; // L: 6846 - var73.modelId = GrandExchangeEvents.localPlayer.appearance.getChatHeadId(); // L: 6847 - class346.invalidateWidget(var73); // L: 6848 - var1.serverPacket = null; // L: 6849 - return true; // L: 6850 - } - - if (ServerPacket.field3092 == var1.serverPacket) { // L: 6852 - var52 = var3.readStringCp1252NullTerminated(); // L: 6853 - var26 = (long)var3.readUnsignedShort(); // L: 6854 - var28 = (long)var3.readMedium(); // L: 6855 - PlayerType var37 = (PlayerType)MusicPatchPcmStream.findEnumerated(WorldMapManager.PlayerType_values(), var3.readUnsignedByte()); // L: 6856 - long var38 = (var26 << 32) + var28; // L: 6857 - boolean var76 = false; // L: 6858 - - for (var13 = 0; var13 < 100; ++var13) { // L: 6859 - if (var38 == crossWorldMessageIds[var13]) { // L: 6860 - var76 = true; // L: 6861 - break; // L: 6862 - } - } - - if (Decimator.friendSystem.isIgnored(new Username(var52, class122.loginType))) { // L: 6865 - var76 = true; - } - - if (!var76 && field618 == 0) { // L: 6866 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var38; // L: 6867 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6868 - var32 = AbstractFont.escapeBrackets(MouseHandler.method584(class193.method3883(var3))); // L: 6869 - byte var92; - if (var37.isPrivileged) { // L: 6871 - var92 = 7; - } else { - var92 = 3; // L: 6872 - } - - if (var37.modIcon != -1) { // L: 6873 - Actor.addGameMessage(var92, Script.method1990(var37.modIcon) + var52, var32); - } else { - Actor.addGameMessage(var92, var52, var32); // L: 6874 - } - } - - var1.serverPacket = null; // L: 6876 - return true; // L: 6877 - } - - if (ServerPacket.field3117 == var1.serverPacket) { // L: 6879 - var20 = var3.method7715(); // L: 6880 - var5 = var3.method7827(); // L: 6881 - var74 = class127.getWidget(var5); // L: 6882 - if (var74.modelType != 2 || var20 != var74.modelId) { // L: 6883 - var74.modelType = 2; // L: 6884 - var74.modelId = var20; // L: 6885 - class346.invalidateWidget(var74); // L: 6886 - } - - var1.serverPacket = null; // L: 6888 - return true; // L: 6889 - } - - if (ServerPacket.field3070 == var1.serverPacket) { // L: 6891 - var20 = var3.method7827(); // L: 6892 - var5 = var3.method7713(); // L: 6893 - if (var5 == 65535) { // L: 6894 + long var41; + if (ServerPacket.field3171 == var1.serverPacket) { // L: 6876 + var67 = var3.method7701(); // L: 6877 + var5 = var3.method7716(); // L: 6878 + if (var5 == 65535) { // L: 6879 var5 = -1; } - var6 = var3.method7715(); // L: 6895 - if (var6 == 65535) { // L: 6896 - var6 = -1; + var6 = var3.method7701(); // L: 6880 + var27 = var3.method7576(); // L: 6881 + if (var27 == 65535) { // L: 6882 + var27 = -1; } - var22 = var3.readInt(); // L: 6897 - - for (var8 = var5; var8 <= var6; ++var8) { // L: 6898 - var30 = ((long)var22 << 32) + (long)var8; // L: 6899 - Node var93 = widgetFlags.get(var30); // L: 6900 - if (var93 != null) { // L: 6901 - var93.remove(); + for (var28 = var27; var28 <= var5; ++var28) { // L: 6883 + var41 = ((long)var67 << 32) + (long)var28; // L: 6884 + Node var90 = widgetFlags.get(var41); // L: 6885 + if (var90 != null) { // L: 6886 + var90.remove(); } - widgetFlags.put(new IntegerNode(var20), var30); // L: 6902 + widgetFlags.put(new IntegerNode(var6), var41); // L: 6887 } - var1.serverPacket = null; // L: 6904 - return true; // L: 6905 + var1.serverPacket = null; // L: 6889 + return true; // L: 6890 } - if (ServerPacket.field3041 == var1.serverPacket) { // L: 6907 - class29.field181 = var3.method7875(); // L: 6908 - PlayerComposition.field3307 = var3.method7742(); // L: 6909 - - while (var3.offset < var1.serverPacketLength) { // L: 6910 - var20 = var3.readUnsignedByte(); // L: 6911 - class263 var71 = class114.method2662()[var20]; // L: 6912 - ClanMate.method6700(var71); // L: 6913 + if (ServerPacket.field3130 == var1.serverPacket) { // L: 6892 + var5 = var3.readUnsignedShort(); // L: 6896 + var6 = var3.method7546(); // L: 6897 + var67 = var3.method7554(); // L: 6898 + if (var5 == 65535) { // L: 6899 + var5 = -1; // L: 6900 } - var1.serverPacket = null; // L: 6915 - return true; // L: 6916 + var54 = npcs[var67]; // L: 6902 + if (var54 != null) { // L: 6903 + if (var5 == var54.sequence && var5 != -1) { // L: 6904 + var28 = class114.SequenceDefinition_get(var5).field2208; // L: 6905 + if (var28 == 1) { // L: 6906 + var54.sequenceFrame = 0; // L: 6907 + var54.sequenceFrameCycle = 0; // L: 6908 + var54.sequenceDelay = var6; // L: 6909 + var54.field1186 = 0; // L: 6910 + } else if (var28 == 2) { // L: 6912 + var54.field1186 = 0; // L: 6913 + } + } else if (var5 == -1 || var54.sequence == -1 || class114.SequenceDefinition_get(var5).field2220 >= class114.SequenceDefinition_get(var54.sequence).field2220) { // L: 6916 + var54.sequence = var5; // L: 6917 + var54.sequenceFrame = 0; // L: 6918 + var54.sequenceFrameCycle = 0; // L: 6919 + var54.sequenceDelay = var6; // L: 6920 + var54.field1186 = 0; // L: 6921 + var54.field1200 = var54.pathLength; // L: 6922 + } + } + + var1.serverPacket = null; // L: 6926 + return true; // L: 6927 } - if (ServerPacket.field3109 == var1.serverPacket) { // L: 6918 - class426.method7546(); // L: 6919 - var72 = var3.readByte(); // L: 6920 - if (var1.serverPacketLength == 1) { // L: 6921 - if (var72 >= 0) { // L: 6922 - currentClanSettings[var72] = null; + if (ServerPacket.field3144 == var1.serverPacket) { // L: 6929 + class145.field1690 = var3.method7593(); // L: 6930 + class321.field4076 = var3.readUnsignedByte(); // L: 6931 + + for (var67 = class145.field1690; var67 < class145.field1690 + 8; ++var67) { // L: 6932 + for (var5 = class321.field4076; var5 < class321.field4076 + 8; ++var5) { // L: 6933 + if (groundItems[class128.Client_plane][var67][var5] != null) { // L: 6934 + groundItems[class128.Client_plane][var67][var5] = null; // L: 6935 + Frames.updateItemPile(var67, var5); // L: 6936 + } + } + } + + for (PendingSpawn var49 = (PendingSpawn)pendingSpawns.last(); var49 != null; var49 = (PendingSpawn)pendingSpawns.previous()) { // L: 6940 6941 6943 + if (var49.x >= class145.field1690 && var49.x < class145.field1690 + 8 && var49.y >= class321.field4076 && var49.y < class321.field4076 + 8 && var49.plane == class128.Client_plane) { // L: 6942 + var49.hitpoints = 0; + } + } + + var1.serverPacket = null; // L: 6945 + return true; // L: 6946 + } + + if (ServerPacket.field3127 == var1.serverPacket) { // L: 6948 + rebootTimer = var3.method7554() * 30; // L: 6949 + field695 = cycleCntr; // L: 6950 + var1.serverPacket = null; // L: 6951 + return true; // L: 6952 + } + + InterfaceParent var7; + long var44; + if (ServerPacket.field3125 == var1.serverPacket) { // L: 6954 + var67 = var3.offset + var1.serverPacketLength; // L: 6955 + var5 = var3.readUnsignedShort(); // L: 6956 + var6 = var3.readUnsignedShort(); // L: 6957 + if (var5 != rootInterface) { // L: 6958 + rootInterface = var5; // L: 6959 + this.resizeRoot(false); // L: 6960 + GraphicsDefaults.Widget_resetModelFrames(rootInterface); // L: 6961 + AbstractWorldMapData.runWidgetOnLoadListener(rootInterface); // L: 6962 + + for (var27 = 0; var27 < 100; ++var27) { // L: 6963 + field652[var27] = true; + } + } + + InterfaceParent var57; + for (; var6-- > 0; var57.field1034 = true) { // L: 6965 6975 + var27 = var3.readInt(); // L: 6966 + var28 = var3.readUnsignedShort(); // L: 6967 + var9 = var3.readUnsignedByte(); // L: 6968 + var57 = (InterfaceParent)interfaceParents.get((long)var27); // L: 6969 + if (var57 != null && var28 != var57.group) { // L: 6970 + NetSocket.closeInterface(var57, true); // L: 6971 + var57 = null; // L: 6972 + } + + if (var57 == null) { // L: 6974 + var57 = class241.method4812(var27, var28, var9); + } + } + + for (var7 = (InterfaceParent)interfaceParents.first(); var7 != null; var7 = (InterfaceParent)interfaceParents.next()) { // L: 6977 + if (var7.field1034) { // L: 6978 + var7.field1034 = false; } else { - class154.guestClanSettings = null; // L: 6923 - } - - var1.serverPacket = null; // L: 6924 - return true; // L: 6925 - } - - if (var72 >= 0) { // L: 6927 - currentClanSettings[var72] = new ClanSettings(var3); // L: 6928 - } else { - class154.guestClanSettings = new ClanSettings(var3); // L: 6931 - } - - var1.serverPacket = null; // L: 6933 - return true; // L: 6934 - } - - if (ServerPacket.field3089 == var1.serverPacket) { // L: 6936 - if (ClientPacket.friendsChat != null) { // L: 6937 - ClientPacket.friendsChat.method6661(var3); // L: 6938 - } - - SecureRandomCallable.method2050(); // L: 6940 - var1.serverPacket = null; // L: 6941 - return true; // L: 6942 - } - - if (ServerPacket.field3046 == var1.serverPacket) { // L: 6944 - ClanMate.method6700(class263.field3008); // L: 6945 - var1.serverPacket = null; // L: 6946 - return true; // L: 6947 - } - - if (ServerPacket.field3069 == var1.serverPacket) { // L: 6949 - Decimator.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 6950 - field701 = cycleCntr; // L: 6951 - var1.serverPacket = null; // L: 6952 - return true; // L: 6953 - } - - if (ServerPacket.field3098 == var1.serverPacket) { // L: 6955 - var20 = var3.method7837(); // L: 6956 - var5 = var3.readUnsignedShort(); // L: 6957 - var74 = class127.getWidget(var20); // L: 6958 - if (var74.modelType != 1 || var5 != var74.modelId) { // L: 6959 - var74.modelType = 1; // L: 6960 - var74.modelId = var5; // L: 6961 - class346.invalidateWidget(var74); // L: 6962 - } - - var1.serverPacket = null; // L: 6964 - return true; // L: 6965 - } - - if (ServerPacket.field3034 == var1.serverPacket) { // L: 6967 - var20 = var3.method7714(); // L: 6968 - rootInterface = var20; // L: 6969 - this.resizeRoot(false); // L: 6970 - class29.Widget_resetModelFrames(var20); // L: 6971 - class145.runWidgetOnLoadListener(rootInterface); // L: 6972 - - for (var5 = 0; var5 < 100; ++var5) { // L: 6973 - field715[var5] = true; - } - - var1.serverPacket = null; // L: 6974 - return true; // L: 6975 - } - - if (ServerPacket.field3060 == var1.serverPacket) { // L: 6977 - Projectile.updatePlayers(var3, var1.serverPacketLength); // L: 6978 - class115.method2684(); // L: 6979 - var1.serverPacket = null; // L: 6980 - return true; // L: 6981 - } - - String var41; - if (ServerPacket.field3111 == var1.serverPacket) { // L: 6983 - var52 = var3.readStringCp1252NullTerminated(); // L: 6984 - var26 = var3.readLong(); // L: 6985 - var28 = (long)var3.readUnsignedShort(); // L: 6986 - var30 = (long)var3.readMedium(); // L: 6987 - PlayerType var40 = (PlayerType)MusicPatchPcmStream.findEnumerated(WorldMapManager.PlayerType_values(), var3.readUnsignedByte()); // L: 6988 - var35 = (var28 << 32) + var30; // L: 6989 - boolean var89 = false; // L: 6990 - - for (var15 = 0; var15 < 100; ++var15) { // L: 6991 - if (crossWorldMessageIds[var15] == var35) { // L: 6992 - var89 = true; // L: 6993 - break; // L: 6994 + NetSocket.closeInterface(var7, true); // L: 6980 } } - if (var40.isUser && Decimator.friendSystem.isIgnored(new Username(var52, class122.loginType))) { // L: 6997 6998 - var89 = true; - } + widgetFlags = new NodeHashTable(512); // L: 6983 - if (!var89 && field618 == 0) { // L: 7000 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var35; // L: 7001 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 7002 - var41 = AbstractFont.escapeBrackets(MouseHandler.method584(class193.method3883(var3))); // L: 7003 - if (var40.modIcon != -1) { // L: 7004 - class301.addChatMessage(9, Script.method1990(var40.modIcon) + var52, var41, class82.base37DecodeLong(var26)); - } else { - class301.addChatMessage(9, var52, var41, class82.base37DecodeLong(var26)); // L: 7005 + while (var3.offset < var67) { // L: 6984 + var27 = var3.readInt(); // L: 6985 + var28 = var3.readUnsignedShort(); // L: 6986 + var9 = var3.readUnsignedShort(); // L: 6987 + var29 = var3.readInt(); // L: 6988 + + for (var86 = var28; var86 <= var9; ++var86) { // L: 6989 + var44 = ((long)var27 << 32) + (long)var86; // L: 6990 + widgetFlags.put(new IntegerNode(var29), var44); // L: 6991 } } - var1.serverPacket = null; // L: 7007 - return true; // L: 7008 + var1.serverPacket = null; // L: 6994 + return true; // L: 6995 } - if (ServerPacket.field3047 == var1.serverPacket) { // L: 7010 - var20 = var3.method7715(); // L: 7011 - var5 = var3.method7714(); // L: 7012 - var6 = var3.method7714(); // L: 7013 - var22 = var3.method7837(); // L: 7014 - var25 = class127.getWidget(var22); // L: 7015 - if (var6 != var25.modelAngleX || var5 != var25.modelAngleY || var20 != var25.modelZoom) { // L: 7016 - var25.modelAngleX = var6; // L: 7017 - var25.modelAngleY = var5; // L: 7018 - var25.modelZoom = var20; // L: 7019 - class346.invalidateWidget(var25); // L: 7020 + if (ServerPacket.field3167 == var1.serverPacket) { // L: 6997 + Occluder.method4222(class263.field3068); // L: 6998 + var1.serverPacket = null; // L: 6999 + return true; // L: 7000 + } + + if (ServerPacket.field3159 == var1.serverPacket) { // L: 7002 + for (var67 = 0; var67 < VarpDefinition.VarpDefinition_fileCount; ++var67) { // L: 7003 + VarpDefinition var73 = class21.VarpDefinition_get(var67); // L: 7004 + if (var73 != null) { // L: 7005 + Varps.Varps_temp[var67] = 0; // L: 7006 + Varps.Varps_main[var67] = 0; // L: 7007 + } + } + + class119.method2737(); // L: 7010 + changedVarpCount += 32; // L: 7011 + var1.serverPacket = null; // L: 7012 + return true; // L: 7013 + } + + if (ServerPacket.field3135 == var1.serverPacket) { // L: 7015 + Occluder.method4222(class263.field3064); // L: 7016 + var1.serverPacket = null; // L: 7017 + return true; // L: 7018 + } + + if (ServerPacket.field3102 == var1.serverPacket) { // L: 7020 + if (rootInterface != -1) { // L: 7021 + WorldMapLabelSize.runIntfCloseListeners(rootInterface, 0); } var1.serverPacket = null; // L: 7022 return true; // L: 7023 } - if (ServerPacket.field3050 == var1.serverPacket) { // L: 7025 - class143.method3072(); // L: 7026 - runEnergy = var3.readUnsignedByte(); // L: 7027 - field707 = cycleCntr; // L: 7028 - var1.serverPacket = null; // L: 7029 - return true; // L: 7030 + if (ServerPacket.field3136 == var1.serverPacket) { // L: 7025 + class144.loadRegions(true, var1.packetBuffer); // L: 7026 + var1.serverPacket = null; // L: 7027 + return true; // L: 7028 } - if (ServerPacket.field3105 == var1.serverPacket) { // L: 7032 - for (var20 = 0; var20 < players.length; ++var20) { // L: 7033 - if (players[var20] != null) { // L: 7034 - players[var20].sequence = -1; + if (ServerPacket.field3088 == var1.serverPacket) { // L: 7030 + var67 = var3.readUnsignedByte(); // L: 7031 + if (var3.readUnsignedByte() == 0) { // L: 7032 + grandExchangeOffers[var67] = new GrandExchangeOffer(); // L: 7033 + var3.offset += 18; // L: 7034 + } else { + --var3.offset; // L: 7037 + grandExchangeOffers[var67] = new GrandExchangeOffer(var3, false); // L: 7038 + } + + field762 = cycleCntr; // L: 7040 + var1.serverPacket = null; // L: 7041 + return true; // L: 7042 + } + + if (ServerPacket.field3110 == var1.serverPacket) { // L: 7044 + for (var67 = 0; var67 < Varps.Varps_main.length; ++var67) { // L: 7045 + if (Varps.Varps_main[var67] != Varps.Varps_temp[var67]) { // L: 7046 + Varps.Varps_main[var67] = Varps.Varps_temp[var67]; // L: 7047 + class321.changeGameOptions(var67); // L: 7048 + changedVarps[++changedVarpCount - 1 & 31] = var67; // L: 7049 } } - for (var20 = 0; var20 < npcs.length; ++var20) { // L: 7036 - if (npcs[var20] != null) { // L: 7037 - npcs[var20].sequence = -1; - } - } - - var1.serverPacket = null; // L: 7039 - return true; // L: 7040 - } - - if (ServerPacket.field3038 == var1.serverPacket) { // L: 7042 - rebootTimer = var3.readUnsignedShort() * 30; // L: 7043 - field707 = cycleCntr; // L: 7044 - var1.serverPacket = null; // L: 7045 - return true; // L: 7046 - } - - if (ServerPacket.field3023 == var1.serverPacket) { // L: 7048 - Decimator.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 7049 - KitDefinition.FriendSystem_invalidateIgnoreds(); // L: 7050 - field701 = cycleCntr; // L: 7051 var1.serverPacket = null; // L: 7052 return true; // L: 7053 } - if (ServerPacket.field3078 == var1.serverPacket) { // L: 7055 - isCameraLocked = true; // L: 7056 - field754 = false; // L: 7057 - class154.field1691 = var3.readUnsignedByte(); // L: 7058 - class67.field881 = var3.readUnsignedByte(); // L: 7059 - DevicePcmPlayerProvider.field154 = var3.readUnsignedShort(); // L: 7060 - NetFileRequest.field3960 = var3.readUnsignedByte(); // L: 7061 - class386.field4337 = var3.readUnsignedByte(); // L: 7062 - if (class386.field4337 >= 100) { // L: 7063 - var20 = class154.field1691 * 128 + 64; // L: 7064 - var5 = class67.field881 * 128 + 64; // L: 7065 - var6 = WorldMapLabel.getTileHeight(var20, var5, class18.Client_plane) - DevicePcmPlayerProvider.field154; // L: 7066 - var22 = var20 - WorldMapLabelSize.cameraX; // L: 7067 - var8 = var6 - ItemContainer.cameraY; // L: 7068 - var61 = var5 - class154.cameraZ; // L: 7069 - var62 = (int)Math.sqrt((double)(var22 * var22 + var61 * var61)); // L: 7070 - class147.cameraPitch = (int)(Math.atan2((double)var8, (double)var62) * 325.9490051269531D) & 2047; // L: 7071 - class21.cameraYaw = (int)(Math.atan2((double)var22, (double)var61) * -325.9490051269531D) & 2047; // L: 7072 - if (class147.cameraPitch < 128) { // L: 7073 - class147.cameraPitch = 128; - } + if (ServerPacket.field3178 == var1.serverPacket) { // L: 7055 + Occluder.method4222(class263.field3060); // L: 7056 + var1.serverPacket = null; // L: 7057 + return true; // L: 7058 + } - if (class147.cameraPitch > 383) { // L: 7074 - class147.cameraPitch = 383; - } + if (ServerPacket.field3117 == var1.serverPacket) { // L: 7060 + var67 = var3.readUnsignedShort(); // L: 7061 + var5 = var3.readUnsignedByte(); // L: 7062 + var6 = var3.readUnsignedShort(); // L: 7063 + WorldMapLabelSize.queueSoundEffect(var67, var5, var6); // L: 7064 + var1.serverPacket = null; // L: 7065 + return true; // L: 7066 + } + + if (ServerPacket.field3114 == var1.serverPacket) { // L: 7068 + var67 = var3.readInt(); // L: 7069 + var5 = var3.readUnsignedShort(); // L: 7070 + if (var67 < -70000) { // L: 7071 + var5 += 32768; } - var1.serverPacket = null; // L: 7076 - return true; // L: 7077 - } - - if (ServerPacket.field3028 == var1.serverPacket) { // L: 7079 - var20 = var3.readUnsignedByte(); // L: 7080 - class16.forceDisconnect(var20); // L: 7081 - var1.serverPacket = null; // L: 7082 - return false; // L: 7083 - } - - if (ServerPacket.field3035 == var1.serverPacket) { // L: 7085 - var78 = var3.readUnsignedByte() == 1; // L: 7086 - if (var78) { // L: 7087 - WorldMapID.field2388 = class136.method2931() - var3.readLong(); // L: 7088 - class83.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 7089 + if (var67 >= 0) { // L: 7073 + var22 = class92.getWidget(var67); } else { - class83.grandExchangeEvents = null; // L: 7091 + var22 = null; // L: 7074 } - field706 = cycleCntr; // L: 7092 - var1.serverPacket = null; // L: 7093 - return true; // L: 7094 - } + if (var22 != null) { // L: 7075 + for (var27 = 0; var27 < var22.itemIds.length; ++var27) { // L: 7076 + var22.itemIds[var27] = 0; // L: 7077 + var22.itemQuantities[var27] = 0; // L: 7078 + } + } - if (ServerPacket.field3033 == var1.serverPacket) { // L: 7096 - StudioGame.loadRegions(false, var1.packetBuffer); // L: 7097 + class29.clearItemContainer(var5); // L: 7081 + var27 = var3.readUnsignedShort(); // L: 7082 + + for (var28 = 0; var28 < var27; ++var28) { // L: 7083 + var9 = var3.readUnsignedByte(); // L: 7084 + if (var9 == 255) { // L: 7085 + var9 = var3.method7568(); + } + + var29 = var3.method7716(); // L: 7086 + if (var22 != null && var28 < var22.itemIds.length) { // L: 7087 7088 + var22.itemIds[var28] = var29; // L: 7089 + var22.itemQuantities[var28] = var9; // L: 7090 + } + + InvDefinition.itemContainerSetItem(var5, var28, var29 - 1, var9); // L: 7093 + } + + if (var22 != null) { // L: 7095 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var22); + } + + class119.method2737(); // L: 7096 + changedItemContainers[++field683 - 1 & 31] = var5 & 32767; // L: 7097 var1.serverPacket = null; // L: 7098 return true; // L: 7099 } - if (ServerPacket.field3100 == var1.serverPacket) { // L: 7101 - var20 = var3.readUnsignedShort(); // L: 7102 - var5 = var3.readUnsignedByte(); // L: 7103 - var6 = var3.readUnsignedShort(); // L: 7104 - Actor.queueSoundEffect(var20, var5, var6); // L: 7105 - var1.serverPacket = null; // L: 7106 - return true; // L: 7107 - } - - if (ServerPacket.field3088 == var1.serverPacket) { // L: 7109 - var20 = var3.method7713(); // L: 7110 - var5 = var3.readInt(); // L: 7111 - var6 = var20 >> 10 & 31; // L: 7112 - var22 = var20 >> 5 & 31; // L: 7113 - var8 = var20 & 31; // L: 7114 - var61 = (var22 << 11) + (var6 << 19) + (var8 << 3); // L: 7115 - Widget var90 = class127.getWidget(var5); // L: 7116 - if (var61 != var90.color) { // L: 7117 - var90.color = var61; // L: 7118 - class346.invalidateWidget(var90); // L: 7119 - } - - var1.serverPacket = null; // L: 7121 - return true; // L: 7122 - } - - if (ServerPacket.field3076 == var1.serverPacket) { // L: 7124 - var20 = var3.readUnsignedByte(); // L: 7125 - if (var3.readUnsignedByte() == 0) { // L: 7126 - grandExchangeOffers[var20] = new GrandExchangeOffer(); // L: 7127 - var3.offset += 18; // L: 7128 + if (ServerPacket.field3173 == var1.serverPacket) { // L: 7101 + class175.method3373(); // L: 7102 + var20 = var3.readByte(); // L: 7103 + class131 var71 = new class131(var3); // L: 7104 + ClanSettings var79; + if (var20 >= 0) { // L: 7106 + var79 = currentClanSettings[var20]; } else { - --var3.offset; // L: 7131 - grandExchangeOffers[var20] = new GrandExchangeOffer(var3, false); // L: 7132 + var79 = class358.guestClanSettings; // L: 7107 } - field705 = cycleCntr; // L: 7134 - var1.serverPacket = null; // L: 7135 - return true; // L: 7136 + var71.method2822(var79); // L: 7108 + var1.serverPacket = null; // L: 7109 + return true; // L: 7110 } - if (ServerPacket.field3079 == var1.serverPacket) { // L: 7138 - var20 = var3.readUnsignedShort(); // L: 7139 - class78.method2081(var20); // L: 7140 - changedItemContainers[++field695 - 1 & 31] = var20 & 32767; // L: 7141 - var1.serverPacket = null; // L: 7142 - return true; // L: 7143 + if (ServerPacket.field3094 == var1.serverPacket) { // L: 7112 + class21.privateChatMode = class116.method2686(var3.readUnsignedByte()); // L: 7113 + var1.serverPacket = null; // L: 7114 + return true; // L: 7115 } - if (ServerPacket.field3106 == var1.serverPacket) { // L: 7145 - var20 = var3.method7827(); // L: 7146 - var56 = var3.readUnsignedByte() == 1; // L: 7147 - var74 = class127.getWidget(var20); // L: 7148 - if (var56 != var74.isHidden) { // L: 7149 - var74.isHidden = var56; // L: 7150 - class346.invalidateWidget(var74); // L: 7151 + if (ServerPacket.field3145 == var1.serverPacket) { // L: 7117 + var67 = var3.readInt(); // L: 7118 + var5 = var3.readUnsignedShort(); // L: 7119 + if (var67 < -70000) { // L: 7120 + var5 += 32768; } - var1.serverPacket = null; // L: 7153 - return true; // L: 7154 - } - - if (ServerPacket.field3064 == var1.serverPacket) { // L: 7156 - ClanMate.method6700(class263.field3006); // L: 7157 - var1.serverPacket = null; // L: 7158 - return true; // L: 7159 - } - - if (ServerPacket.field3087 == var1.serverPacket) { // L: 7161 - StudioGame.loadRegions(true, var1.packetBuffer); // L: 7162 - var1.serverPacket = null; // L: 7163 - return true; // L: 7164 - } - - if (ServerPacket.field3053 == var1.serverPacket) { // L: 7166 - byte[] var51 = new byte[var1.serverPacketLength]; // L: 7167 - var3.method7624(var51, 0, var51.length); // L: 7168 - Buffer var70 = new Buffer(var51); // L: 7169 - var23 = var70.readStringCp1252NullTerminated(); // L: 7170 - class391.openURL(var23, true, false); // L: 7171 - var1.serverPacket = null; // L: 7172 - return true; // L: 7173 - } - - if (ServerPacket.field3125 == var1.serverPacket) { // L: 7175 - var5 = var3.readUnsignedShort(); // L: 7180 - var6 = var3.method7705(); // L: 7181 - var20 = var3.readUnsignedShort(); // L: 7182 - Player var58; - if (var20 == localPlayerIndex) { // L: 7183 - var58 = GrandExchangeEvents.localPlayer; // L: 7184 + if (var67 >= 0) { // L: 7122 + var22 = class92.getWidget(var67); } else { - var58 = players[var20]; // L: 7187 + var22 = null; // L: 7123 } - if (var58 != null) { // L: 7189 - var58.spotAnimation = var5; // L: 7190 - var58.spotAnimationHeight = var6 >> 16; // L: 7191 - var58.field1134 = (var6 & 65535) + cycle; // L: 7192 - var58.spotAnimationFrame = 0; // L: 7193 - var58.spotAnimationFrameCycle = 0; // L: 7194 - if (var58.field1134 > cycle) { // L: 7195 - var58.spotAnimationFrame = -1; // L: 7196 + for (; var3.offset < var1.serverPacketLength; InvDefinition.itemContainerSetItem(var5, var27, var28 - 1, var9)) { // L: 7124 7138 + var27 = var3.readUShortSmart(); // L: 7125 + var28 = var3.readUnsignedShort(); // L: 7126 + var9 = 0; // L: 7127 + if (var28 != 0) { // L: 7128 + var9 = var3.readUnsignedByte(); // L: 7129 + if (var9 == 255) { // L: 7130 + var9 = var3.readInt(); + } } - if (var58.spotAnimation == 65535) { // L: 7198 - var58.spotAnimation = -1; // L: 7199 + if (var22 != null && var27 >= 0 && var27 < var22.itemIds.length) { // L: 7132 7133 + var22.itemIds[var27] = var28; // L: 7134 + var22.itemQuantities[var27] = var9; // L: 7135 } } - var1.serverPacket = null; // L: 7202 - return true; // L: 7203 + if (var22 != null) { // L: 7140 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var22); + } + + class119.method2737(); // L: 7141 + changedItemContainers[++field683 - 1 & 31] = var5 & 32767; // L: 7142 + var1.serverPacket = null; // L: 7143 + return true; // L: 7144 } - int var16; - if (ServerPacket.field3039 == var1.serverPacket) { // L: 7205 - var72 = var3.readByte(); // L: 7206 - var21 = var3.readStringCp1252NullTerminated(); // L: 7207 - long var42 = (long)var3.readUnsignedShort(); // L: 7208 - long var44 = (long)var3.readMedium(); // L: 7209 - PlayerType var34 = (PlayerType)MusicPatchPcmStream.findEnumerated(WorldMapManager.PlayerType_values(), var3.readUnsignedByte()); // L: 7210 - long var46 = (var42 << 32) + var44; // L: 7211 - boolean var65 = false; // L: 7212 - ClanChannel var14 = null; // L: 7213 - var14 = var72 >= 0 ? currentClanChannels[var72] : class21.guestClanChannel; // L: 7215 - if (var14 == null) { // L: 7216 - var65 = true; // L: 7217 - } else { - var15 = 0; + if (ServerPacket.field3120 == var1.serverPacket) { // L: 7146 + var67 = var3.readUShortSmart(); // L: 7147 + boolean var53 = var3.readUnsignedByte() == 1; // L: 7148 + var76 = ""; // L: 7149 + boolean var82 = false; // L: 7150 + if (var53) { // L: 7151 + var76 = var3.readStringCp1252NullTerminated(); // L: 7152 + if (BufferedSource.friendSystem.isIgnored(new Username(var76, class391.loginType))) { // L: 7153 + var82 = true; + } + } - while (true) { - if (var15 >= 100) { - if (var34.isUser && Decimator.friendSystem.isIgnored(new Username(var21, class122.loginType))) { // L: 7226 7227 - var65 = true; + String var80 = var3.readStringCp1252NullTerminated(); // L: 7155 + if (!var82) { // L: 7156 + WorldMapEvent.addGameMessage(var67, var76, var80); + } + + var1.serverPacket = null; // L: 7157 + return true; // L: 7158 + } + + if (ServerPacket.field3133 == var1.serverPacket) { // L: 7160 + var67 = var3.method7716(); // L: 7161 + rootInterface = var67; // L: 7162 + this.resizeRoot(false); // L: 7163 + GraphicsDefaults.Widget_resetModelFrames(var67); // L: 7164 + AbstractWorldMapData.runWidgetOnLoadListener(rootInterface); // L: 7165 + + for (var5 = 0; var5 < 100; ++var5) { // L: 7166 + field652[var5] = true; + } + + var1.serverPacket = null; // L: 7167 + return true; // L: 7168 + } + + if (ServerPacket.field3124 == var1.serverPacket) { // L: 7170 + var13 = var3.method7554(); // L: 7181 + var9 = var3.method7545(); // L: 7182 + var29 = var9 >> 2; // L: 7183 + var86 = var9 & 3; // L: 7184 + var38 = field553[var29]; // L: 7185 + var6 = var3.method7544(); // L: 7186 + var67 = var6 >> 16; // L: 7187 + var5 = var6 >> 8 & 255; // L: 7188 + var27 = var67 + (var6 >> 4 & 7); // L: 7189 + var28 = var5 + (var6 & 7); // L: 7190 + if (var27 >= 0 && var28 >= 0 && var27 < 103 && var28 < 103) { // L: 7191 + if (var38 == 0) { // L: 7192 + BoundaryObject var65 = class175.scene.method4147(class128.Client_plane, var27, var28); // L: 7193 + if (var65 != null) { // L: 7194 + var15 = NetSocket.Entity_unpackID(var65.tag); // L: 7195 + if (var29 == 2) { // L: 7196 + var65.renderable1 = new DynamicObject(var15, 2, var86 + 4, class128.Client_plane, var27, var28, var13, false, var65.renderable1); // L: 7197 + var65.renderable2 = new DynamicObject(var15, 2, var86 + 1 & 3, class128.Client_plane, var27, var28, var13, false, var65.renderable2); // L: 7198 + } else { + var65.renderable1 = new DynamicObject(var15, var29, var86, class128.Client_plane, var27, var28, var13, false, var65.renderable1); // L: 7200 } - break; + } + } else if (var38 == 1) { // L: 7203 + WallDecoration var63 = class175.scene.method4049(class128.Client_plane, var27, var28); // L: 7204 + if (var63 != null) { // L: 7205 + var15 = NetSocket.Entity_unpackID(var63.tag); // L: 7206 + if (var29 != 4 && var29 != 5) { // L: 7207 + if (var29 == 6) { // L: 7210 + var63.renderable1 = new DynamicObject(var15, 4, var86 + 4, class128.Client_plane, var27, var28, var13, false, var63.renderable1); // L: 7211 + } else if (var29 == 7) { // L: 7213 + var63.renderable1 = new DynamicObject(var15, 4, (var86 + 2 & 3) + 4, class128.Client_plane, var27, var28, var13, false, var63.renderable1); // L: 7214 + } else if (var29 == 8) { // L: 7216 + var63.renderable1 = new DynamicObject(var15, 4, var86 + 4, class128.Client_plane, var27, var28, var13, false, var63.renderable1); // L: 7217 + var63.renderable2 = new DynamicObject(var15, 4, (var86 + 2 & 3) + 4, class128.Client_plane, var27, var28, var13, false, var63.renderable2); // L: 7218 + } + } else { + var63.renderable1 = new DynamicObject(var15, 4, var86, class128.Client_plane, var27, var28, var13, false, var63.renderable1); // L: 7208 + } + } + } else if (var38 == 2) { // L: 7222 + var14 = class175.scene.getGameObject(class128.Client_plane, var27, var28); // L: 7223 + if (var29 == 11) { // L: 7224 + var29 = 10; // L: 7225 } - if (crossWorldMessageIds[var15] == var46) { // L: 7221 - var65 = true; // L: 7222 - break; // L: 7223 + if (var14 != null) { // L: 7227 + var14.renderable = new DynamicObject(NetSocket.Entity_unpackID(var14.tag), var29, var86, class128.Client_plane, var27, var28, var13, false, var14.renderable); // L: 7228 + } + } else if (var38 == 3) { // L: 7231 + FloorDecoration var62 = class175.scene.getFloorDecoration(class128.Client_plane, var27, var28); // L: 7232 + if (var62 != null) { // L: 7233 + var62.renderable = new DynamicObject(NetSocket.Entity_unpackID(var62.tag), 22, var86, class128.Client_plane, var27, var28, var13, false, var62.renderable); // L: 7234 } - - ++var15; // L: 7220 - } - } - - if (!var65) { // L: 7230 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var46; // L: 7231 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 7232 - var41 = AbstractFont.escapeBrackets(class193.method3883(var3)); // L: 7233 - var16 = var72 >= 0 ? 41 : 44; // L: 7234 - if (var34.modIcon != -1) { // L: 7235 - class301.addChatMessage(var16, Script.method1990(var34.modIcon) + var21, var41, var14.name); - } else { - class301.addChatMessage(var16, var21, var41, var14.name); // L: 7236 } } @@ -5478,567 +5778,784 @@ public final class Client extends GameEngine implements Usernamed, OAuthApi { return true; // L: 7239 } - if (ServerPacket.field3056 == var1.serverPacket) { // L: 7241 - ItemLayer.logOut(); // L: 7242 - var1.serverPacket = null; // L: 7243 - return false; // L: 7244 + if (ServerPacket.field3105 == var1.serverPacket) { // L: 7241 + class321.field4076 = var3.readUnsignedByte(); // L: 7242 + class145.field1690 = var3.method7545(); // L: 7243 + var1.serverPacket = null; // L: 7244 + return true; // L: 7245 } - if (ServerPacket.field3029 == var1.serverPacket) { // L: 7246 - field755 = cycleCntr; // L: 7247 - var72 = var3.readByte(); // L: 7248 - if (var1.serverPacketLength == 1) { // L: 7249 - if (var72 >= 0) { // L: 7250 - currentClanChannels[var72] = null; - } else { - class21.guestClanChannel = null; // L: 7251 - } + if (ServerPacket.field3164 == var1.serverPacket) { // L: 7247 + class1.updatePlayers(var3, var1.serverPacketLength); // L: 7248 + class101.method2552(); // L: 7249 + var1.serverPacket = null; // L: 7250 + return true; // L: 7251 + } - var1.serverPacket = null; // L: 7252 - return true; // L: 7253 - } + Widget var68; + if (ServerPacket.field3156 == var1.serverPacket) { // L: 7253 + var67 = var3.method7701(); // L: 7254 + var68 = class92.getWidget(var67); // L: 7255 + var68.modelType = 3; // L: 7256 + var68.modelId = ModelData0.localPlayer.appearance.getChatHeadId(); // L: 7257 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var68); // L: 7258 + var1.serverPacket = null; // L: 7259 + return true; // L: 7260 + } - if (var72 >= 0) { // L: 7255 - currentClanChannels[var72] = new ClanChannel(var3); // L: 7256 + if (ServerPacket.field3176 == var1.serverPacket) { // L: 7262 + SecureRandomCallable.logOut(); // L: 7263 + var1.serverPacket = null; // L: 7264 + return false; // L: 7265 + } + + if (ServerPacket.field3181 == var1.serverPacket) { // L: 7267 + field692 = cycleCntr; // L: 7268 + var20 = var3.readByte(); // L: 7269 + class145 var69 = new class145(var3); // L: 7270 + ClanChannel var72; + if (var20 >= 0) { // L: 7272 + var72 = currentClanChannels[var20]; } else { - class21.guestClanChannel = new ClanChannel(var3); // L: 7259 + var72 = UserComparator10.guestClanChannel; // L: 7273 } - var1.serverPacket = null; // L: 7261 - return true; // L: 7262 + var69.method2987(var72); // L: 7274 + var1.serverPacket = null; // L: 7275 + return true; // L: 7276 } - if (ServerPacket.field3049 == var1.serverPacket) { // L: 7264 - if (HorizontalAlignment.field1885 == null) { // L: 7265 - HorizontalAlignment.field1885 = new class391(DirectByteArrayCopier.HitSplatDefinition_cached); + if (ServerPacket.field3143 == var1.serverPacket) { // L: 7278 + Occluder.method4222(class263.field3063); // L: 7279 + var1.serverPacket = null; // L: 7280 + return true; // L: 7281 + } + + if (ServerPacket.field3188 == var1.serverPacket) { // L: 7283 + var67 = var3.method7554(); // L: 7284 + var5 = var3.method7593(); // L: 7285 + var6 = var3.method7567(); // L: 7286 + var7 = (InterfaceParent)interfaceParents.get((long)var6); // L: 7287 + if (var7 != null) { // L: 7288 + NetSocket.closeInterface(var7, var67 != var7.group); } - class445 var50 = DirectByteArrayCopier.HitSplatDefinition_cached.method7115(var3); // L: 7266 - HorizontalAlignment.field1885.field4373.vmethod7464(var50.field4683, var50.field4681); // L: 7267 - field698[++field699 - 1 & 31] = var50.field4683; // L: 7268 - var1.serverPacket = null; // L: 7269 - return true; // L: 7270 + class241.method4812(var6, var67, var5); // L: 7289 + var1.serverPacket = null; // L: 7290 + return true; // L: 7291 } - if (ServerPacket.field3072 == var1.serverPacket) { // L: 7272 - var20 = var3.readUnsignedShort(); // L: 7273 - byte var55 = var3.method7707(); // L: 7274 - Varps.Varps_temp[var20] = var55; // L: 7275 - if (Varps.Varps_main[var20] != var55) { // L: 7276 - Varps.Varps_main[var20] = var55; // L: 7277 + if (ServerPacket.field3170 == var1.serverPacket) { // L: 7293 + var67 = var3.method7701(); // L: 7294 + var5 = var3.method7701(); // L: 7295 + InterfaceParent var70 = (InterfaceParent)interfaceParents.get((long)var67); // L: 7296 + var7 = (InterfaceParent)interfaceParents.get((long)var5); // L: 7297 + if (var7 != null) { // L: 7298 + NetSocket.closeInterface(var7, var70 == null || var70.group != var7.group); } - WorldMapLabel.changeGameOptions(var20); // L: 7279 - changedVarps[++changedVarpCount - 1 & 31] = var20; // L: 7280 - var1.serverPacket = null; // L: 7281 - return true; // L: 7282 + if (var70 != null) { // L: 7299 + var70.remove(); // L: 7300 + interfaceParents.put(var70, (long)var5); // L: 7301 + } + + var26 = class92.getWidget(var67); // L: 7303 + if (var26 != null) { // L: 7304 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var26); + } + + var26 = class92.getWidget(var5); // L: 7305 + if (var26 != null) { // L: 7306 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var26); // L: 7307 + UserComparator8.revalidateWidgetScroll(NetSocket.Widget_interfaceComponents[var26.id >>> 16], var26, true); // L: 7308 + } + + if (rootInterface != -1) { // L: 7310 + WorldMapLabelSize.runIntfCloseListeners(rootInterface, 1); + } + + var1.serverPacket = null; // L: 7311 + return true; // L: 7312 } - if (ServerPacket.field3124 == var1.serverPacket) { // L: 7284 - var5 = var3.method7827(); // L: 7289 - var6 = var3.method7714(); // L: 7290 - var20 = var3.method7713(); // L: 7291 - var57 = npcs[var20]; // L: 7292 - if (var57 != null) { // L: 7293 - var57.spotAnimation = var6; // L: 7294 - var57.spotAnimationHeight = var5 >> 16; // L: 7295 - var57.field1134 = (var5 & 65535) + cycle; // L: 7296 - var57.spotAnimationFrame = 0; // L: 7297 - var57.spotAnimationFrameCycle = 0; // L: 7298 - if (var57.field1134 > cycle) { // L: 7299 - var57.spotAnimationFrame = -1; // L: 7300 - } + if (ServerPacket.field3108 == var1.serverPacket) { // L: 7314 + var48 = var3.readStringCp1252NullTerminated(); // L: 7315 + var31 = var3.readLong(); // L: 7316 + var33 = (long)var3.readUnsignedShort(); // L: 7317 + var41 = (long)var3.readMedium(); // L: 7318 + PlayerType var43 = (PlayerType)class291.findEnumerated(class118.PlayerType_values(), var3.readUnsignedByte()); // L: 7319 + var44 = (var33 << 32) + var41; // L: 7320 + boolean var88 = false; // L: 7321 - if (var57.spotAnimation == 65535) { // L: 7302 - var57.spotAnimation = -1; // L: 7303 + for (var15 = 0; var15 < 100; ++var15) { // L: 7322 + if (crossWorldMessageIds[var15] == var44) { // L: 7323 + var88 = true; // L: 7324 + break; // L: 7325 } } - var1.serverPacket = null; // L: 7306 - return true; // L: 7307 - } - - if (ServerPacket.field3084 == var1.serverPacket) { // L: 7309 - var3.offset += 28; // L: 7310 - if (var3.checkCrc()) { // L: 7311 - DefaultsGroup.method6936(var3, var3.offset - 28); + if (var43.isUser && BufferedSource.friendSystem.isIgnored(new Username(var48, class391.loginType))) { // L: 7328 7329 + var88 = true; } - var1.serverPacket = null; // L: 7312 - return true; // L: 7313 - } - - if (ServerPacket.field3099 == var1.serverPacket) { // L: 7315 - WorldMapSection1.updateNpcs(false, var3); // L: 7316 - var1.serverPacket = null; // L: 7317 - return true; // L: 7318 - } - - if (ServerPacket.field3126 == var1.serverPacket) { // L: 7320 - int var18 = var3.readUnsignedByte(); // L: 7336 - var16 = var3.method7715(); // L: 7337 - var6 = var3.method7793(); // L: 7338 - var20 = var6 >> 16; // L: 7339 - var5 = var6 >> 8 & 255; // L: 7340 - var22 = var20 + (var6 >> 4 & 7); // L: 7341 - var8 = var5 + (var6 & 7); // L: 7342 - byte var9 = var3.readByte(); // L: 7343 - var24 = var3.method7715(); // L: 7344 - var13 = var3.method7875() * 4; // L: 7345 - byte var10 = var3.method7707(); // L: 7346 - var15 = var3.method7713(); // L: 7347 - int var17 = var3.readUnsignedByte(); // L: 7348 - var33 = var3.method7742() * 4; // L: 7349 - var11 = var3.method7716(); // L: 7350 - var61 = var9 + var22; // L: 7351 - var62 = var10 + var8; // L: 7352 - if (var22 >= 0 && var8 >= 0 && var22 < 104 && var8 < 104 && var61 >= 0 && var62 >= 0 && var61 < 104 && var62 < 104 && var24 != 65535) { // L: 7353 - var22 = var22 * 128 + 64; // L: 7354 - var8 = var8 * 128 + 64; // L: 7355 - var61 = var61 * 128 + 64; // L: 7356 - var62 = var62 * 128 + 64; // L: 7357 - Projectile var19 = new Projectile(var24, class18.Client_plane, var22, var8, WorldMapLabel.getTileHeight(var22, var8, class18.Client_plane) - var13, var15 + cycle, var16 + cycle, var17, var18, var11, var33); // L: 7358 - var19.setDestination(var61, var62, WorldMapLabel.getTileHeight(var61, var62, class18.Client_plane) - var33, var15 + cycle); // L: 7359 - projectiles.addFirst(var19); // L: 7360 - } - - var1.serverPacket = null; // L: 7362 - return true; // L: 7363 - } - - if (ServerPacket.field3118 == var1.serverPacket) { // L: 7365 - class143.method3072(); // L: 7366 - var20 = var3.method7742(); // L: 7367 - var5 = var3.method7773(); // L: 7368 - var6 = var3.method7837(); // L: 7369 - experience[var5] = var6; // L: 7370 - currentLevels[var5] = var20; // L: 7371 - levels[var5] = 1; // L: 7372 - - for (var22 = 0; var22 < 98; ++var22) { // L: 7373 - if (var6 >= Skills.Skills_experienceTable[var22]) { - levels[var5] = var22 + 2; + if (!var88 && field606 == 0) { // L: 7331 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var44; // L: 7332 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 7333 + var25 = AbstractFont.escapeBrackets(WorldMapManager.method4679(LoginPacket.method5025(var3))); // L: 7334 + if (var43.modIcon != -1) { // L: 7335 + UserComparator7.addChatMessage(9, StudioGame.method5590(var43.modIcon) + var48, var25, class263.base37DecodeLong(var31)); + } else { + UserComparator7.addChatMessage(9, var48, var25, class263.base37DecodeLong(var31)); // L: 7336 } } - changedSkills[++changedSkillsCount - 1 & 31] = var5; // L: 7374 - var1.serverPacket = null; // L: 7375 - return true; // L: 7376 + var1.serverPacket = null; // L: 7338 + return true; // L: 7339 } - if (ServerPacket.field3059 == var1.serverPacket && isCameraLocked) { // L: 7378 7379 - field754 = true; // L: 7380 - Script.field955 = var3.readUnsignedByte(); // L: 7381 - ArchiveDisk.field4309 = var3.readUnsignedByte(); // L: 7382 - NetFileRequest.field3960 = var3.readUnsignedByte(); // L: 7383 - class386.field4337 = var3.readUnsignedByte(); // L: 7384 + if (ServerPacket.field3093 == var1.serverPacket) { // L: 7341 + class92.method2377(var3.readStringCp1252NullTerminated()); // L: 7342 + var1.serverPacket = null; // L: 7343 + return true; // L: 7344 + } - for (var20 = 0; var20 < 5; ++var20) { // L: 7385 - field546[var20] = false; + if (ServerPacket.field3190 == var1.serverPacket) { // L: 7346 + var67 = var3.method7701(); // L: 7347 + var68 = class92.getWidget(var67); // L: 7348 + + for (var6 = 0; var6 < var68.itemIds.length; ++var6) { // L: 7349 + var68.itemIds[var6] = -1; // L: 7350 + var68.itemIds[var6] = 0; // L: 7351 } - var1.serverPacket = null; // L: 7386 - return true; // L: 7387 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var68); // L: 7353 + var1.serverPacket = null; // L: 7354 + return true; // L: 7355 } - if (ServerPacket.field3103 == var1.serverPacket) { // L: 7390 - var20 = var3.readUnsignedByte(); // L: 7391 - var5 = var3.readInt(); // L: 7392 - var6 = var3.method7715(); // L: 7393 - var7 = (InterfaceParent)interfaceParents.get((long)var5); // L: 7394 - if (var7 != null) { // L: 7395 - Script.closeInterface(var7, var6 != var7.group); + if (ServerPacket.field3185 == var1.serverPacket) { // L: 7357 + var20 = var3.readByte(); // L: 7358 + var31 = (long)var3.readUnsignedShort(); // L: 7359 + var33 = (long)var3.readMedium(); // L: 7360 + var41 = var33 + (var31 << 32); // L: 7361 + boolean var30 = false; // L: 7362 + ClanChannel var12 = var20 >= 0 ? currentClanChannels[var20] : UserComparator10.guestClanChannel; // L: 7363 + if (var12 == null) { // L: 7364 + var30 = true; + } else { + for (var13 = 0; var13 < 100; ++var13) { // L: 7366 + if (crossWorldMessageIds[var13] == var41) { // L: 7367 + var30 = true; // L: 7368 + break; // L: 7369 + } + } } - class4.method16(var5, var6, var20); // L: 7396 - var1.serverPacket = null; // L: 7397 - return true; // L: 7398 + if (!var30) { // L: 7373 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var41; // L: 7374 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 7375 + var39 = LoginPacket.method5025(var3); // L: 7376 + var40 = var20 >= 0 ? 43 : 46; // L: 7377 + UserComparator7.addChatMessage(var40, "", var39, var12.name); // L: 7378 + } + + var1.serverPacket = null; // L: 7380 + return true; // L: 7381 } - if (ServerPacket.field3115 == var1.serverPacket) { // L: 7400 - destinationX = var3.readUnsignedByte(); // L: 7401 - if (destinationX == 255) { // L: 7402 + if (ServerPacket.field3101 == var1.serverPacket) { // L: 7383 + if (var1.serverPacketLength == 0) { // L: 7384 + PcmPlayer.friendsChat = null; // L: 7385 + } else { + if (PcmPlayer.friendsChat == null) { // L: 7388 + PcmPlayer.friendsChat = new FriendsChat(class391.loginType, class82.client); // L: 7389 + } + + PcmPlayer.friendsChat.readUpdate(var3); // L: 7391 + } + + class194.method3804(); // L: 7393 + var1.serverPacket = null; // L: 7394 + return true; // L: 7395 + } + + if (ServerPacket.field3104 == var1.serverPacket) { // L: 7397 + publicChatMode = var3.readUnsignedByte(); // L: 7398 + tradeChatMode = var3.method7546(); // L: 7399 + var1.serverPacket = null; // L: 7400 + return true; // L: 7401 + } + + if (ServerPacket.field3168 == var1.serverPacket) { // L: 7403 + var67 = var3.readUnsignedByte(); // L: 7404 + var5 = var3.readUnsignedByte(); // L: 7405 + var6 = var3.readUnsignedByte(); // L: 7406 + var27 = var3.readUnsignedByte(); // L: 7407 + field743[var67] = true; // L: 7408 + field744[var67] = var5; // L: 7409 + field745[var67] = var6; // L: 7410 + field714[var67] = var27; // L: 7411 + field677[var67] = 0; // L: 7412 + var1.serverPacket = null; // L: 7413 + return true; // L: 7414 + } + + if (ServerPacket.field3109 == var1.serverPacket) { // L: 7416 + destinationX = var3.readUnsignedByte(); // L: 7417 + if (destinationX == 255) { // L: 7418 destinationX = 0; } - destinationY = var3.readUnsignedByte(); // L: 7403 - if (destinationY == 255) { // L: 7404 + destinationY = var3.readUnsignedByte(); // L: 7419 + if (destinationY == 255) { // L: 7420 destinationY = 0; } - var1.serverPacket = null; // L: 7405 - return true; // L: 7406 + var1.serverPacket = null; // L: 7421 + return true; // L: 7422 } - Widget.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -1948146481 * 766304815 : -1) + "," + (var1.field1325 != null ? var1.field1325.id * -1948146481 * 766304815 : -1) + "," + (var1.field1313 != null ? var1.field1313.id * -1948146481 * 766304815 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 7408 - ItemLayer.logOut(); // L: 7409 - } catch (IOException var48) { // L: 7411 - ClanChannelMember.method2868(); // L: 7412 - } catch (Exception var49) { - var21 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -1948146481 * 766304815 : -1) + "," + (var1.field1325 != null ? var1.field1325.id * -1948146481 * 766304815 : -1) + "," + (var1.field1313 != null ? var1.field1313.id * -1948146481 * 766304815 : -1) + "," + var1.serverPacketLength + "," + (GrandExchangeEvents.localPlayer.pathX[0] + GrandExchangeOfferOwnWorldComparator.baseX) + "," + (GrandExchangeEvents.localPlayer.pathY[0] + VarcInt.baseY) + ","; // L: 7415 + if (ServerPacket.field3100 == var1.serverPacket) { // L: 7424 + class393.field4428 = true; // L: 7425 + HorizontalAlignment.updateNpcs(true, var3); // L: 7426 + var1.serverPacket = null; // L: 7427 + return true; // L: 7428 + } - for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { // L: 7416 + if (ServerPacket.field3137 == var1.serverPacket) { // L: 7430 + var67 = var3.method7567(); // L: 7431 + var5 = var3.method7716(); // L: 7432 + var6 = var5 >> 10 & 31; // L: 7433 + var27 = var5 >> 5 & 31; // L: 7434 + var28 = var5 & 31; // L: 7435 + var9 = (var27 << 11) + (var6 << 19) + (var28 << 3); // L: 7436 + Widget var10 = class92.getWidget(var67); // L: 7437 + if (var9 != var10.color) { // L: 7438 + var10.color = var9; // L: 7439 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10); // L: 7440 + } + + var1.serverPacket = null; // L: 7442 + return true; // L: 7443 + } + + if (ServerPacket.field3129 == var1.serverPacket) { // L: 7445 + isCameraLocked = true; // L: 7446 + field742 = false; // L: 7447 + Players.field1317 = var3.readUnsignedByte(); // L: 7448 + TileItem.field1292 = var3.readUnsignedByte(); // L: 7449 + WorldMapSection1.field2898 = var3.readUnsignedShort(); // L: 7450 + class229.field2805 = var3.readUnsignedByte(); // L: 7451 + HitSplatDefinition.field2077 = var3.readUnsignedByte(); // L: 7452 + if (HitSplatDefinition.field2077 >= 100) { // L: 7453 + class343.cameraX = Players.field1317 * 128 + 64; // L: 7454 + FaceNormal.cameraZ = TileItem.field1292 * 128 + 64; // L: 7455 + class295.cameraY = class202.getTileHeight(class343.cameraX, FaceNormal.cameraZ, class128.Client_plane) - WorldMapSection1.field2898; // L: 7456 + } + + var1.serverPacket = null; // L: 7458 + return true; // L: 7459 + } + + if (ServerPacket.field3160 == var1.serverPacket) { // L: 7461 + hintArrowType = var3.readUnsignedByte(); // L: 7462 + if (hintArrowType == 1) { // L: 7463 + hintArrowNpcIndex = var3.readUnsignedShort(); + } + + if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 7464 + if (hintArrowType == 2) { // L: 7465 + hintArrowSubX = 64; // L: 7466 + hintArrowSubY = 64; // L: 7467 + } + + if (hintArrowType == 3) { // L: 7469 + hintArrowSubX = 0; // L: 7470 + hintArrowSubY = 64; // L: 7471 + } + + if (hintArrowType == 4) { // L: 7473 + hintArrowSubX = 128; // L: 7474 + hintArrowSubY = 64; // L: 7475 + } + + if (hintArrowType == 5) { // L: 7477 + hintArrowSubX = 64; // L: 7478 + hintArrowSubY = 0; // L: 7479 + } + + if (hintArrowType == 6) { // L: 7481 + hintArrowSubX = 64; // L: 7482 + hintArrowSubY = 128; // L: 7483 + } + + hintArrowType = 2; // L: 7485 + hintArrowX = var3.readUnsignedShort(); // L: 7486 + hintArrowY = var3.readUnsignedShort(); // L: 7487 + hintArrowHeight = var3.readUnsignedByte(); // L: 7488 + } + + if (hintArrowType == 10) { // L: 7490 + hintArrowPlayerIndex = var3.readUnsignedShort(); + } + + var1.serverPacket = null; // L: 7491 + return true; // L: 7492 + } + + if (ServerPacket.field3107 == var1.serverPacket) { // L: 7494 + var48 = var3.readStringCp1252NullTerminated(); // L: 7495 + var5 = var3.readInt(); // L: 7496 + var22 = class92.getWidget(var5); // L: 7497 + if (!var48.equals(var22.text)) { // L: 7498 + var22.text = var48; // L: 7499 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var22); // L: 7500 + } + + var1.serverPacket = null; // L: 7502 + return true; // L: 7503 + } + + if (ServerPacket.field3151 == var1.serverPacket) { // L: 7505 + class175.method3373(); // L: 7506 + var20 = var3.readByte(); // L: 7507 + if (var1.serverPacketLength == 1) { // L: 7508 + if (var20 >= 0) { // L: 7509 + currentClanSettings[var20] = null; + } else { + class358.guestClanSettings = null; // L: 7510 + } + + var1.serverPacket = null; // L: 7511 + return true; // L: 7512 + } + + if (var20 >= 0) { // L: 7514 + currentClanSettings[var20] = new ClanSettings(var3); // L: 7515 + } else { + class358.guestClanSettings = new ClanSettings(var3); // L: 7518 + } + + var1.serverPacket = null; // L: 7520 + return true; // L: 7521 + } + + if (ServerPacket.field3149 == var1.serverPacket) { // L: 7523 + BufferedSource.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 7524 + class121.FriendSystem_invalidateIgnoreds(); // L: 7525 + field689 = cycleCntr; // L: 7526 + var1.serverPacket = null; // L: 7527 + return true; // L: 7528 + } + + ArchiveDiskActionHandler.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * 1118619813 * -1591353555 : -1) + "," + (var1.field1340 != null ? var1.field1340.id * 1118619813 * -1591353555 : -1) + "," + (var1.field1345 != null ? var1.field1345.id * 1118619813 * -1591353555 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 7530 + SecureRandomCallable.logOut(); // L: 7531 + } catch (IOException var46) { // L: 7533 + class129.method2812(); // L: 7534 + } catch (Exception var47) { + var21 = "" + (var1.serverPacket != null ? var1.serverPacket.id * 1118619813 * -1591353555 : -1) + "," + (var1.field1340 != null ? var1.field1340.id * 1118619813 * -1591353555 : -1) + "," + (var1.field1345 != null ? var1.field1345.id * 1118619813 * -1591353555 : -1) + "," + var1.serverPacketLength + "," + (ModelData0.localPlayer.pathX[0] + SecureRandomCallable.baseX) + "," + (ModelData0.localPlayer.pathY[0] + GrandExchangeOfferOwnWorldComparator.baseY) + ","; // L: 7537 + + for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { // L: 7538 var21 = var21 + var3.array[var6] + ","; } - Widget.RunException_sendStackTrace(var21, var49); // L: 7417 - ItemLayer.logOut(); // L: 7418 + ArchiveDiskActionHandler.RunException_sendStackTrace(var21, var47); // L: 7539 + SecureRandomCallable.logOut(); // L: 7540 } - return true; // L: 7420 + return true; // L: 7542 } } - @ObfuscatedName("ic") + @ObfuscatedName("ik") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "117" + descriptor = "(I)V", + garbageValue = "1950620416" ) @Export("menu") final void menu() { - GrandExchangeOfferTotalQuantityComparator.incrementMenuEntries(); // L: 8667 - if (class142.dragInventoryWidget == null) { // L: 8668 - if (clickedWidget == null) { // L: 8669 - int var1 = MouseHandler.MouseHandler_lastButton; // L: 8670 - int var2; - int var3; - int var4; - int var5; - int var14; - if (isMenuOpen) { // L: 8671 - if (var1 != 1 && (GameBuild.mouseCam || var1 != 4)) { // L: 8672 - var2 = MouseHandler.MouseHandler_x; // L: 8673 - var3 = MouseHandler.MouseHandler_y; // L: 8674 - if (var2 < class138.menuX - 10 || var2 > class138.menuX + ItemComposition.menuWidth + 10 || var3 < class1.menuY - 10 || var3 > class1.menuY + ByteArrayPool.menuHeight + 10) { // L: 8675 - isMenuOpen = false; // L: 8676 - HealthBar.method2330(class138.menuX, class1.menuY, ItemComposition.menuWidth, ByteArrayPool.menuHeight); // L: 8677 - } - } + boolean var1 = false; // L: 8728 - if (var1 == 1 || !GameBuild.mouseCam && var1 == 4) { // L: 8680 - var2 = class138.menuX; // L: 8681 - var3 = class1.menuY; // L: 8682 - var4 = ItemComposition.menuWidth; // L: 8683 - var5 = MouseHandler.MouseHandler_lastPressedX; // L: 8684 - var14 = MouseHandler.MouseHandler_lastPressedY; // L: 8685 - int var15 = -1; // L: 8686 + int var2; + int var5; + while (!var1) { // L: 8729 + var1 = true; // L: 8730 - int var9; - int var16; - for (var16 = 0; var16 < menuOptionsCount; ++var16) { // L: 8687 - var9 = (menuOptionsCount - 1 - var16) * 15 + var3 + 31; // L: 8688 - if (var5 > var2 && var5 < var4 + var2 && var14 > var9 - 13 && var14 < var9 + 3) { // L: 8689 - var15 = var16; - } - } - - if (var15 != -1 && var15 >= 0) { // L: 8691 8692 - var16 = menuArguments1[var15]; // L: 8693 - var9 = menuArguments2[var15]; // L: 8694 - int var10 = menuOpcodes[var15]; // L: 8695 - int var11 = menuIdentifiers[var15]; // L: 8696 - String var12 = menuActions[var15]; // L: 8697 - String var13 = menuTargets[var15]; // L: 8698 - class9.menuAction(var16, var9, var10, var11, var12, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 8699 - } - - isMenuOpen = false; // L: 8701 - HealthBar.method2330(class138.menuX, class1.menuY, ItemComposition.menuWidth, ByteArrayPool.menuHeight); // L: 8702 - } - } else { - var2 = GameBuild.method5773(); // L: 8706 - if ((var1 == 1 || !GameBuild.mouseCam && var1 == 4) && var2 >= 0) { // L: 8707 - var3 = menuOpcodes[var2]; // L: 8708 - 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: 8709 - var4 = menuArguments1[var2]; // L: 8710 - var5 = menuArguments2[var2]; // L: 8711 - Widget var6 = class127.getWidget(var5); // L: 8712 - if (FriendSystem.method1698(class326.getWidgetFlags(var6)) || ReflectionCheck.method1079(class326.getWidgetFlags(var6))) { // L: 8713 - if (class142.dragInventoryWidget != null && !field767 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 8714 8715 - UrlRequest.method2551(draggedWidgetX, draggedWidgetY); // L: 8716 - } - - field767 = false; // L: 8719 - itemDragDuration = 0; // L: 8720 - if (class142.dragInventoryWidget != null) { // L: 8721 - class346.invalidateWidget(class142.dragInventoryWidget); - } - - class142.dragInventoryWidget = class127.getWidget(var5); // L: 8722 - dragItemSlotSource = var4; // L: 8723 - draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 8724 - draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 8725 - if (var2 >= 0) { // L: 8726 - Interpreter.tempMenuAction = new MenuAction(); // L: 8727 - Interpreter.tempMenuAction.param0 = menuArguments1[var2]; // L: 8728 - Interpreter.tempMenuAction.param1 = menuArguments2[var2]; // L: 8729 - Interpreter.tempMenuAction.opcode = menuOpcodes[var2]; // L: 8730 - Interpreter.tempMenuAction.identifier = menuIdentifiers[var2]; // L: 8731 - Interpreter.tempMenuAction.action = menuActions[var2]; // L: 8732 - } - - class346.invalidateWidget(class142.dragInventoryWidget); // L: 8734 - return; // L: 8735 - } - } - } - - if ((var1 == 1 || !GameBuild.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { // L: 8739 8740 - var1 = 2; // L: 8741 - } - - if ((var1 == 1 || !GameBuild.mouseCam && var1 == 4) && menuOptionsCount > 0 && var2 >= 0) { // L: 8744 8746 - var3 = menuArguments1[var2]; // L: 8747 - var4 = menuArguments2[var2]; // L: 8748 - var5 = menuOpcodes[var2]; // L: 8749 - var14 = menuIdentifiers[var2]; // L: 8750 - String var7 = menuActions[var2]; // L: 8751 - String var8 = menuTargets[var2]; // L: 8752 - class9.menuAction(var3, var4, var5, var14, var7, var8, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 8753 - } - - if (var1 == 2 && menuOptionsCount > 0) { // L: 8756 - this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } + for (var2 = 0; var2 < menuOptionsCount - 1; ++var2) { // L: 8731 + if (menuOpcodes[var2] < 1000 && menuOpcodes[var2 + 1] > 1000) { // L: 8732 + String var14 = menuTargets[var2]; // L: 8733 + menuTargets[var2] = menuTargets[var2 + 1]; // L: 8734 + menuTargets[var2 + 1] = var14; // L: 8735 + String var15 = menuActions[var2]; // L: 8736 + menuActions[var2] = menuActions[var2 + 1]; // L: 8737 + menuActions[var2 + 1] = var15; // L: 8738 + var5 = menuOpcodes[var2]; // L: 8739 + menuOpcodes[var2] = menuOpcodes[var2 + 1]; // L: 8740 + menuOpcodes[var2 + 1] = var5; // L: 8741 + var5 = menuArguments1[var2]; // L: 8742 + menuArguments1[var2] = menuArguments1[var2 + 1]; // L: 8743 + menuArguments1[var2 + 1] = var5; // L: 8744 + var5 = menuArguments2[var2]; // L: 8745 + menuArguments2[var2] = menuArguments2[var2 + 1]; // L: 8746 + menuArguments2[var2 + 1] = var5; // L: 8747 + var5 = menuIdentifiers[var2]; // L: 8748 + menuIdentifiers[var2] = menuIdentifiers[var2 + 1]; // L: 8749 + menuIdentifiers[var2 + 1] = var5; // L: 8750 + boolean var6 = menuShiftClick[var2]; // L: 8751 + menuShiftClick[var2] = menuShiftClick[var2 + 1]; // L: 8752 + menuShiftClick[var2 + 1] = var6; // L: 8753 + var1 = false; // L: 8754 } - } } - } // L: 8758 - @ObfuscatedName("ij") + if (Canvas.dragInventoryWidget == null) { // L: 8759 + if (clickedWidget == null) { // L: 8760 + int var11; + int var17; + label262: { + int var16 = MouseHandler.MouseHandler_lastButton; // L: 8761 + int var4; + int var9; + if (isMenuOpen) { // L: 8762 + int var3; + if (var16 != 1 && (Login.mouseCam || var16 != 4)) { // L: 8763 + var2 = MouseHandler.MouseHandler_x; // L: 8764 + var3 = MouseHandler.MouseHandler_y; // L: 8765 + if (var2 < BuddyRankComparator.menuX - 10 || var2 > KeyHandler.menuWidth + BuddyRankComparator.menuX + 10 || var3 < FontName.menuY - 10 || var3 > FontName.menuY + class7.menuHeight + 10) { // L: 8766 + isMenuOpen = false; // L: 8767 + class132.method2836(BuddyRankComparator.menuX, FontName.menuY, KeyHandler.menuWidth, class7.menuHeight); // L: 8768 + } + } + + if (var16 == 1 || !Login.mouseCam && var16 == 4) { // L: 8771 + var2 = BuddyRankComparator.menuX; // L: 8772 + var3 = FontName.menuY; // L: 8773 + var4 = KeyHandler.menuWidth; // L: 8774 + var5 = MouseHandler.MouseHandler_lastPressedX; // L: 8775 + var17 = MouseHandler.MouseHandler_lastPressedY; // L: 8776 + int var13 = -1; // L: 8777 + + for (int var18 = 0; var18 < menuOptionsCount; ++var18) { // L: 8778 + var9 = (menuOptionsCount - 1 - var18) * 15 + var3 + 31; // L: 8779 + if (var5 > var2 && var5 < var2 + var4 && var17 > var9 - 13 && var17 < var9 + 3) { // L: 8780 + var13 = var18; + } + } + + if (var13 != -1) { // L: 8782 + Renderable.method4211(var13); + } + + isMenuOpen = false; // L: 8783 + class132.method2836(BuddyRankComparator.menuX, FontName.menuY, KeyHandler.menuWidth, class7.menuHeight); // L: 8784 + } + } else { + var2 = menuOptionsCount - 1; // L: 8790 + if ((var16 == 1 || !Login.mouseCam && var16 == 4) && var2 >= 0) { // L: 8793 + var4 = menuOpcodes[var2]; // L: 8794 + if (var4 == 39 || var4 == 40 || var4 == 41 || var4 == 42 || var4 == 43 || var4 == 33 || var4 == 34 || var4 == 35 || var4 == 36 || var4 == 37 || var4 == 38 || var4 == 1005) { // L: 8795 + var5 = menuArguments1[var2]; // L: 8796 + var17 = menuArguments2[var2]; // L: 8797 + Widget var7 = class92.getWidget(var17); // L: 8798 + var9 = UrlRequester.getWidgetFlags(var7); // L: 8800 + boolean var8 = (var9 >> 28 & 1) != 0; // L: 8802 + if (var8) { // L: 8805 + break label262; + } + + var11 = UrlRequester.getWidgetFlags(var7); // L: 8807 + boolean var10 = (var11 >> 29 & 1) != 0; // L: 8809 + if (var10) { // L: 8811 + break label262; + } + } + } + + if ((var16 == 1 || !Login.mouseCam && var16 == 4) && this.shouldLeftClickOpenMenu()) { // L: 8841 8842 + var16 = 2; // L: 8843 + } + + if ((var16 == 1 || !Login.mouseCam && var16 == 4) && menuOptionsCount > 0) { // L: 8846 + Renderable.method4211(var2); // L: 8847 + } + + if (var16 == 2 && menuOptionsCount > 0) { // L: 8849 + this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + } + } + + return; // L: 8851 + } + + if (Canvas.dragInventoryWidget != null && !field604 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 8813 8814 + int var19 = draggedWidgetX; // L: 8815 + var11 = draggedWidgetY; // L: 8816 + MenuAction var12 = class116.tempMenuAction; // L: 8818 + if (var12 != null) { // L: 8820 + ModeWhere.menuAction(var12.param0, var12.param1, var12.opcode, var12.identifier, var12.action, var12.action, var19, var11); // L: 8821 + } + + class116.tempMenuAction = null; // L: 8824 + } + + field604 = false; // L: 8828 + itemDragDuration = 0; // L: 8829 + if (Canvas.dragInventoryWidget != null) { // L: 8830 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(Canvas.dragInventoryWidget); + } + + Canvas.dragInventoryWidget = class92.getWidget(var17); // L: 8831 + dragItemSlotSource = var5; // L: 8832 + draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 8833 + draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 8834 + if (var2 >= 0) { // L: 8835 + Players.method2426(var2); + } + + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(Canvas.dragInventoryWidget); // L: 8836 + } + } + } // L: 8837 + + @ObfuscatedName("ih") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "26" + garbageValue = "1" ) @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - int var1 = GameBuild.method5773(); // L: 8761 - return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || SoundCache.method781(var1)) && !menuShiftClick[var1]; // L: 8762 + int var1 = menuOptionsCount - 1; // L: 8856 + return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || UrlRequester.method2539(var1)) && !menuShiftClick[var1]; // L: 8859 } - @ObfuscatedName("iw") + @ObfuscatedName("in") @ObfuscatedSignature( descriptor = "(IIB)V", - garbageValue = "39" + garbageValue = "-25" ) @Export("openMenu") final void openMenu(int var1, int var2) { - int var3 = RouteStrategy.fontBold12.stringWidth("Choose Option"); // L: 8767 + class119.method2739(var1, var2); // L: 8863 + var1 -= viewportOffsetX; // L: 8864 + var2 -= viewportOffsetY; // L: 8865 + class175.scene.menuOpen(class128.Client_plane, var1, var2, false); // L: 8866 + isMenuOpen = true; // L: 8867 + } // L: 8868 - int var4; - int var5; - for (var4 = 0; var4 < menuOptionsCount; ++var4) { // L: 8768 - var5 = RouteStrategy.fontBold12.stringWidth(AbstractUserComparator.method6736(var4)); // L: 8769 - if (var5 > var3) { // L: 8770 - var3 = var5; - } - } - - var3 += 8; // L: 8772 - var4 = menuOptionsCount * 15 + 22; // L: 8773 - var5 = var1 - var3 / 2; // L: 8774 - if (var5 + var3 > InvDefinition.canvasWidth) { // L: 8775 - var5 = InvDefinition.canvasWidth - var3; - } - - if (var5 < 0) { // L: 8776 - var5 = 0; - } - - int var6 = var2; // L: 8777 - if (var4 + var2 > class321.canvasHeight) { // L: 8778 - var6 = class321.canvasHeight - var4; - } - - if (var6 < 0) { // L: 8779 - var6 = 0; - } - - class138.menuX = var5; // L: 8780 - class1.menuY = var6; // L: 8781 - ItemComposition.menuWidth = var3; // L: 8782 - ByteArrayPool.menuHeight = menuOptionsCount * 15 + 22; // L: 8783 - var1 -= viewportOffsetX; // L: 8785 - var2 -= viewportOffsetY; // L: 8786 - ArchiveLoader.scene.menuOpen(class18.Client_plane, var1, var2, false); // L: 8787 - isMenuOpen = true; // L: 8788 - } // L: 8789 - - @ObfuscatedName("jo") + @ObfuscatedName("ja") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "982244774" + descriptor = "(ZB)V", + garbageValue = "16" ) @Export("resizeRoot") final void resizeRoot(boolean var1) { - int var2 = rootInterface; // L: 10763 - int var3 = InvDefinition.canvasWidth; // L: 10764 - int var4 = class321.canvasHeight; // L: 10765 - if (class155.loadInterface(var2)) { // L: 10767 - ModelData0.resizeInterface(Widget.Widget_interfaceComponents[var2], -1, var3, var4, var1); // L: 10768 + int var2 = rootInterface; // L: 10739 + int var3 = GraphicsObject.canvasWidth; // L: 10740 + int var4 = class433.canvasHeight; // L: 10741 + if (WorldMapDecoration.loadInterface(var2)) { // L: 10743 + Language.resizeInterface(NetSocket.Widget_interfaceComponents[var2], -1, var3, var4, var1); // L: 10744 } - } // L: 10770 + } // L: 10746 - @ObfuscatedName("jr") + @ObfuscatedName("jm") @ObfuscatedSignature( - descriptor = "(Lky;I)V", - garbageValue = "-2147483648" + descriptor = "(Lki;B)V", + garbageValue = "7" ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : class127.getWidget(var1.parentId); // L: 10773 + Widget var2 = var1.parentId == -1 ? null : class92.getWidget(var1.parentId); // L: 10749 int var3; int var4; - if (var2 == null) { // L: 10776 - var3 = InvDefinition.canvasWidth; // L: 10777 - var4 = class321.canvasHeight; // L: 10778 + if (var2 == null) { // L: 10752 + var3 = GraphicsObject.canvasWidth; // L: 10753 + var4 = class433.canvasHeight; // L: 10754 } else { - var3 = var2.width; // L: 10781 - var4 = var2.height; // L: 10782 + var3 = var2.width; // L: 10757 + var4 = var2.height; // L: 10758 } - ApproximateRouteStrategy.alignWidgetSize(var1, var3, var4, false); // L: 10784 - HealthBarUpdate.alignWidgetPosition(var1, var3, var4); // L: 10785 - } // L: 10786 + FloorOverlayDefinition.alignWidgetSize(var1, var3, var4, false); // L: 10760 + ChatChannel.alignWidgetPosition(var1, var3, var4); // L: 10761 + } // L: 10762 - @ObfuscatedName("kg") + @ObfuscatedName("jz") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-20" + descriptor = "(I)V", + garbageValue = "1857303053" ) - final void method1164() { - class346.invalidateWidget(clickedWidget); // L: 11773 - ++class124.widgetDragDuration; // L: 11774 - if (field687 && field696) { // L: 11775 - int var1 = MouseHandler.MouseHandler_x; // L: 11784 - int var2 = MouseHandler.MouseHandler_y; // L: 11785 - var1 -= widgetClickX; // L: 11786 - var2 -= widgetClickY; // L: 11787 - if (var1 < field773) { // L: 11788 - var1 = field773; + final void method1150() { + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(clickedWidget); // L: 11793 + ++SoundSystem.widgetDragDuration; // L: 11794 + int var1; + int var2; + if (field675 && field574) { // L: 11795 + var1 = MouseHandler.MouseHandler_x; // L: 11814 + var2 = MouseHandler.MouseHandler_y; // L: 11815 + var1 -= widgetClickX; // L: 11816 + var2 -= widgetClickY; // L: 11817 + if (var1 < field747) { // L: 11818 + var1 = field747; } - if (var1 + clickedWidget.width > field773 + clickedWidgetParent.width) { // L: 11789 - var1 = field773 + clickedWidgetParent.width - clickedWidget.width; + if (var1 + clickedWidget.width > field747 + clickedWidgetParent.width) { // L: 11819 + var1 = field747 + clickedWidgetParent.width - clickedWidget.width; } - if (var2 < field686) { // L: 11790 - var2 = field686; + if (var2 < field674) { // L: 11820 + var2 = field674; } - if (var2 + clickedWidget.height > field686 + clickedWidgetParent.height) { // L: 11791 - var2 = field686 + clickedWidgetParent.height - clickedWidget.height; + if (var2 + clickedWidget.height > field674 + clickedWidgetParent.height) { // L: 11821 + var2 = field674 + clickedWidgetParent.height - clickedWidget.height; } - int var3 = var1 - field688; // L: 11792 - int var4 = var2 - field757; // L: 11793 - int var5 = clickedWidget.dragZoneSize; // L: 11794 - if (class124.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 11795 11796 - isDraggingWidget = true; // L: 11797 + int var3 = var1 - field653; // L: 11822 + int var4 = var2 - field612; // L: 11823 + int var5 = clickedWidget.dragZoneSize; // L: 11824 + if (SoundSystem.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 11825 11826 + isDraggingWidget = true; // L: 11827 } - int var6 = var1 - field773 + clickedWidgetParent.scrollX; // L: 11800 - int var7 = var2 - field686 + clickedWidgetParent.scrollY; // L: 11801 + int var6 = var1 - field747 + clickedWidgetParent.scrollX; // L: 11830 + int var7 = var2 - field674 + clickedWidgetParent.scrollY; // L: 11831 ScriptEvent var8; - if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 11802 - var8 = new ScriptEvent(); // L: 11803 - var8.widget = clickedWidget; // L: 11804 - var8.mouseX = var6; // L: 11805 - var8.mouseY = var7; // L: 11806 - var8.args = clickedWidget.onDrag; // L: 11807 - ClanSettings.runScriptEvent(var8); // L: 11808 + if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 11832 + var8 = new ScriptEvent(); // L: 11833 + var8.widget = clickedWidget; // L: 11834 + var8.mouseX = var6; // L: 11835 + var8.mouseY = var7; // L: 11836 + var8.args = clickedWidget.onDrag; // L: 11837 + class144.runScriptEvent(var8); // L: 11838 } - if (MouseHandler.MouseHandler_currentButton == 0) { // L: 11810 - if (isDraggingWidget) { // L: 11811 - if (clickedWidget.onDragComplete != null) { // L: 11812 - var8 = new ScriptEvent(); // L: 11813 - var8.widget = clickedWidget; // L: 11814 - var8.mouseX = var6; // L: 11815 - var8.mouseY = var7; // L: 11816 - var8.dragTarget = draggedOnWidget; // L: 11817 - var8.args = clickedWidget.onDragComplete; // L: 11818 - ClanSettings.runScriptEvent(var8); // L: 11819 + if (MouseHandler.MouseHandler_currentButton == 0) { // L: 11840 + if (isDraggingWidget) { // L: 11841 + if (clickedWidget.onDragComplete != null) { // L: 11842 + var8 = new ScriptEvent(); // L: 11843 + var8.widget = clickedWidget; // L: 11844 + var8.mouseX = var6; // L: 11845 + var8.mouseY = var7; // L: 11846 + var8.dragTarget = draggedOnWidget; // L: 11847 + var8.args = clickedWidget.onDragComplete; // L: 11848 + class144.runScriptEvent(var8); // L: 11849 } - if (draggedOnWidget != null) { // L: 11821 - Widget var9 = clickedWidget; // L: 11823 - int var10 = Players.method2420(class326.getWidgetFlags(var9)); // L: 11825 - Widget var13; - if (var10 == 0) { // L: 11826 - var13 = null; // L: 11827 + if (draggedOnWidget != null) { // L: 11851 + Widget var15 = clickedWidget; // L: 11853 + int var11 = UrlRequester.getWidgetFlags(var15); // L: 11856 + int var16 = var11 >> 17 & 7; // L: 11858 + int var12 = var16; // L: 11860 + Widget var18; + if (var16 == 0) { // L: 11861 + var18 = null; // L: 11862 } else { - int var11 = 0; + int var13 = 0; while (true) { - if (var11 >= var10) { - var13 = var9; // L: 11837 + if (var13 >= var12) { + var18 = var15; // L: 11872 break; } - var9 = class127.getWidget(var9.parentId); // L: 11831 - if (var9 == null) { // L: 11832 - var13 = null; // L: 11833 - break; // L: 11834 + var15 = class92.getWidget(var15.parentId); // L: 11866 + if (var15 == null) { // L: 11867 + var18 = null; // L: 11868 + break; // L: 11869 } - ++var11; // L: 11830 + ++var13; // L: 11865 } } - if (var13 != null) { // L: 11839 - PacketBufferNode var12 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2919, packetWriter.isaacCipher); // L: 11841 - var12.packetBuffer.method7723(clickedWidget.id); // L: 11842 - var12.packetBuffer.writeShort(clickedWidget.childIndex); // L: 11843 - var12.packetBuffer.method7711(clickedWidget.itemId); // L: 11844 - var12.packetBuffer.writeShort(draggedOnWidget.childIndex); // L: 11845 - var12.packetBuffer.method7712(draggedOnWidget.itemId); // L: 11846 - var12.packetBuffer.method7723(draggedOnWidget.id); // L: 11847 - packetWriter.addNode(var12); // L: 11848 + if (var18 != null) { // L: 11874 + PacketBufferNode var19 = WallDecoration.getPacketBufferNode(ClientPacket.field3029, packetWriter.isaacCipher); // L: 11876 + var19.packetBuffer.writeShort(clickedWidget.childIndex); // L: 11877 + var19.packetBuffer.method7563(draggedOnWidget.id); // L: 11878 + var19.packetBuffer.writeShort(draggedOnWidget.childIndex); // L: 11879 + var19.packetBuffer.writeShort(draggedOnWidget.itemId); // L: 11880 + var19.packetBuffer.writeIntME(clickedWidget.id); // L: 11881 + var19.packetBuffer.writeShort(clickedWidget.itemId); // L: 11882 + packetWriter.addNode(var19); // L: 11883 } } - } else if (this.shouldLeftClickOpenMenu()) { // L: 11853 - this.openMenu(widgetClickX + field688, widgetClickY + field757); // L: 11854 - } else if (menuOptionsCount > 0) { // L: 11856 - UrlRequest.method2551(widgetClickX + field688, widgetClickY + field757); // L: 11857 + } else if (this.shouldLeftClickOpenMenu()) { // L: 11888 + this.openMenu(widgetClickX + field653, widgetClickY + field612); // L: 11889 + } else if (menuOptionsCount > 0) { // L: 11891 + int var14 = field653 + widgetClickX; // L: 11892 + int var9 = widgetClickY + field612; // L: 11893 + MenuAction var10 = class116.tempMenuAction; // L: 11895 + if (var10 != null) { // L: 11897 + ModeWhere.menuAction(var10.param0, var10.param1, var10.opcode, var10.identifier, var10.action, var10.action, var14, var9); // L: 11898 + } + + class116.tempMenuAction = null; // L: 11901 } - clickedWidget = null; // L: 11860 + clickedWidget = null; // L: 11905 } } else { - if (class124.widgetDragDuration > 1) { // L: 11776 - if (!isDraggingWidget && menuOptionsCount > 0) { // L: 11777 - UrlRequest.method2551(widgetClickX + field688, field757 + widgetClickY); // L: 11778 + if (SoundSystem.widgetDragDuration > 1) { // L: 11796 + if (!isDraggingWidget && menuOptionsCount > 0) { // L: 11797 + var1 = widgetClickX + field653; // L: 11798 + var2 = field612 + widgetClickY; // L: 11799 + MenuAction var17 = class116.tempMenuAction; // L: 11801 + if (var17 != null) { // L: 11803 + ModeWhere.menuAction(var17.param0, var17.param1, var17.opcode, var17.identifier, var17.action, var17.action, var1, var2); // L: 11804 + } + + class116.tempMenuAction = null; // L: 11807 } - clickedWidget = null; // L: 11780 + clickedWidget = null; // L: 11810 } } - } // L: 11782 11862 + } // L: 11812 11907 - @ObfuscatedName("la") + @ObfuscatedName("lt") @ObfuscatedSignature( - descriptor = "(I)Lqb;", - garbageValue = "529633925" + descriptor = "(B)Lqv;", + garbageValue = "-38" ) @Export("username") public Username username() { - return GrandExchangeEvents.localPlayer != null ? GrandExchangeEvents.localPlayer.username : null; // L: 12585 + return ModelData0.localPlayer != null ? ModelData0.localPlayer.username : null; // L: 12651 } + public void setOtlTokenRequester(OtlTokenRequester var1) { + if (var1 != null) { // L: 824 + this.field478 = var1; // L: 827 + class126.method2799(10); // L: 828 + } + } // L: 825 829 + + public long getAccountHash() { + return this.field531; // L: 848 + } + + public boolean isOnLoginScreen() { + return gameState == 10; // L: 843 + } + + public void setRefreshTokenRequester(RefreshAccessTokenRequester var1) { + if (var1 != null) { // L: 834 + this.field577 = var1; // L: 837 + } + } // L: 835 838 + public final void init() { try { - if (this.checkHost()) { // L: 674 - for (int var1 = 0; var1 <= 27; ++var1) { // L: 675 - String var2 = this.getParameter(Integer.toString(var1)); // L: 676 - if (var2 != null) { // L: 677 - switch(var1) { // L: 678 + if (this.checkHost()) { // L: 689 + for (int var1 = 0; var1 <= 28; ++var1) { // L: 690 + String var2 = this.getParameter(Integer.toString(var1)); // L: 691 + if (var2 != null) { // L: 692 + switch(var1) { // L: 693 case 1: - useBufferedSocket = Integer.parseInt(var2) != 0; // L: 691 + useBufferedSocket = Integer.parseInt(var2) != 0; // L: 696 case 2: case 13: case 16: @@ -6048,126 +6565,791 @@ public final class Client extends GameEngine implements Usernamed, OAuthApi { default: break; case 3: - if (var2.equalsIgnoreCase("true")) { // L: 721 + if (var2.equalsIgnoreCase("true")) { // L: 747 isMembersWorld = true; } else { - isMembersWorld = false; // L: 722 + isMembersWorld = false; // L: 748 } break; case 4: - if (clientType == -1) { // L: 727 - clientType = Integer.parseInt(var2); // L: 728 + if (clientType == -1) { // L: 773 + clientType = Integer.parseInt(var2); // L: 774 } break; case 5: - worldProperties = Integer.parseInt(var2); // L: 757 - break; // L: 758 + worldProperties = Integer.parseInt(var2); // L: 753 + break; // L: 754 case 6: - Skills.clientLanguage = Language.method6077(Integer.parseInt(var2)); // L: 686 - break; // L: 687 + int var4 = Integer.parseInt(var2); // L: 713 + Language var9; + if (var4 >= 0 && var4 < Language.Language_valuesOrdered.length) { // L: 715 + var9 = Language.Language_valuesOrdered[var4]; // L: 719 + } else { + var9 = null; // L: 716 + } + + class263.clientLanguage = var9; // L: 721 + break; // L: 722 case 7: - class301.field3545 = KeyHandler.method332(Integer.parseInt(var2)); // L: 711 - break; // L: 712 + AbstractArchive.field4038 = AbstractWorldMapData.method4799(Integer.parseInt(var2)); // L: 763 + break; // L: 764 case 8: - if (var2.equalsIgnoreCase("true")) { // L: 734 + if (var2.equalsIgnoreCase("true")) { // L: 706 } break; case 9: - class65.field868 = var2; // L: 706 - break; // L: 707 + field662 = var2; // L: 758 + break; // L: 759 case 10: - Messages.field1305 = (StudioGame)MusicPatchPcmStream.findEnumerated(Message.method1116(), Integer.parseInt(var2)); // L: 740 - if (StudioGame.oldscape == Messages.field1305) { // L: 741 - class122.loginType = LoginType.oldscape; + StudioGame[] var3 = new StudioGame[]{StudioGame.game3, StudioGame.runescape, StudioGame.stellardawn, StudioGame.game5, StudioGame.game4, StudioGame.oldscape}; // L: 728 + ApproximateRouteStrategy.field473 = (StudioGame)class291.findEnumerated(var3, Integer.parseInt(var2)); // L: 730 + if (ApproximateRouteStrategy.field473 == StudioGame.oldscape) { // L: 731 + class391.loginType = LoginType.oldscape; } else { - class122.loginType = LoginType.field4555; // L: 742 + class391.loginType = LoginType.field4616; // L: 732 } break; case 11: - class113.field1372 = var2; // L: 716 - break; // L: 717 + ApproximateRouteStrategy.field471 = var2; // L: 780 + break; // L: 781 case 12: - worldId = Integer.parseInt(var2); // L: 681 - break; // L: 682 + worldId = Integer.parseInt(var2); // L: 785 + break; // L: 786 case 14: - GrandExchangeOfferOwnWorldComparator.field483 = Integer.parseInt(var2); // L: 752 - break; // L: 753 + class230.field2807 = Integer.parseInt(var2); // L: 742 + break; // L: 743 case 15: - gameBuild = Integer.parseInt(var2); // L: 701 - break; // L: 702 - case 17: - WorldMapElement.field1836 = var2; // L: 762 + gameBuild = Integer.parseInt(var2); // L: 790 break; + case 17: + class93.field1280 = var2; // L: 737 + break; // L: 738 case 21: - field617 = Integer.parseInt(var2); // L: 747 - break; // L: 748 + field484 = Integer.parseInt(var2); // L: 768 + break; // L: 769 case 22: - field553 = Integer.parseInt(var2) != 0; // L: 696 + field493 = Integer.parseInt(var2) != 0; // L: 701 } } } - Scene.Scene_isLowDetail = false; // L: 769 - isLowDetail = false; // L: 770 - class17.worldHost = this.getCodeBase().getHost(); // L: 772 - String var4 = class301.field3545.name; // L: 773 - byte var5 = 0; // L: 774 + JagexCache.method3155(); // L: 796 + Timer.worldHost = this.getCodeBase().getHost(); // L: 797 + String var5 = AbstractArchive.field4038.name; // L: 798 + byte var6 = 0; // L: 799 try { - FloorOverlayDefinition.method3788("oldschool", var4, var5, 21); // L: 776 - } catch (Exception var6) { // L: 778 - Widget.RunException_sendStackTrace((String)null, var6); // L: 779 + PendingSpawn.method2160("oldschool", var5, var6, 21); // L: 801 + } catch (Exception var7) { // L: 803 + ArchiveDiskActionHandler.RunException_sendStackTrace((String)null, var7); // L: 804 } - class127.client = this; // L: 781 - WorldMapRegion.clientType = clientType; // L: 782 - if (field498 == -1) { // L: 783 - field498 = 0; // L: 784 + class82.client = this; // L: 806 + class430.clientType = clientType; // L: 807 + if (field486 == -1) { // L: 808 + field486 = 0; // L: 809 } - class360.field4209 = System.getenv("JX_ACCESS_TOKEN"); // L: 786 - System.getenv("JX_REFRESH_TOKEN"); // L: 787 - this.startThread(765, 503, 204); // L: 788 + Decimator.field406 = System.getenv("JX_ACCESS_TOKEN"); // L: 811 + ModelData0.field2661 = System.getenv("JX_REFRESH_TOKEN"); // L: 812 + this.startThread(765, 503, 205); // L: 813 } - } catch (RuntimeException var7) { - throw MilliClock.newRunException(var7, "client.init(" + ')'); + } catch (RuntimeException var8) { + throw HealthBarUpdate.newRunException(var8, "client.init(" + ')'); } - } // L: 789 - - public boolean isOnLoginScreen() { - return gameState == 10; // L: 802 - } - - public long getAccountHash() { - return this.field542; // L: 807 - } + } // L: 814 + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Lcom/jagex/oldscape/pub/OtlTokenRequester;)V" + descriptor = "(ILbb;ZI)I", + garbageValue = "2074222337" ) - public void setOtlTokenRequester(OtlTokenRequester var1) { - if (var1 != null) { // L: 793 - this.field536 = var1; // L: 796 - Ignored.method6828(10); // L: 797 + static int method1240(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3845 + class12.Interpreter_intStackSize -= 2; // L: 3846 + field748 = (short)InterfaceParent.method2066(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]); // L: 3847 + if (field748 <= 0) { // L: 3848 + field748 = 256; + } + + field749 = (short)InterfaceParent.method2066(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]); // L: 3849 + if (field749 <= 0) { // L: 3850 + field749 = 256; + } + + return 1; // L: 3851 + } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3853 + class12.Interpreter_intStackSize -= 2; // L: 3854 + zoomHeight = (short)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3855 + if (zoomHeight <= 0) { // L: 3856 + zoomHeight = 256; + } + + zoomWidth = (short)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3857 + if (zoomWidth <= 0) { // L: 3858 + zoomWidth = 320; + } + + return 1; // L: 3859 + } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3861 + class12.Interpreter_intStackSize -= 4; // L: 3862 + field752 = (short)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3863 + if (field752 <= 0) { // L: 3864 + field752 = 1; + } + + field753 = (short)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3865 + if (field753 <= 0) { // L: 3866 + field753 = 32767; + } else if (field753 < field752) { // L: 3867 + field753 = field752; + } + + field656 = (short)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 3868 + if (field656 <= 0) { // L: 3869 + field656 = 1; + } + + field755 = (short)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 3]; // L: 3870 + if (field755 <= 0) { // L: 3871 + field755 = 32767; + } else if (field755 < field656) { // L: 3872 + field755 = field656; + } + + return 1; // L: 3873 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3875 + if (viewportWidget != null) { // L: 3876 + GrandExchangeOfferOwnWorldComparator.setViewportShape(0, 0, viewportWidget.width, viewportWidget.height, false); // L: 3877 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = viewportWidth; // L: 3878 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = viewportHeight; // L: 3879 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3882 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3883 + } + + return 1; // L: 3885 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3887 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = zoomHeight; // L: 3888 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = zoomWidth; // L: 3889 + return 1; // L: 3890 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3892 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class21.method278(field748); // L: 3893 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class21.method278(field749); // L: 3894 + return 1; // L: 3895 + } else if (var0 == 6220) { // L: 3897 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3898 + return 1; // L: 3899 + } else if (var0 == 6221) { // L: 3901 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3902 + return 1; // L: 3903 + } else if (var0 == 6222) { // L: 3905 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = GraphicsObject.canvasWidth; // L: 3906 + return 1; // L: 3907 + } else if (var0 == 6223) { // L: 3909 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class433.canvasHeight; // L: 3910 + return 1; // L: 3911 + } else { + return 2; // L: 3913 } - } // L: 794 798 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(B)[Lkr;", - garbageValue = "1" - ) - public static class309[] method1633() { - return new class309[]{class309.field3913, class309.field3911, class309.field3914, class309.field3915}; // L: 15 } - @ObfuscatedName("gx") + @ObfuscatedName("hu") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "37" + descriptor = "(Lcx;IIIIII)V", + garbageValue = "-1622528173" ) - @Export("getWindowedMode") - static int getWindowedMode() { - return isResizable ? 2 : 1; // L: 4259 - } + @Export("drawActor2d") + static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { + if (var0 != null && var0.isVisible()) { // L: 5032 + if (var0 instanceof NPC) { // L: 5033 + NPCComposition var6 = ((NPC)var0).definition; // L: 5034 + if (var6.transforms != null) { // L: 5035 + var6 = var6.transform(); + } + + if (var6 == null) { // L: 5036 + return; + } + } + + int var75 = Players.Players_count; // L: 5038 + int[] var7 = Players.Players_indices; // L: 5039 + byte var8 = 0; // L: 5040 + if (var1 < var75 && var0.playerCycle == cycle && class118.method2720((Player)var0)) { // L: 5041 + Player var9 = (Player)var0; // L: 5042 + if (var1 < var75) { // L: 5043 + ByteArrayPool.method6357(var0, var0.defaultHeight + 15); // L: 5044 + AbstractFont var10 = (AbstractFont)fontsMap.get(FontName.FontName_plain12); // L: 5045 + byte var11 = 9; // L: 5046 + var10.drawCentered(var9.username.getName(), var2 + viewportTempX, var3 + viewportTempY - var11, 16777215, 0); // L: 5047 + var8 = 18; // L: 5048 + } + } + + int var76 = -2; // L: 5051 + int var22; + int var23; + int var24; + int var77; + if (!var0.healthBars.method5986()) { // L: 5052 + var77 = var0.defaultHeight + 15; // L: 5053 + AbstractWorldMapIcon.worldToScreen(var0.x, var0.y, var77); // L: 5055 + + for (HealthBar var78 = (HealthBar)var0.healthBars.last(); var78 != null; var78 = (HealthBar)var0.healthBars.previous()) { // L: 5057 + HealthBarUpdate var80 = var78.get(cycle); // L: 5058 + if (var80 == null) { // L: 5059 + if (var78.isEmpty()) { // L: 5117 + var78.remove(); + } + } else { + HealthBarDefinition var13 = var78.definition; // L: 5060 + SpritePixels var81 = var13.getBackSprite(); // L: 5061 + SpritePixels var82 = var13.getFrontSprite(); // L: 5062 + int var17 = 0; // L: 5064 + int var83; + if (var81 != null && var82 != null) { // L: 5065 + if (var13.widthPadding * 2 < var82.subWidth) { // L: 5066 + var17 = var13.widthPadding; + } + + var83 = var82.subWidth - var17 * 2; // L: 5067 + } else { + var83 = var13.width; // L: 5069 + } + + int var84 = 255; // L: 5070 + boolean var85 = true; // L: 5071 + int var86 = cycle - var80.cycle; // L: 5072 + int var87 = var83 * var80.health2 / var13.width; // L: 5073 + int var94; + if (var80.cycleOffset > var86) { // L: 5074 + var22 = var13.field1915 == 0 ? 0 : var13.field1915 * (var86 / var13.field1915); // L: 5075 + var23 = var83 * var80.health / var13.width; // L: 5076 + var94 = var22 * (var87 - var23) / var80.cycleOffset + var23; // L: 5077 + } else { + var94 = var87; // L: 5080 + var22 = var13.int5 + var80.cycleOffset - var86; // L: 5081 + if (var13.int3 >= 0) { // L: 5082 + var84 = (var22 << 8) / (var13.int5 - var13.int3); + } + } + + if (var80.health2 > 0 && var94 < 1) { // L: 5084 + var94 = 1; + } + + if (var81 != null && var82 != null) { // L: 5085 + if (var83 == var94) { // L: 5086 + var94 += var17 * 2; + } else { + var94 += var17; // L: 5087 + } + + var22 = var81.subHeight; // L: 5088 + var76 += var22; // L: 5089 + var23 = var2 + viewportTempX - (var83 >> 1); // L: 5090 + var24 = var3 + viewportTempY - var76; // L: 5091 + var23 -= var17; // L: 5092 + if (var84 >= 0 && var84 < 255) { // L: 5093 + var81.drawTransAt(var23, var24, var84); // L: 5094 + Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var23 + var94, var22 + var24); // L: 5095 + var82.drawTransAt(var23, var24, var84); // L: 5096 + } else { + var81.drawTransBgAt(var23, var24); // L: 5099 + Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var23 + var94, var22 + var24); // L: 5100 + var82.drawTransBgAt(var23, var24); // L: 5101 + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 5103 + var76 += 2; // L: 5104 + } else { + var76 += 5; // L: 5107 + if (viewportTempX > -1) { // L: 5108 + var22 = var2 + viewportTempX - (var83 >> 1); // L: 5109 + var23 = var3 + viewportTempY - var76; // L: 5110 + Rasterizer2D.Rasterizer2D_fillRectangle(var22, var23, var94, 5, 65280); // L: 5111 + Rasterizer2D.Rasterizer2D_fillRectangle(var94 + var22, var23, var83 - var94, 5, 16711680); // L: 5112 + } + + var76 += 2; // L: 5114 + } + } + } + } + + if (var76 == -2) { // L: 5120 + var76 += 7; + } + + var76 += var8; // L: 5121 + if (var1 < var75) { // L: 5122 + Player var88 = (Player)var0; // L: 5123 + if (var88.isHidden) { // L: 5124 + return; + } + + if (var88.headIconPk != -1 || var88.headIconPrayer != -1) { // L: 5125 + ByteArrayPool.method6357(var0, var0.defaultHeight + 15); // L: 5126 + if (viewportTempX > -1) { // L: 5127 + if (var88.headIconPk != -1) { // L: 5128 + var76 += 25; // L: 5129 + UserComparator4.headIconPkSprites[var88.headIconPk].drawTransBgAt(var2 + viewportTempX - 12, var3 + viewportTempY - var76); // L: 5130 + } + + if (var88.headIconPrayer != -1) { // L: 5132 + var76 += 25; // L: 5133 + ChatChannel.headIconPrayerSprites[var88.headIconPrayer].drawTransBgAt(var2 + viewportTempX - 12, var3 + viewportTempY - var76); // L: 5134 + } + } + } + + if (var1 >= 0 && hintArrowType == 10 && var7[var1] == hintArrowPlayerIndex) { // L: 5138 + ByteArrayPool.method6357(var0, var0.defaultHeight + 15); // L: 5139 + if (viewportTempX > -1) { // L: 5140 + var76 += class21.headIconHintSprites[1].subHeight; // L: 5141 + class21.headIconHintSprites[1].drawTransBgAt(var2 + viewportTempX - 12, var3 + viewportTempY - var76); // L: 5142 + } + } + } else { + NPCComposition var89 = ((NPC)var0).definition; // L: 5147 + if (var89.transforms != null) { // L: 5148 + var89 = var89.transform(); + } + + if (var89.headIconPrayer >= 0 && var89.headIconPrayer < ChatChannel.headIconPrayerSprites.length) { // L: 5149 + ByteArrayPool.method6357(var0, var0.defaultHeight + 15); // L: 5150 + if (viewportTempX > -1) { // L: 5151 + ChatChannel.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + viewportTempX - 12, var3 + viewportTempY - 30); // L: 5152 + } + } + + if (hintArrowType == 1 && npcIndices[var1 - var75] == hintArrowNpcIndex && cycle % 20 < 10) { // L: 5155 + ByteArrayPool.method6357(var0, var0.defaultHeight + 15); // L: 5156 + if (viewportTempX > -1) { // L: 5157 + class21.headIconHintSprites[0].drawTransBgAt(var2 + viewportTempX - 12, var3 + viewportTempY - 28); + } + } + } + + if (var0.overheadText != null && (var1 >= var75 || !var0.field1198 && (publicChatMode == 4 || !var0.isAutoChatting && (publicChatMode == 0 || publicChatMode == 3 || publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 5160 5161 + ByteArrayPool.method6357(var0, var0.defaultHeight); // L: 5162 + if (viewportTempX > -1 && overheadTextCount < overheadTextLimit) { // L: 5163 + overheadTextXOffsets[overheadTextCount] = ChatChannel.fontBold12.stringWidth(var0.overheadText) / 2; // L: 5164 + overheadTextAscents[overheadTextCount] = ChatChannel.fontBold12.ascent; // L: 5165 + overheadTextXs[overheadTextCount] = viewportTempX; // L: 5166 + overheadTextYs[overheadTextCount] = viewportTempY; // L: 5167 + overheadTextColors[overheadTextCount] = var0.overheadTextColor; // L: 5168 + overheadTextEffects[overheadTextCount] = var0.overheadTextEffect; // L: 5169 + overheadTextCyclesRemaining[overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 5170 + overheadText[overheadTextCount] = var0.overheadText; // L: 5171 + ++overheadTextCount; // L: 5172 + } + } + + for (var77 = 0; var77 < 4; ++var77) { // L: 5176 + int var90 = var0.hitSplatCycles[var77]; // L: 5177 + int var12 = var0.hitSplatTypes[var77]; // L: 5178 + HitSplatDefinition var91 = null; // L: 5179 + int var14 = 0; // L: 5180 + if (var12 >= 0) { // L: 5181 + if (var90 <= cycle) { // L: 5182 + continue; + } + + var91 = UserComparator4.method2567(var0.hitSplatTypes[var77]); // L: 5183 + var14 = var91.field2071; // L: 5184 + if (var91 != null && var91.transforms != null) { // L: 5185 + var91 = var91.transform(); // L: 5186 + if (var91 == null) { // L: 5187 + var0.hitSplatCycles[var77] = -1; // L: 5188 + continue; + } + } + } else if (var90 < 0) { // L: 5193 + continue; + } + + int var15 = var0.hitSplatTypes2[var77]; // L: 5194 + HitSplatDefinition var16 = null; // L: 5195 + if (var15 >= 0) { // L: 5196 + var16 = UserComparator4.method2567(var15); // L: 5197 + if (var16 != null && var16.transforms != null) { // L: 5198 + var16 = var16.transform(); + } + } + + if (var90 - var14 <= cycle) { // L: 5200 + if (var91 == null) { // L: 5201 + var0.hitSplatCycles[var77] = -1; // L: 5202 + } else { + ByteArrayPool.method6357(var0, var0.defaultHeight / 2); // L: 5205 + if (viewportTempX > -1) { // L: 5206 + boolean var92 = true; // L: 5207 + if (var77 == 1) { // L: 5208 + viewportTempY -= 20; // L: 5209 + } + + if (var77 == 2) { // L: 5211 + viewportTempX -= 15; // L: 5212 + viewportTempY -= 10; // L: 5213 + } + + if (var77 == 3) { // L: 5215 + viewportTempX += 15; // L: 5216 + viewportTempY -= 10; // L: 5217 + } + + SpritePixels var18 = null; // L: 5219 + SpritePixels var19 = null; // L: 5220 + SpritePixels var20 = null; // L: 5221 + SpritePixels var21 = null; // L: 5222 + var22 = 0; // L: 5223 + var23 = 0; // L: 5224 + var24 = 0; // L: 5225 + int var25 = 0; // L: 5226 + int var26 = 0; // L: 5227 + int var27 = 0; // L: 5228 + int var28 = 0; // L: 5229 + int var29 = 0; // L: 5230 + SpritePixels var30 = null; // L: 5231 + SpritePixels var31 = null; // L: 5232 + SpritePixels var32 = null; // L: 5233 + SpritePixels var33 = null; // L: 5234 + int var34 = 0; // L: 5235 + int var35 = 0; // L: 5236 + int var36 = 0; // L: 5237 + int var37 = 0; // L: 5238 + int var38 = 0; // L: 5239 + int var39 = 0; // L: 5240 + int var40 = 0; // L: 5241 + int var41 = 0; // L: 5242 + int var42 = 0; // L: 5243 + var18 = var91.method3531(); // L: 5244 + int var43; + if (var18 != null) { // L: 5245 + var22 = var18.subWidth; // L: 5246 + var43 = var18.subHeight; // L: 5247 + if (var43 > var42) { // L: 5248 + var42 = var43; + } + + var26 = var18.xOffset; // L: 5249 + } + + var19 = var91.method3534(); // L: 5251 + if (var19 != null) { // L: 5252 + var23 = var19.subWidth; // L: 5253 + var43 = var19.subHeight; // L: 5254 + if (var43 > var42) { // L: 5255 + var42 = var43; + } + + var27 = var19.xOffset; // L: 5256 + } + + var20 = var91.method3533(); // L: 5258 + if (var20 != null) { // L: 5259 + var24 = var20.subWidth; // L: 5260 + var43 = var20.subHeight; // L: 5261 + if (var43 > var42) { // L: 5262 + var42 = var43; + } + + var28 = var20.xOffset; // L: 5263 + } + + var21 = var91.method3559(); // L: 5265 + if (var21 != null) { // L: 5266 + var25 = var21.subWidth; // L: 5267 + var43 = var21.subHeight; // L: 5268 + if (var43 > var42) { // L: 5269 + var42 = var43; + } + + var29 = var21.xOffset; // L: 5270 + } + + if (var16 != null) { // L: 5272 + var30 = var16.method3531(); // L: 5273 + if (var30 != null) { // L: 5274 + var34 = var30.subWidth; // L: 5275 + var43 = var30.subHeight; // L: 5276 + if (var43 > var42) { // L: 5277 + var42 = var43; + } + + var38 = var30.xOffset; // L: 5278 + } + + var31 = var16.method3534(); // L: 5280 + if (var31 != null) { // L: 5281 + var35 = var31.subWidth; // L: 5282 + var43 = var31.subHeight; // L: 5283 + if (var43 > var42) { // L: 5284 + var42 = var43; + } + + var39 = var31.xOffset; // L: 5285 + } + + var32 = var16.method3533(); // L: 5287 + if (var32 != null) { // L: 5288 + var36 = var32.subWidth; // L: 5289 + var43 = var32.subHeight; // L: 5290 + if (var43 > var42) { // L: 5291 + var42 = var43; + } + + var40 = var32.xOffset; // L: 5292 + } + + var33 = var16.method3559(); // L: 5294 + if (var33 != null) { // L: 5295 + var37 = var33.subWidth; // L: 5296 + var43 = var33.subHeight; // L: 5297 + if (var43 > var42) { // L: 5298 + var42 = var43; + } + + var41 = var33.xOffset; // L: 5299 + } + } + + Font var79 = var91.getFont(); // L: 5304 + if (var79 == null) { // L: 5305 + var79 = Varcs.fontPlain11; + } + + Font var44; + if (var16 != null) { // L: 5306 + var44 = var16.getFont(); // L: 5307 + if (var44 == null) { // L: 5308 + var44 = Varcs.fontPlain11; + } + } else { + var44 = Varcs.fontPlain11; // L: 5310 + } + + String var45 = null; // L: 5311 + String var46 = null; // L: 5312 + boolean var47 = false; // L: 5313 + int var48 = 0; // L: 5314 + var45 = var91.getString(var0.hitSplatValues[var77]); // L: 5315 + int var93 = var79.stringWidth(var45); // L: 5316 + if (var16 != null) { // L: 5317 + var46 = var16.getString(var0.hitSplatValues2[var77]); // L: 5318 + var48 = var44.stringWidth(var46); // L: 5319 + } + + int var49 = 0; // L: 5321 + int var50 = 0; // L: 5322 + if (var23 > 0) { // L: 5323 + if (var20 == null && var21 == null) { // L: 5324 + var49 = 1; // L: 5325 + } else { + var49 = var93 / var23 + 1; + } + } + + if (var16 != null && var35 > 0) { // L: 5327 5328 + if (var32 == null && var33 == null) { // L: 5329 + var50 = 1; // L: 5330 + } else { + var50 = var48 / var35 + 1; + } + } + + int var51 = 0; // L: 5333 + int var52 = var51; // L: 5334 + if (var22 > 0) { // L: 5335 + var51 += var22; + } + + var51 += 2; // L: 5336 + int var53 = var51; // L: 5337 + if (var24 > 0) { // L: 5338 + var51 += var24; + } + + int var54 = var51; // L: 5339 + int var55 = var51; // L: 5340 + int var56; + if (var23 > 0) { // L: 5341 + var56 = var49 * var23; // L: 5342 + var51 += var56; // L: 5343 + var55 += (var56 - var93) / 2; // L: 5344 + } else { + var51 += var93; // L: 5347 + } + + var56 = var51; // L: 5349 + if (var25 > 0) { // L: 5350 + var51 += var25; + } + + int var57 = 0; // L: 5351 + int var58 = 0; // L: 5352 + int var59 = 0; // L: 5353 + int var60 = 0; // L: 5354 + int var61 = 0; // L: 5355 + int var62; + if (var16 != null) { // L: 5356 + var51 += 2; // L: 5357 + var57 = var51; // L: 5358 + if (var34 > 0) { // L: 5359 + var51 += var34; + } + + var51 += 2; // L: 5360 + var58 = var51; // L: 5361 + if (var36 > 0) { // L: 5362 + var51 += var36; + } + + var59 = var51; // L: 5363 + var61 = var51; // L: 5364 + if (var35 > 0) { // L: 5365 + var62 = var50 * var35; // L: 5366 + var51 += var62; // L: 5367 + var61 += (var62 - var48) / 2; // L: 5368 + } else { + var51 += var48; // L: 5371 + } + + var60 = var51; // L: 5373 + if (var37 > 0) { // L: 5374 + var51 += var37; + } + } + + var62 = var0.hitSplatCycles[var77] - cycle; // L: 5376 + int var63 = var91.field2055 - var62 * var91.field2055 / var91.field2071; // L: 5377 + int var64 = var62 * var91.field2074 / var91.field2071 + -var91.field2074; // L: 5378 + int var65 = var63 + (var2 + viewportTempX - (var51 >> 1)); // L: 5379 + int var66 = var3 + viewportTempY - 12 + var64; // L: 5380 + int var67 = var66; // L: 5381 + int var68 = var66 + var42; // L: 5382 + int var69 = var66 + var91.field2068 + 15; // L: 5383 + int var70 = var69 - var79.maxAscent; // L: 5384 + int var71 = var69 + var79.maxDescent; // L: 5385 + if (var70 < var66) { // L: 5386 + var67 = var70; + } + + if (var71 > var68) { // L: 5387 + var68 = var71; + } + + int var72 = 0; // L: 5388 + int var73; + int var74; + if (var16 != null) { // L: 5389 + var72 = var66 + var16.field2068 + 15; // L: 5390 + var73 = var72 - var44.maxAscent; // L: 5391 + var74 = var72 + var44.maxDescent; // L: 5392 + if (var73 < var67) { // L: 5393 + ; + } + + if (var74 > var68) { // L: 5394 + ; + } + } + + var73 = 255; // L: 5396 + if (var91.field2072 >= 0) { // L: 5397 + var73 = (var62 << 8) / (var91.field2071 - var91.field2072); + } + + if (var73 >= 0 && var73 < 255) { // L: 5398 + if (var18 != null) { // L: 5399 + var18.drawTransAt(var52 + var65 - var26, var66, var73); + } + + if (var20 != null) { // L: 5400 + var20.drawTransAt(var65 + var53 - var28, var66, var73); + } + + if (var19 != null) { // L: 5401 + for (var74 = 0; var74 < var49; ++var74) { // L: 5402 + var19.drawTransAt(var23 * var74 + (var65 + var54 - var27), var66, var73); // L: 5403 + } + } + + if (var21 != null) { // L: 5406 + var21.drawTransAt(var65 + var56 - var29, var66, var73); + } + + var79.drawAlpha(var45, var55 + var65, var69, var91.textColor, 0, var73); // L: 5407 + if (var16 != null) { // L: 5408 + if (var30 != null) { // L: 5409 + var30.drawTransAt(var65 + var57 - var38, var66, var73); + } + + if (var32 != null) { // L: 5410 + var32.drawTransAt(var65 + var58 - var40, var66, var73); + } + + if (var31 != null) { // L: 5411 + for (var74 = 0; var74 < var50; ++var74) { // L: 5412 + var31.drawTransAt(var74 * var35 + (var59 + var65 - var39), var66, var73); // L: 5413 + } + } + + if (var33 != null) { // L: 5416 + var33.drawTransAt(var60 + var65 - var41, var66, var73); + } + + var44.drawAlpha(var46, var65 + var61, var72, var16.textColor, 0, var73); // L: 5417 + } + } else { + if (var18 != null) { // L: 5421 + var18.drawTransBgAt(var52 + var65 - var26, var66); + } + + if (var20 != null) { // L: 5422 + var20.drawTransBgAt(var65 + var53 - var28, var66); + } + + if (var19 != null) { // L: 5423 + for (var74 = 0; var74 < var49; ++var74) { // L: 5424 + var19.drawTransBgAt(var23 * var74 + (var54 + var65 - var27), var66); // L: 5425 + } + } + + if (var21 != null) { // L: 5428 + var21.drawTransBgAt(var56 + var65 - var29, var66); + } + + var79.draw(var45, var65 + var55, var69, var91.textColor | -16777216, 0); // L: 5429 + if (var16 != null) { // L: 5430 + if (var30 != null) { // L: 5431 + var30.drawTransBgAt(var57 + var65 - var38, var66); + } + + if (var32 != null) { // L: 5432 + var32.drawTransBgAt(var65 + var58 - var40, var66); + } + + if (var31 != null) { // L: 5433 + for (var74 = 0; var74 < var50; ++var74) { // L: 5434 + var31.drawTransBgAt(var74 * var35 + (var65 + var59 - var39), var66); // L: 5435 + } + } + + if (var33 != null) { // L: 5438 + var33.drawTransBgAt(var65 + var60 - var41, var66); + } + + var44.draw(var46, var61 + var65, var72, var16.textColor | -16777216, 0); // L: 5439 + } + } + } + } + } + } + + } + } // L: 5444 } diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index 0c7d46b405..e13b5fc98a 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -4,699 +4,675 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jl") +@ObfuscatedName("jj") @Implements("ClientPacket") public class ClientPacket implements class261 { - @ObfuscatedName("ro") - @ObfuscatedSignature( - descriptor = "Lns;" - ) - @Export("friendsChat") - static FriendsChat friendsChat; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2922; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2977; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2929; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2896; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - static final ClientPacket field2934; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2893; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2899; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2955; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2901; @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) - public static final ClientPacket field2902; - @ObfuscatedName("r") + public static final ClientPacket field3040; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2931; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2907; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2905; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2906; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2916; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2908; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2958; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2910; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2911; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2912; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2913; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2914; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2915; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2924; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2917; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2997; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2919; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2974; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2909; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2920; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2923; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2904; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2925; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field3000; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2927; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2918; - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2898; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2930; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2928; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2894; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2933; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2993; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2935; - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2980; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2897; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2938; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2939; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2940; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2941; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2942; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2943; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2944; - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2945; - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - static final ClientPacket field2946; - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2995; - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2954; - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) public static final ClientPacket field2949; - @ObfuscatedName("be") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) public static final ClientPacket field2950; - @ObfuscatedName("bh") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) - public static final ClientPacket field2951; - @ObfuscatedName("bf") + static final ClientPacket field2951; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2900; - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2953; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - static final ClientPacket field2947; - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2976; - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2992; - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2957; - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) public static final ClientPacket field2952; - @ObfuscatedName("ba") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) - public static final ClientPacket field2959; - @ObfuscatedName("bk") + public static final ClientPacket field3009; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) - public static final ClientPacket field2960; - @ObfuscatedName("bs") + public static final ClientPacket field3000; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) - public static final ClientPacket field2961; - @ObfuscatedName("by") + public static final ClientPacket field3038; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2962; - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2963; - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2964; - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2965; - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2966; - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2967; - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - static final ClientPacket field2968; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2969; - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2970; - @ObfuscatedName("cm") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2971; - @ObfuscatedName("cc") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2972; - @ObfuscatedName("ch") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2973; - @ObfuscatedName("cf") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2926; - @ObfuscatedName("cv") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2990; - @ObfuscatedName("cs") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2999; - @ObfuscatedName("cz") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2895; - @ObfuscatedName("ct") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2978; - @ObfuscatedName("cb") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2979; - @ObfuscatedName("cp") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2937; - @ObfuscatedName("co") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2981; - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2982; - @ObfuscatedName("ci") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2983; - @ObfuscatedName("cy") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - public static final ClientPacket field2984; - @ObfuscatedName("cr") - @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) public static final ClientPacket field2956; - @ObfuscatedName("cq") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) - public static final ClientPacket field2986; - @ObfuscatedName("cn") + public static final ClientPacket field2957; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) - public static final ClientPacket field2987; - @ObfuscatedName("cu") + public static final ClientPacket field2958; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) - public static final ClientPacket field2988; - @ObfuscatedName("cg") + public static final ClientPacket field2959; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) - public static final ClientPacket field2989; - @ObfuscatedName("cj") + public static final ClientPacket field2960; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) - static final ClientPacket field2903; - @ObfuscatedName("ce") + public static final ClientPacket field2961; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) - public static final ClientPacket field2991; - @ObfuscatedName("cl") + public static final ClientPacket field2962; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) - public static final ClientPacket field2948; - @ObfuscatedName("ck") + public static final ClientPacket field2963; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) - public static final ClientPacket field2936; - @ObfuscatedName("cd") + public static final ClientPacket field3048; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) - public static final ClientPacket field2994; - @ObfuscatedName("cw") + public static final ClientPacket field3032; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) - public static final ClientPacket field2921; - @ObfuscatedName("cx") + public static final ClientPacket field2955; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) - public static final ClientPacket field2996; - @ObfuscatedName("dr") + static final ClientPacket field2991; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) - public static final ClientPacket field2985; - @ObfuscatedName("dj") + public static final ClientPacket field2968; + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) - public static final ClientPacket field2998; - @ObfuscatedName("dd") + static final ClientPacket field3055; + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" + ) + public static final ClientPacket field2983; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2971; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2972; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2973; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3044; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Ljj;" ) public static final ClientPacket field2975; - @ObfuscatedName("jw") - @ObfuscatedGetter( - intValue = -2097783973 + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Ljj;" ) - @Export("oculusOrbFocalPointY") - static int oculusOrbFocalPointY; + public static final ClientPacket field2969; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2977; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2978; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2979; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2980; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2981; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2982; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3019; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3050; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2985; + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2990; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2984; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2988; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2989; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3020; + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2954; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2967; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2993; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2994; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2995; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3018; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2997; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2998; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2999; + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3007; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3001; + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3002; + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2948; + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3004; + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + static final ClientPacket field3005; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3006; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3024; + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3008; + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3010; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2996; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3011; + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3012; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3013; + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3014; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3015; + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2970; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3016; + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2976; + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3025; + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3017; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2987; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3022; + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3023; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3057; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2966; + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3026; + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3027; + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3028; + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3029; + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3030; + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3031; + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2953; + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3033; + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3034; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3035; + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3036; + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + static final ClientPacket field3037; + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3041; + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3039; + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3054; + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2974; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3042; + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3043; + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2986; + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3003; + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3046; + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3047; + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2965; + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3049; + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field2992; + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3051; + @ObfuscatedName("dc") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3052; + @ObfuscatedName("dp") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3053; @ObfuscatedName("dg") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + public static final ClientPacket field3045; + @ObfuscatedName("dy") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + static final ClientPacket field3056; + @ObfuscatedName("dh") @ObfuscatedGetter( - intValue = -31948183 + intValue = -1090102203 ) @Export("id") final int id; - @ObfuscatedName("de") + @ObfuscatedName("dj") @ObfuscatedGetter( - intValue = 824174823 + intValue = 1549322101 ) @Export("length") final int length; static { - field2922 = new ClientPacket(0, 8); // L: 5 - field2977 = new ClientPacket(1, 15); // L: 6 - field2929 = new ClientPacket(2, 9); // L: 7 - field2896 = new ClientPacket(3, 8); // L: 8 - field2934 = new ClientPacket(4, 7); // L: 9 - field2893 = new ClientPacket(5, 4); // L: 10 - field2899 = new ClientPacket(6, -2); // L: 11 - field2955 = new ClientPacket(7, 15); // L: 12 - field2901 = new ClientPacket(8, 7); // L: 13 - field2902 = new ClientPacket(9, 3); // L: 14 - field2931 = new ClientPacket(10, 3); // L: 15 - field2907 = new ClientPacket(11, -2); // L: 16 - field2905 = new ClientPacket(12, 0); // L: 17 - field2906 = new ClientPacket(13, 8); // L: 18 - field2916 = new ClientPacket(14, 3); // L: 19 - field2908 = new ClientPacket(15, 8); // L: 20 - field2958 = new ClientPacket(16, 8); // L: 21 - field2910 = new ClientPacket(17, -1); // L: 22 - field2911 = new ClientPacket(18, -1); // L: 23 - field2912 = new ClientPacket(19, -1); // L: 24 - field2913 = new ClientPacket(20, 3); // L: 25 - field2914 = new ClientPacket(21, 7); // L: 26 - field2915 = new ClientPacket(22, 7); // L: 27 - field2924 = new ClientPacket(23, 3); // L: 28 - field2917 = new ClientPacket(24, 8); // L: 29 - field2997 = new ClientPacket(25, 8); // L: 30 - field2919 = new ClientPacket(26, 16); // L: 31 - field2974 = new ClientPacket(27, 3); // L: 32 - field2909 = new ClientPacket(28, -1); // L: 33 - field2920 = new ClientPacket(29, 7); // L: 34 - field2923 = new ClientPacket(30, 3); // L: 35 - field2904 = new ClientPacket(31, 15); // L: 36 - field2925 = new ClientPacket(32, 3); // L: 37 - field3000 = new ClientPacket(33, 5); // L: 38 - field2927 = new ClientPacket(34, 7); // L: 39 - field2918 = new ClientPacket(35, -1); // L: 40 - field2898 = new ClientPacket(36, -1); // L: 41 - field2930 = new ClientPacket(37, 11); // L: 42 - field2928 = new ClientPacket(38, -1); // L: 43 - field2894 = new ClientPacket(39, 16); // L: 44 - field2933 = new ClientPacket(40, 7); // L: 45 - field2993 = new ClientPacket(41, 7); // L: 46 - field2935 = new ClientPacket(42, -1); // L: 47 - field2980 = new ClientPacket(43, -1); // L: 48 - field2897 = new ClientPacket(44, 4); // L: 49 - field2938 = new ClientPacket(45, 8); // L: 50 - field2939 = new ClientPacket(46, 3); // L: 51 - field2940 = new ClientPacket(47, 3); // L: 52 - field2941 = new ClientPacket(48, 8); // L: 53 - field2942 = new ClientPacket(49, 7); // L: 54 - field2943 = new ClientPacket(50, 8); // L: 55 - field2944 = new ClientPacket(51, 8); // L: 56 - field2945 = new ClientPacket(52, 8); // L: 57 - field2946 = new ClientPacket(53, -1); // L: 58 - field2995 = new ClientPacket(54, 11); // L: 59 - field2954 = new ClientPacket(55, 8); // L: 60 - field2949 = new ClientPacket(56, 2); // L: 61 - field2950 = new ClientPacket(57, 0); // L: 62 - field2951 = new ClientPacket(58, 7); - field2900 = new ClientPacket(59, -1); - field2953 = new ClientPacket(60, -1); // L: 65 - field2947 = new ClientPacket(61, -1); // L: 66 - field2976 = new ClientPacket(62, 6); // L: 67 - field2992 = new ClientPacket(63, -1); // L: 68 - field2957 = new ClientPacket(64, 3); // L: 69 - field2952 = new ClientPacket(65, 6); // L: 70 - field2959 = new ClientPacket(66, 14); // L: 71 - field2960 = new ClientPacket(67, 8); // L: 72 - field2961 = new ClientPacket(68, -1); // L: 73 - field2962 = new ClientPacket(69, 2); // L: 74 - field2963 = new ClientPacket(70, -1); // L: 75 - field2964 = new ClientPacket(71, 3); // L: 76 - field2965 = new ClientPacket(72, -1); // L: 77 - field2966 = new ClientPacket(73, 8); // L: 78 - field2967 = new ClientPacket(74, -1); // L: 79 - field2968 = new ClientPacket(75, -1); // L: 80 - field2969 = new ClientPacket(76, 8); // L: 81 - field2970 = new ClientPacket(77, -1); // L: 82 - field2971 = new ClientPacket(78, 16); // L: 83 - field2972 = new ClientPacket(79, 3); // L: 84 - field2973 = new ClientPacket(80, 0); // L: 85 - field2926 = new ClientPacket(81, -2); // L: 86 - field2990 = new ClientPacket(82, 4); // L: 87 - field2999 = new ClientPacket(83, 11); // L: 88 - field2895 = new ClientPacket(84, 7); // L: 89 - field2978 = new ClientPacket(85, 1); // L: 90 - field2979 = new ClientPacket(86, 0); // L: 91 - field2937 = new ClientPacket(87, 4); // L: 92 - field2981 = new ClientPacket(88, 3); // L: 93 - field2982 = new ClientPacket(89, 8); // L: 94 - field2983 = new ClientPacket(90, 10); // L: 95 - field2984 = new ClientPacket(91, 13); // L: 96 - field2956 = new ClientPacket(92, 11); // L: 97 - field2986 = new ClientPacket(93, -1); // L: 98 - field2987 = new ClientPacket(94, -1); // L: 99 - field2988 = new ClientPacket(95, 2); // L: 100 - field2989 = new ClientPacket(96, 0); // L: 101 - field2903 = new ClientPacket(97, 2); // L: 102 - field2991 = new ClientPacket(98, -1); // L: 103 - field2948 = new ClientPacket(99, 4); // L: 104 - field2936 = new ClientPacket(100, 2); // L: 105 - field2994 = new ClientPacket(101, 15); // L: 106 - field2921 = new ClientPacket(102, 8); // L: 107 - field2996 = new ClientPacket(103, 9); // L: 108 - field2985 = new ClientPacket(104, 8); // L: 109 - field2998 = new ClientPacket(105, 8); // L: 110 - field2975 = new ClientPacket(106, 22); // L: 111 + field3040 = new ClientPacket(0, -1); // L: 5 + field2949 = new ClientPacket(1, -2); // L: 6 + field2950 = new ClientPacket(2, 2); // L: 7 + field2951 = new ClientPacket(3, -1); // L: 8 + field2952 = new ClientPacket(4, -1); // L: 9 + field3009 = new ClientPacket(5, -1); // L: 10 + field3000 = new ClientPacket(6, 22); // L: 11 + field3038 = new ClientPacket(7, 1); // L: 12 + field2956 = new ClientPacket(8, 8); // L: 13 + field2957 = new ClientPacket(9, -1); // L: 14 + field2958 = new ClientPacket(10, -1); // L: 15 + field2959 = new ClientPacket(11, -1); // L: 16 + field2960 = new ClientPacket(12, 8); // L: 17 + field2961 = new ClientPacket(13, 8); // L: 18 + field2962 = new ClientPacket(14, 3); // L: 19 + field2963 = new ClientPacket(15, 16); // L: 20 + field3048 = new ClientPacket(16, -1); // L: 21 + field3032 = new ClientPacket(17, 8); // L: 22 + field2955 = new ClientPacket(18, 9); // L: 23 + field2991 = new ClientPacket(19, 7); // L: 24 + field2968 = new ClientPacket(20, 8); // L: 25 + field3055 = new ClientPacket(21, 2); // L: 26 + field2983 = new ClientPacket(22, -1); // L: 27 + field2971 = new ClientPacket(23, 8); // L: 28 + field2972 = new ClientPacket(24, 4); // L: 29 + field2973 = new ClientPacket(25, -1); // L: 30 + field3044 = new ClientPacket(26, -2); // L: 31 + field2975 = new ClientPacket(27, 3); // L: 32 + field2969 = new ClientPacket(28, 3); // L: 33 + field2977 = new ClientPacket(29, 3); // L: 34 + field2978 = new ClientPacket(30, 7); // L: 35 + field2979 = new ClientPacket(31, 8); // L: 36 + field2980 = new ClientPacket(32, 3); // L: 37 + field2981 = new ClientPacket(33, 15); // L: 38 + field2982 = new ClientPacket(34, 0); // L: 39 + field3019 = new ClientPacket(35, 3); // L: 40 + field3050 = new ClientPacket(36, 8); // L: 41 + field2985 = new ClientPacket(37, 11); // L: 42 + field2990 = new ClientPacket(38, 7); // L: 43 + field2984 = new ClientPacket(39, 11); // L: 44 + field2988 = new ClientPacket(40, -1); // L: 45 + field2989 = new ClientPacket(41, 8); // L: 46 + field3020 = new ClientPacket(42, 0); // L: 47 + field2954 = new ClientPacket(43, -1); // L: 48 + field2967 = new ClientPacket(44, 6); // L: 49 + field2993 = new ClientPacket(45, -1); // L: 50 + field2994 = new ClientPacket(46, 7); // L: 51 + field2995 = new ClientPacket(47, 3); // L: 52 + field3018 = new ClientPacket(48, 8); // L: 53 + field2997 = new ClientPacket(49, 7); // L: 54 + field2998 = new ClientPacket(50, -1); // L: 55 + field2999 = new ClientPacket(51, 7); // L: 56 + field3007 = new ClientPacket(52, 11); // L: 57 + field3001 = new ClientPacket(53, 0); // L: 58 + field3002 = new ClientPacket(54, 8); // L: 59 + field2948 = new ClientPacket(55, 4); // L: 60 + field3004 = new ClientPacket(56, 3); // L: 61 + field3005 = new ClientPacket(57, -1); // L: 62 + field3006 = new ClientPacket(58, 8); // L: 63 + field3024 = new ClientPacket(59, 8); // L: 64 + field3008 = new ClientPacket(60, 8); // L: 65 + field3010 = new ClientPacket(61, 15); // L: 66 + field2996 = new ClientPacket(62, 15); // L: 67 + field3011 = new ClientPacket(63, 8); // L: 68 + field3012 = new ClientPacket(64, 13); // L: 69 + field3013 = new ClientPacket(65, 7); // L: 70 + field3014 = new ClientPacket(66, 4); // L: 71 + field3015 = new ClientPacket(67, 8); // L: 72 + field2970 = new ClientPacket(68, -1); // L: 73 + field3016 = new ClientPacket(69, 2); // L: 74 + field2976 = new ClientPacket(70, 7); // L: 75 + field3025 = new ClientPacket(71, 14); // L: 76 + field3017 = new ClientPacket(72, 2); // L: 77 + field2987 = new ClientPacket(73, 7); // L: 78 + field3022 = new ClientPacket(74, 11); // L: 79 + field3023 = new ClientPacket(75, -1); // L: 80 + field3057 = new ClientPacket(76, 15); // L: 81 + field2966 = new ClientPacket(77, 8); // L: 82 + field3026 = new ClientPacket(78, -1); // L: 83 + field3027 = new ClientPacket(79, 0); // L: 84 + field3028 = new ClientPacket(80, 8); // L: 85 + field3029 = new ClientPacket(81, 16); // L: 86 + field3030 = new ClientPacket(82, 3); // L: 87 + field3031 = new ClientPacket(83, 0); // L: 88 + field2953 = new ClientPacket(84, -2); // L: 89 + field3033 = new ClientPacket(85, -1); // L: 90 + field3034 = new ClientPacket(86, -1); // L: 91 + field3035 = new ClientPacket(87, 4); // L: 92 + field3036 = new ClientPacket(88, 3); // L: 93 + field3037 = new ClientPacket(89, -1); // L: 94 + field3041 = new ClientPacket(90, 7); // L: 95 + field3039 = new ClientPacket(91, -1); // L: 96 + field3054 = new ClientPacket(92, 5); // L: 97 + field2974 = new ClientPacket(93, 4); // L: 98 + field3042 = new ClientPacket(94, 9); // L: 99 + field3043 = new ClientPacket(95, 8); // L: 100 + field2986 = new ClientPacket(96, 2); // L: 101 + field3003 = new ClientPacket(97, 3); // L: 102 + field3046 = new ClientPacket(98, 3); // L: 103 + field3047 = new ClientPacket(99, -1); // L: 104 + field2965 = new ClientPacket(100, 3); // L: 105 + field3049 = new ClientPacket(101, 7); // L: 106 + field2992 = new ClientPacket(102, 16); // L: 107 + field3051 = new ClientPacket(103, 6); // L: 108 + field3052 = new ClientPacket(104, 3); // L: 109 + field3053 = new ClientPacket(105, 10); // L: 110 + field3045 = new ClientPacket(106, 8); // L: 111 + field3056 = new ClientPacket(107, 6); // L: 112 } ClientPacket(int var1, int var2) { - this.id = var1; // L: 116 - this.length = var2; // L: 117 - } // L: 118 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1708925611" - ) - public static void method5176(int var0) { - MouseHandler.MouseHandler_idleCycles = var0; // L: 63 - } // L: 64 - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "296193861" - ) - static int method5175(int var0) { - return (int)((Math.log((double)var0) / Interpreter.field845 - 7.0D) * 256.0D); // L: 3841 - } + this.id = var1; // L: 117 + this.length = var2; // L: 118 + } // L: 119 } diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index 93ab8cf652..8722617280 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -1,3 +1,4 @@ +import java.net.URL; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map.Entry; @@ -7,68 +8,68 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ca") +@ObfuscatedName("cy") @Implements("ClientPreferences") public class ClientPreferences { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -587272659 + intValue = 1127997151 ) @Export("ClientPreferences_optionCount") static int ClientPreferences_optionCount; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("roofsHidden") boolean roofsHidden; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("hideUsername") boolean hideUsername; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("titleMusicDisabled") boolean titleMusicDisabled; - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("displayFps") boolean displayFps; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1845230803 + intValue = 698831053 ) - int field1218; - @ObfuscatedName("l") + int field1252; + @ObfuscatedName("s") @Export("brightness") double brightness; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1402013239 + intValue = -1690436583 ) @Export("musicVolume") int musicVolume; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -2075315825 + intValue = 1205613435 ) @Export("soundEffectsVolume") int soundEffectsVolume; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1548024689 + intValue = -1618721713 ) @Export("areaSoundEffectsVolume") int areaSoundEffectsVolume; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1754436801 + intValue = -1550048415 ) - int field1215; + int field1249; @ObfuscatedName("w") @Export("rememberedUsername") String rememberedUsername; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -2110885389 + intValue = 1272591553 ) @Export("windowMode") int windowMode; - @ObfuscatedName("d") + @ObfuscatedName("t") @Export("parameters") LinkedHashMap parameters; @@ -83,15 +84,15 @@ public class ClientPreferences { this.musicVolume = 127; this.soundEffectsVolume = 127; this.areaSoundEffectsVolume = 127; - this.field1215 = -1; + this.field1249 = -1; this.rememberedUsername = null; this.windowMode = 1; this.parameters = new LinkedHashMap(); - this.method2226(true); // L: 28 + this.method2318(true); // L: 28 } // L: 29 @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpx;)V" ) ClientPreferences(Buffer var1) { this.hideUsername = false; // L: 14 @@ -100,37 +101,37 @@ public class ClientPreferences { this.musicVolume = 127; // L: 19 this.soundEffectsVolume = 127; // L: 20 this.areaSoundEffectsVolume = 127; // L: 21 - this.field1215 = -1; // L: 22 + this.field1249 = -1; // L: 22 this.rememberedUsername = null; // L: 23 this.windowMode = 1; // L: 24 this.parameters = new LinkedHashMap(); // L: 25 - if (var1 != null && var1.array != null) { + if (var1 != null && var1.array != null) { // L: 32 int var2 = var1.readUnsignedByte(); if (var2 >= 0 && var2 <= ClientPreferences_optionCount) { if (var1.readUnsignedByte() == 1) { - this.roofsHidden = true; // L: 42 + this.roofsHidden = true; } - if (var2 > 1) { // L: 44 - this.titleMusicDisabled = var1.readUnsignedByte() == 1; // L: 45 + if (var2 > 1) { + this.titleMusicDisabled = var1.readUnsignedByte() == 1; } - if (var2 > 3) { // L: 47 + if (var2 > 3) { this.windowMode = var1.readUnsignedByte(); // L: 48 } - if (var2 > 2) { // L: 50 - int var3 = var1.readUnsignedByte(); // L: 51 + if (var2 > 2) { + int var3 = var1.readUnsignedByte(); for (int var4 = 0; var4 < var3; ++var4) { // L: 52 int var5 = var1.readInt(); // L: 53 int var6 = var1.readInt(); // L: 54 - this.parameters.put(var5, var6); // L: 55 + this.parameters.put(var5, var6); } } if (var2 > 4) { // L: 58 - this.rememberedUsername = var1.readStringCp1252NullTerminatedOrNull(); // L: 59 + this.rememberedUsername = var1.readStringCp1252NullTerminatedOrNull(); } if (var2 > 5) { // L: 61 @@ -145,7 +146,7 @@ public class ClientPreferences { } if (var2 > 7) { // L: 70 - this.field1215 = var1.readUnsignedByte(); // L: 71 + this.field1249 = var1.readUnsignedByte(); // L: 71 } if (var2 > 8) { // L: 73 @@ -153,29 +154,29 @@ public class ClientPreferences { } if (var2 > 9) { // L: 76 - this.field1218 = var1.readInt(); // L: 77 + this.field1252 = var1.readInt(); // L: 77 } } else { - this.method2226(true); + this.method2318(true); } } else { - this.method2226(true); + this.method2318(true); } } // L: 81 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-37" + descriptor = "(ZI)V", + garbageValue = "-1505304764" ) - void method2226(boolean var1) { + void method2318(boolean var1) { } // L: 83 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)Lpi;", - garbageValue = "-779178440" + descriptor = "(I)Lpx;", + garbageValue = "1983267736" ) @Export("toBuffer") Buffer toBuffer() { @@ -199,303 +200,294 @@ public class ClientPreferences { var1.writeByte(this.musicVolume); // L: 102 var1.writeByte(this.soundEffectsVolume); // L: 103 var1.writeByte(this.areaSoundEffectsVolume); // L: 104 - var1.writeByte(this.field1215); // L: 105 + var1.writeByte(this.field1249); // L: 105 var1.writeByte(this.displayFps ? 1 : 0); // L: 106 - var1.writeInt(this.field1218); // L: 107 + var1.writeInt(this.field1252); // L: 107 return var1; // L: 108 } - @ObfuscatedName("b") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "1690911744" + garbageValue = "1415859216" ) - void method2246(boolean var1) { - this.roofsHidden = var1; // L: 150 - GameEngine.savePreferences(); // L: 151 - } // L: 152 + void method2219(boolean var1) { + this.roofsHidden = var1; // L: 128 + class270.savePreferences(); // L: 129 + } // L: 130 - @ObfuscatedName("n") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-51084929" + garbageValue = "-1094538117" ) - boolean method2263() { - return this.roofsHidden; // L: 155 + boolean method2222() { + return this.roofsHidden; // L: 133 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "1823199962" + ) + void method2223(boolean var1) { + this.hideUsername = var1; // L: 137 + class270.savePreferences(); // L: 138 + } // L: 139 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "242395257" + ) + boolean method2257() { + return this.hideUsername; // L: 142 } @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-1567835423" + garbageValue = "-2129317630" ) - void method2230(boolean var1) { - this.hideUsername = var1; // L: 159 - GameEngine.savePreferences(); // L: 160 - } // L: 161 + void method2305(boolean var1) { + this.titleMusicDisabled = var1; // L: 146 + class270.savePreferences(); // L: 147 + } // L: 148 - @ObfuscatedName("l") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "266836426" + garbageValue = "-1061667438" ) - boolean method2317() { - return this.hideUsername; // L: 164 + boolean method2226() { + return this.titleMusicDisabled; // L: 151 } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "944518633" + garbageValue = "-1459067556" ) - void method2237(boolean var1) { - this.titleMusicDisabled = var1; // L: 168 - GameEngine.savePreferences(); // L: 169 - } // L: 170 + void method2227(boolean var1) { + this.displayFps = var1; // L: 155 + class270.savePreferences(); // L: 156 + } // L: 157 - @ObfuscatedName("o") + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "96" + ) + void method2228() { + this.method2227(!this.displayFps); // L: 160 + } // L: 161 + + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(B)Z", garbageValue = "6" ) - boolean method2279() { - return this.titleMusicDisabled; // L: 173 + boolean method2229() { + return this.displayFps; // L: 164 } - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "618524190" - ) - void method2234(boolean var1) { - this.displayFps = var1; - GameEngine.savePreferences(); // L: 178 - } // L: 179 - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "82" - ) - void method2302() { - this.method2234(!this.displayFps); // L: 182 - } // L: 183 - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-509682647" - ) - boolean method2236() { - return this.displayFps; // L: 186 - } - - @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1989585984" + garbageValue = "936974237" ) - void method2260(int var1) { - this.field1218 = var1; // L: 190 - GameEngine.savePreferences(); // L: 191 - } // L: 192 + void method2230(int var1) { + this.field1252 = var1; // L: 168 + class270.savePreferences(); // L: 169 + } // L: 170 - @ObfuscatedName("d") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "117" + descriptor = "(I)I", + garbageValue = "2093496919" ) - int method2238() { - return this.field1218; // L: 195 - } - - @ObfuscatedName("m") - void method2239(double var1) { - this.brightness = var1; // L: 199 - GameEngine.savePreferences(); // L: 200 - } // L: 201 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(B)D", - garbageValue = "23" - ) - double method2240() { - return this.brightness; // L: 204 + int method2231() { + return this.field1252; // L: 173 } @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-14" - ) - void method2241(int var1) { - this.musicVolume = var1; // L: 208 - GameEngine.savePreferences(); // L: 209 - } // L: 210 + void method2232(double var1) { + this.brightness = var1; // L: 177 + class270.savePreferences(); // L: 178 + } // L: 179 @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1354418976" + descriptor = "(I)D", + garbageValue = "-2107962943" ) - int method2321() { - return this.musicVolume; // L: 213 + double method2225() { + return this.brightness; // L: 182 } @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "15" - ) - @Export("updateSoundEffectVolume") - void updateSoundEffectVolume(int var1) { - this.soundEffectsVolume = var1; // L: 217 - GameEngine.savePreferences(); // L: 218 - } // L: 219 - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "38" - ) - int method2243() { - return this.soundEffectsVolume; // L: 222 - } - - @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1931510599" + garbageValue = "1172859341" ) - void method2244(int var1) { - this.areaSoundEffectsVolume = var1; // L: 226 - GameEngine.savePreferences(); // L: 227 - } // L: 228 + void method2234(int var1) { + this.musicVolume = var1; // L: 186 + class270.savePreferences(); // L: 187 + } // L: 188 - @ObfuscatedName("j") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "681521036" + garbageValue = "-874911160" ) - int method2270() { - return this.areaSoundEffectsVolume; // L: 231 + int method2248() { + return this.musicVolume; // L: 191 } @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "2038280864" + descriptor = "(II)V", + garbageValue = "-1131698297" ) - void method2286(String var1) { - this.rememberedUsername = var1; // L: 235 - GameEngine.savePreferences(); // L: 236 - } // L: 237 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(S)Ljava/lang/String;", - garbageValue = "7053" - ) - String method2247() { - return this.rememberedUsername; // L: 240 - } + @Export("updateSoundEffectVolume") + void updateSoundEffectVolume(int var1) { + this.soundEffectsVolume = var1; // L: 195 + class270.savePreferences(); // L: 196 + } // L: 197 @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-91" - ) - void method2248(int var1) { - this.field1215 = var1; // L: 244 - GameEngine.savePreferences(); // L: 245 - } // L: 246 - - @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-858252444" + garbageValue = "-971935263" ) - int method2249() { - return this.field1215; // L: 249 + int method2244() { + return this.soundEffectsVolume; // L: 200 } - @ObfuscatedName("aq") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1789378363" + garbageValue = "-1856408650" ) - void method2250(int var1) { - this.windowMode = var1; // L: 253 - GameEngine.savePreferences(); // L: 254 - } // L: 255 - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "114" - ) - int method2251() { - return this.windowMode; // L: 258 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)Lfh;", - garbageValue = "-2074828092" - ) - @Export("SpotAnimationDefinition_get") - public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { - SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); // L: 34 - var1 = new SpotAnimationDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 38 - return var1; // L: 39 - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1889189967" - ) - static void method2259() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 30 - if (var0.stream1 != null) { // L: 31 - StructComposition.pcmStreamMixer.removeSubStream(var0.stream1); // L: 32 - var0.stream1 = null; // L: 33 - } - - if (var0.stream2 != null) { // L: 35 - StructComposition.pcmStreamMixer.removeSubStream(var0.stream2); // L: 36 - var0.stream2 = null; // L: 37 - } - } - - ObjectSound.objectSounds.clear(); // L: 40 - } // L: 41 + void method2278(int var1) { + this.areaSoundEffectsVolume = var1; // L: 204 + class270.savePreferences(); // L: 205 + } // L: 206 @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "441769737" + descriptor = "(I)I", + garbageValue = "750592599" ) - @Export("isCharPrintable") - public static boolean isCharPrintable(char var0) { - if (var0 >= ' ' && var0 <= '~') { // L: 175 - return true; - } else if (var0 >= 160 && var0 <= 255) { - return true; // L: 176 - } else { - return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 177 + int method2239() { + return this.areaSoundEffectsVolume; // L: 209 + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-64324606" + ) + void method2297(String var1) { + this.rememberedUsername = var1; // L: 213 + class270.savePreferences(); // L: 214 + } // L: 215 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "2088208815" + ) + String method2241() { + return this.rememberedUsername; // L: 218 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-586904848" + ) + void method2306(int var1) { + this.field1249 = var1; // L: 222 + class270.savePreferences(); // L: 223 + } // L: 224 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "19888" + ) + int method2243() { + return this.field1249; // L: 227 + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "54" + ) + void method2245(int var1) { + this.windowMode = var1; // L: 231 + class270.savePreferences(); // L: 232 + } // L: 233 + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "82" + ) + int method2274() { + return this.windowMode; // L: 236 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-66" + ) + @Export("loadWorlds") + static boolean loadWorlds() { + try { + if (NPC.World_request == null) { // L: 31 + NPC.World_request = UserComparator7.urlRequester.request(new URL(class93.field1280)); + } else if (NPC.World_request.isDone()) { // L: 33 + byte[] var0 = NPC.World_request.getResponse(); // L: 34 + Buffer var1 = new Buffer(var0); // L: 35 + var1.readInt(); // L: 36 + World.World_count = var1.readUnsignedShort(); // L: 37 + World.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 = World.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 + } + + UserComparator8.sortWorlds(World.World_worlds, 0, World.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49 + NPC.World_request = null; // L: 50 + return true; // L: 51 + } + } catch (Exception var4) { // L: 55 + var4.printStackTrace(); // L: 56 + NPC.World_request = null; // L: 57 } + + return false; // L: 59 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)Lbx;", + garbageValue = "-1660202002" + ) + @Export("worldListStart") + static World worldListStart() { + World.World_listCount = 0; // L: 247 + return class146.getNextWorldListWorld(); // L: 248 } } diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index 95c49a7eed..a8034d89db 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -1,49 +1,96 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fr") +@ObfuscatedName("fo") @Implements("Clock") public abstract class Clock { + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lqd;" + ) + static IndexedSprite field1839; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -440159509 + ) + @Export("musicTrackVolume") + public static int musicTrackVolume; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lqd;" + ) + @Export("logoSprite") + static IndexedSprite logoSprite; + @ObfuscatedName("eb") + @ObfuscatedSignature( + descriptor = "Lle;" + ) + @Export("archive1") + static Archive archive1; + @ObfuscatedName("qu") + @ObfuscatedSignature( + descriptor = "Lfy;" + ) + @Export("mouseWheel") + static class158 mouseWheel; + Clock() { } // L: 4 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1350330504" + garbageValue = "-1993169750" ) @Export("mark") public abstract void mark(); - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "2026134141" + garbageValue = "1389334721" ) @Export("wait") public abstract int wait(int var1, int var2); - @ObfuscatedName("v") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(IB)Lgc;", - garbageValue = "1" + descriptor = "([BIIB)I", + garbageValue = "43" ) - public static FloorOverlayDefinition method3349(int var0) { - FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); // L: 26 - if (var1 != null) { // L: 27 - return var1; - } else { - byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); // L: 28 - var1 = new FloorOverlayDefinition(); // L: 29 - if (var2 != null) { // L: 30 - var1.decode(new Buffer(var2), var0); - } + public static int method3249(byte[] var0, int var1, int var2) { + int var3 = -1; // L: 47 - var1.postDecode(); // L: 31 - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); // L: 32 - return var1; // L: 33 + for (int var4 = var1; var4 < var2; ++var4) { // L: 48 + var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 49 } + + var3 = ~var3; // L: 51 + return var3; // L: 52 + } + + @ObfuscatedName("jd") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lki;I)Ljava/lang/String;", + garbageValue = "2108423281" + ) + static String method3248(String var0, Widget var1) { + if (var0.indexOf("%") != -1) { // L: 10716 + for (int var2 = 1; var2 <= 5; ++var2) { // L: 10717 + while (true) { + int var3 = var0.indexOf("%" + var2); // L: 10719 + if (var3 == -1) { // L: 10720 + break; + } + + var0 = var0.substring(0, var3) + class14.method165(Players.method2413(var1, var2 - 1)) + var0.substring(var3 + 2); // L: 10721 + } + } + } + + return var0; // L: 10725 } } diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index e210c19aed..ce5fdf1420 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -4,34 +4,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gv") +@ObfuscatedName("gh") @Implements("CollisionMap") public class CollisionMap { - @ObfuscatedName("al") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -2036334399 + intValue = -676684941 ) @Export("xInset") public int xInset; - @ObfuscatedName("av") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 248145697 + intValue = 1940639369 ) @Export("yInset") public int yInset; - @ObfuscatedName("at") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1443603637 + intValue = -1585012931 ) @Export("xSize") int xSize; - @ObfuscatedName("an") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -322616853 + intValue = -515009777 ) @Export("ySize") int ySize; - @ObfuscatedName("ay") + @ObfuscatedName("ak") @Export("flags") public int[][] flags; @@ -44,10 +44,10 @@ public class CollisionMap { this.clear(); // L: 49 } // L: 50 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "41" + descriptor = "(I)V", + garbageValue = "788330087" ) @Export("clear") public void clear() { @@ -63,12 +63,12 @@ public class CollisionMap { } // L: 59 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "41761614" + garbageValue = "1519045367" ) - public void method3872(int var1, int var2, int var3, int var4, boolean var5) { + public void method3749(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 @@ -215,10 +215,10 @@ public class CollisionMap { } // L: 182 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIIZB)V", - garbageValue = "-49" + descriptor = "(IIIIZI)V", + garbageValue = "-1626418421" ) @Export("addGameObject") public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { @@ -242,10 +242,10 @@ public class CollisionMap { } // L: 196 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "122" + descriptor = "(III)V", + garbageValue = "-402472734" ) @Export("setBlockedByFloor") public void setBlockedByFloor(int var1, int var2) { @@ -255,10 +255,10 @@ public class CollisionMap { var10000[var2] |= 2097152; } // L: 202 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "577213527" + garbageValue = "-1395781534" ) @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { @@ -268,10 +268,10 @@ public class CollisionMap { var10000[var2] |= 262144; } // L: 208 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "-85" + descriptor = "(IIII)V", + garbageValue = "-1322228791" ) @Export("setFlag") void setFlag(int var1, int var2, int var3) { @@ -279,12 +279,12 @@ public class CollisionMap { var10000[var2] |= var3; } // L: 212 - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "-1937676600" + garbageValue = "1406016066" ) - public void method3853(int var1, int var2, int var3, int var4, boolean var5) { + public void method3756(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 @@ -431,10 +431,10 @@ public class CollisionMap { } // L: 335 - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIIIIZI)V", - garbageValue = "1357982372" + garbageValue = "1684782174" ) @Export("setFlagOffNonSquare") public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) { @@ -464,10 +464,10 @@ public class CollisionMap { } // L: 354 - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(IIIB)V", - garbageValue = "-35" + garbageValue = "1" ) @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { @@ -475,15 +475,36 @@ public class CollisionMap { var10000[var2] &= ~var3; } // L: 358 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-18" + descriptor = "(III)V", + garbageValue = "-1586126857" ) - public void method3847(int var1, int var2) { + public void method3759(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("gb") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2105208583" + ) + static void method3778() { + if (Client.renderSelf) { // L: 4947 + class263.addPlayerToScene(ModelData0.localPlayer, false); // L: 4948 + } + + } // L: 4950 + + @ObfuscatedName("ix") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1996457670" + ) + static final boolean method3788() { + return Client.isMenuOpen; // L: 8711 + } } diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index 0afdb65bd2..248fef3f57 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -4,32 +4,38 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ks") +@ObfuscatedName("kd") @Implements("Coord") public class Coord { - @ObfuscatedName("w") - public static boolean field3289; - @ObfuscatedName("v") + @ObfuscatedName("ui") @ObfuscatedGetter( - intValue = 1984638055 + intValue = 98471251 + ) + @Export("foundItemIndex") + static int foundItemIndex; + @ObfuscatedName("r") + public static short[] field3352; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1023382847 ) @Export("plane") public int plane; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1078309335 + intValue = 1531148769 ) @Export("x") public int x; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -585894477 + intValue = -991712687 ) @Export("y") public int y; @ObfuscatedSignature( - descriptor = "(Lks;)V" + descriptor = "(Lkd;)V" ) public Coord(Coord var1) { this.plane = var1.plane; // L: 15 @@ -54,86 +60,78 @@ public class Coord { } // L: 27 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-78" + garbageValue = "60" ) @Export("packed") public int packed() { - return class341.method6280(this.plane, this.x, this.y); // L: 30 + int var2 = this.plane; // L: 31 + int var3 = this.x; // L: 32 + int var4 = this.y; // L: 33 + int var1 = var2 << 28 | var3 << 14 | var4; // L: 35 + return var1; // L: 37 } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lks;B)Z", - garbageValue = "53" + descriptor = "(Lkd;I)Z", + garbageValue = "-95969340" ) @Export("equalsCoord") boolean equalsCoord(Coord var1) { - if (this.plane != var1.plane) { // L: 44 + if (this.plane != var1.plane) { // L: 48 return false; - } else if (this.x != var1.x) { // L: 45 + } else if (this.x != var1.x) { // L: 49 return false; } else { - return this.y == var1.y; // L: 46 + return this.y == var1.y; // L: 50 } } - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "74" + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "959391461" ) @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: 59 + return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); // L: 64 } public boolean equals(Object var1) { - if (this == var1) { // L: 38 + if (this == var1) { // L: 42 return true; } else { - return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); // L: 39 40 + return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); // L: 43 44 } } - public int hashCode() { - return this.packed(); // L: 51 - } - public String toString() { - return this.toString(","); // L: 55 + return this.toString(","); // L: 60 } - @ObfuscatedName("iq") + public int hashCode() { + return this.packed(); // L: 56 + } + + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)Z", + garbageValue = "474672865" ) - static final void method5531() { - int var0 = class138.menuX; // L: 8630 - int var1 = class1.menuY; // L: 8631 - int var2 = ItemComposition.menuWidth; // L: 8632 - int var3 = ByteArrayPool.menuHeight; // L: 8633 - int var4 = 6116423; // L: 8634 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, var4); // L: 8635 - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + 1, var1 + 1, var2 - 2, 16, 0); // L: 8636 - Rasterizer2D.Rasterizer2D_drawRectangle(var0 + 1, var1 + 18, var2 - 2, var3 - 19, 0); // L: 8637 - RouteStrategy.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); // L: 8638 - int var5 = MouseHandler.MouseHandler_x; // L: 8639 - int var6 = MouseHandler.MouseHandler_y; // L: 8640 + public static boolean method5370() { + return class273.musicPlayerStatus != 0 ? true : class273.midiPcmStream.isReady(); // L: 68 69 + } - for (int var7 = 0; var7 < Client.menuOptionsCount; ++var7) { // L: 8641 - int var8 = (Client.menuOptionsCount - 1 - var7) * 15 + var1 + 31; // L: 8642 - int var9 = 16777215; // L: 8643 - if (var5 > var0 && var5 < var2 + var0 && var6 > var8 - 13 && var6 < var8 + 3) { // L: 8644 - var9 = 16776960; - } - - RouteStrategy.fontBold12.draw(AbstractUserComparator.method6736(var7), var0 + 3, var8, var9, 0); // L: 8645 - } - - ScriptEvent.method2092(class138.menuX, class1.menuY, ItemComposition.menuWidth, ByteArrayPool.menuHeight); // L: 8647 - } // L: 8648 + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "1630457870" + ) + @Export("isDigit") + public static boolean isDigit(char var0) { + return var0 >= '0' && var0 <= '9'; // L: 150 + } } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index 05c0557fcb..54695b6e51 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -4,225 +4,147 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("as") +@ObfuscatedName("br") @Implements("Decimator") public class Decimator { - @ObfuscatedName("ur") - @ObfuscatedSignature( - descriptor = "Lbw;" - ) - @Export("friendSystem") - public static FriendSystem friendSystem; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lqq;" - ) - @Export("logoSprite") - static IndexedSprite logoSprite; - @ObfuscatedName("dq") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - @Export("js5Socket") - static AbstractSocket js5Socket; - @ObfuscatedName("jf") + @ObfuscatedName("re") + @Export("ClanChat_inClanChat") + static boolean ClanChat_inClanChat; + @ObfuscatedName("s") + @Export("SpriteBuffer_spritePalette") + public static int[] SpriteBuffer_spritePalette; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1220605689 + intValue = 1552308037 ) - static int field397; - @ObfuscatedName("f") + @Export("loginBoxCenter") + static int loginBoxCenter; + @ObfuscatedName("ft") + static String field406; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1215193119 + intValue = -1371041797 ) @Export("inputRate") int inputRate; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -871732017 + intValue = 327497787 ) @Export("outputRate") int outputRate; - @ObfuscatedName("n") + @ObfuscatedName("m") @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 = class343.method6137(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; // L: 33 - this.inputRate = var1; // L: 34 - this.outputRate = var2; // L: 35 - this.table = new int[var1][14]; // L: 36 - - for (int var7 = 0; var7 < var1; ++var7) { // L: 37 - int[] var8 = this.table[var7]; // L: 38 - double var9 = (double)var7 / (double)var1 + 6.0D; // L: 39 - int var11 = (int)Math.floor(1.0D + (var9 - 7.0D)); // L: 40 - if (var11 < 0) { // L: 41 - var11 = 0; + for (int var4 = 0; var4 < var1; ++var4) { // L: 21 + int[] var5 = this.table[var4]; // L: 22 + double var6 = 6.0D + (double)var4 / (double)var1; // L: 23 + int var8 = (int)Math.floor(1.0D + (var6 - 7.0D)); // L: 24 + if (var8 < 0) { // L: 25 + var8 = 0; } - int var12 = (int)Math.ceil(var9 + 7.0D); // L: 42 - if (var12 > 14) { // L: 43 - var12 = 14; + int var9 = (int)Math.ceil(var6 + 7.0D); // L: 26 + if (var9 > 14) { // L: 27 + var9 = 14; } - for (double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) { // L: 44 45 - double var15 = 3.141592653589793D * ((double)var11 - var9); // L: 46 - double var17 = var13; // L: 47 - if (var15 < -1.0E-4D || var15 > 1.0E-4D) { // L: 48 - var17 = var13 * (Math.sin(var15) / var15); + for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) { // L: 28 29 + double var12 = 3.141592653589793D * ((double)var8 - var6); // L: 30 + double var14 = var10; // L: 31 + if (var12 < -1.0E-4D || var12 > 1.0E-4D) { // L: 32 + var14 = var10 * (Math.sin(var12) / var12); } - var17 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var11 - var9)); // L: 49 - var8[var11] = (int)Math.floor(0.5D + 65536.0D * var17); // L: 50 + var14 *= 0.54D + 0.46D * Math.cos(((double)var8 - var6) * 0.2243994752564138D); // L: 33 + var5[var8] = (int)Math.floor(65536.0D * var14 + 0.5D); // L: 34 } } } - } // L: 53 + } // L: 37 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "([BI)[B", - garbageValue = "-84367819" + garbageValue = "1041792317" ) @Export("resample") byte[] resample(byte[] var1) { - if (this.table != null) { // L: 56 - int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14; // L: 57 - int[] var3 = new int[var2]; // L: 58 - int var4 = 0; // L: 59 - int var5 = 0; // L: 60 + if (this.table != null) { // L: 40 + int var2 = (int)((long)var1.length * (long)this.outputRate / (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) { // L: 61 - byte var7 = var1[var6]; // L: 62 - int[] var8 = this.table[var5]; // L: 63 + 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 + for (var9 = 0; var9 < 14; ++var9) { // L: 48 var3[var9 + var4] += var8[var9] * var7; } - var5 += this.outputRate; // L: 65 - var9 = var5 / this.inputRate; // L: 66 - var4 += var9; // L: 67 - var5 -= var9 * this.inputRate; // L: 68 + 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]; // L: 70 + var1 = new byte[var2]; // L: 54 - for (var6 = 0; var6 < var2; ++var6) { // L: 71 - int var10 = var3[var6] + 32768 >> 16; // L: 72 - 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; // L: 75 + var1[var6] = (byte)var10; // L: 59 } } } - return var1; // L: 78 + return var1; // L: 62 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(IB)I", - garbageValue = "25" + garbageValue = "69" ) @Export("scaleRate") int scaleRate(int var1) { - if (this.table != null) { - var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate); // L: 82 + if (this.table != null) { // L: 66 + var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate); } - return var1; // L: 83 + return var1; // L: 67 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1943827297" + garbageValue = "814340508" ) @Export("scalePosition") int scalePosition(int var1) { - if (this.table != null) { // L: 87 + if (this.table != null) { // L: 71 var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6; } - return var1; // L: 88 + return var1; // L: 72 } - - @ObfuscatedName("ff") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-13" - ) - @Export("updateGameState") - static void updateGameState(int var0) { - if (var0 != Client.gameState) { // L: 1075 - if (Client.gameState == 0) { // L: 1076 - class127.client.method520(); - } - - if (var0 == 20 || var0 == 40 || var0 == 45 || var0 == 50) { // L: 1077 - ModeWhere.method6099(0); // L: 1078 - Client.field528 = 0; // L: 1079 - Client.field661 = 0; // L: 1080 - Client.timer.method6563(var0); // L: 1081 - if (var0 != 20) { // L: 1082 - class302.method5766(false); - } - } - - if (var0 != 20 && var0 != 40 && ModeWhere.field4073 != null) { // L: 1084 1085 - ModeWhere.field4073.close(); // L: 1086 - ModeWhere.field4073 = null; // L: 1087 - } - - if (Client.gameState == 25) { // L: 1090 - Client.field560 = 0; // L: 1091 - Client.field747 = 0; // L: 1092 - Client.field608 = 1; // L: 1093 - Client.field558 = 0; // L: 1094 - Client.field758 = 1; // L: 1095 - } - - int var1; - if (var0 != 5 && var0 != 10) { // L: 1097 - if (var0 == 20) { // L: 1101 - var1 = Client.gameState == 11 ? 4 : 0; // L: 1102 - class144.method3080(JagexCache.archive10, class145.archive8, false, var1); // L: 1103 - } else if (var0 == 11) { // L: 1105 - class144.method3080(JagexCache.archive10, class145.archive8, false, 4); // L: 1106 - } else if (var0 == 50) { // L: 1108 - class4.setLoginResponseString("", "Updating date of birth...", ""); // L: 1109 - class144.method3080(JagexCache.archive10, class145.archive8, false, 7); // L: 1110 - } else { - WorldMapSprite.method4351(); // L: 1112 - } - } else { - var1 = BufferedSource.method6889() ? 0 : 12; // L: 1098 - class144.method3080(JagexCache.archive10, class145.archive8, true, var1); // L: 1099 - } - - Client.gameState = var0; // L: 1113 - } - } // L: 1114 } diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index 7d41dcf372..a737a36fa4 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -4,43 +4,26 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nu") +@ObfuscatedName("ny") @Implements("DefaultsGroup") public class DefaultsGroup { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lnu;" + descriptor = "Lny;" ) - static final DefaultsGroup field4311; - @ObfuscatedName("c") + static final DefaultsGroup field4370; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1482438781 + intValue = 1549368493 ) @Export("group") final int group; static { - field4311 = new DefaultsGroup(3); // L: 4 + field4370 = new DefaultsGroup(3); // L: 4 } DefaultsGroup(int var1) { this.group = var1; // L: 8 } // L: 9 - - @ObfuscatedName("lj") - @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "1715985756" - ) - static void method6936(Buffer var0, int var1) { - UserComparator6.method2646(var0.array, var1); // L: 12572 - if (JagexCache.JagexCache_randomDat != null) { // L: 12574 - try { - JagexCache.JagexCache_randomDat.seek(0L); // L: 12576 - JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 12577 - } catch (Exception var3) { // L: 12579 - } - } - - } // L: 12582 } diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index bf7c962893..a91a9fe605 100644 --- a/runescape-client/src/main/java/DemotingHashTable.java +++ b/runescape-client/src/main/java/DemotingHashTable.java @@ -3,32 +3,32 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ie") +@ObfuscatedName("ic") @Implements("DemotingHashTable") public final class DemotingHashTable { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("capacity") int capacity; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("remaining") int remaining; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "Lpt;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lmr;" + descriptor = "Lma;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Liu;" ) - class253 field2877; + class253 field2932; public DemotingHashTable(int var1, int var2) { this.queue = new IterableDualNodeQueue(); // L: 11 @@ -46,7 +46,7 @@ public final class DemotingHashTable { this(var1, var1); // L: 15 } // L: 16 - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("get") public Object get(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 27 @@ -77,16 +77,16 @@ public final class DemotingHashTable { } } - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("remove") void remove(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 52 this.removeWrapper(var3); // L: 53 } // L: 54 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Liz;)V" + descriptor = "(Lim;)V" ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { @@ -98,12 +98,12 @@ public final class DemotingHashTable { } // L: 62 - @ObfuscatedName("f") - public void method5124(Object var1, long var2) { + @ObfuscatedName("k") + public void method4942(Object var1, long var2) { this.put(var1, var2, 1); // L: 65 } // L: 66 - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("put") public void put(Object var1, long var2, int var4) { if (var4 > this.capacity) { // L: 69 @@ -122,8 +122,8 @@ public final class DemotingHashTable { } this.removeWrapper(var5); // L: 78 - if (this.field2877 != null) { // L: 79 - this.field2877.method5114(var5.get()); // L: 80 + if (this.field2932 != null) { // L: 79 + this.field2932.method4937(var5.get()); // L: 80 } } @@ -134,7 +134,7 @@ public final class DemotingHashTable { } } // L: 87 - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("demote") public void demote(int var1) { for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { // L: 90 @@ -155,7 +155,7 @@ public final class DemotingHashTable { } // L: 109 - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("clear") public void clear() { this.queue.clear(); // L: 112 diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java index 5ee2e58894..c74273320c 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -4,201 +4,211 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("od") +@ObfuscatedName("of") @Implements("DesktopPlatformInfoProvider") public class DesktopPlatformInfoProvider implements PlatformInfoProvider { - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 175576615 - ) - int field4413; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 551847099 - ) - int field4412; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -212427447 - ) - int field4416; - @ObfuscatedName("v") + public static short[][] field4469; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 673826891 + ) + int field4468; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1902875041 + ) + int field4472; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 658179341 + ) + int field4473; + + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Loj;", - garbageValue = "2004856383" + descriptor = "(B)Lom;", + garbageValue = "-12" ) @Export("get") public PlatformInfo get() { byte var1; - if (class128.formattedOperatingSystemName.startsWith("win")) { // L: 15 + if (WorldMapArea.formattedOperatingSystemName.startsWith("win")) { // L: 16 var1 = 1; - } else if (class128.formattedOperatingSystemName.startsWith("mac")) { // L: 16 + } else if (WorldMapArea.formattedOperatingSystemName.startsWith("mac")) { // L: 17 var1 = 2; - } else if (class128.formattedOperatingSystemName.startsWith("linux")) { // L: 17 + } else if (WorldMapArea.formattedOperatingSystemName.startsWith("linux")) { // L: 18 var1 = 3; } else { - var1 = 4; // L: 18 + var1 = 4; // L: 19 } String var2; try { - var2 = System.getProperty("os.arch").toLowerCase(); // L: 22 - } catch (Exception var27) { // L: 24 - var2 = ""; // L: 25 + var2 = System.getProperty("os.arch").toLowerCase(); // L: 23 + } catch (Exception var30) { // L: 25 + var2 = ""; // L: 26 } String var3; try { - var3 = System.getProperty("os.version").toLowerCase(); // L: 28 - } catch (Exception var26) { // L: 30 - var3 = ""; // L: 31 + var3 = System.getProperty("os.version").toLowerCase(); // L: 29 + } catch (Exception var29) { // L: 31 + var3 = ""; // L: 32 } - String var4 = "Unknown"; // L: 33 - String var5 = "1.1"; // L: 34 + String var4 = "Unknown"; // L: 34 + String var5 = "1.1"; // L: 35 try { - var4 = System.getProperty("java.vendor"); // L: 36 - var5 = System.getProperty("java.version"); // L: 37 - } catch (Exception var25) { // L: 39 + var4 = System.getProperty("java.vendor"); // L: 37 + var5 = System.getProperty("java.version"); // L: 38 + } catch (Exception var28) { // L: 40 } - boolean var24; - if (!var2.startsWith("amd64") && !var2.startsWith("x86_64")) { // L: 41 - var24 = false; // L: 42 + boolean var27; + if (!var2.startsWith("amd64") && !var2.startsWith("x86_64")) { // L: 42 + var27 = false; // L: 43 } else { - var24 = true; + var27 = true; } - byte var7 = 0; // L: 43 - if (var1 == 1) { // L: 44 - if (var3.indexOf("4.0") != -1) { // L: 45 + byte var7 = 0; // L: 44 + if (var1 == 1) { // L: 45 + if (var3.indexOf("4.0") != -1) { // L: 46 var7 = 1; - } else if (var3.indexOf("4.1") != -1) { // L: 46 + } else if (var3.indexOf("4.1") != -1) { // L: 47 var7 = 2; - } else if (var3.indexOf("4.9") != -1) { // L: 47 + } else if (var3.indexOf("4.9") != -1) { // L: 48 var7 = 3; - } else if (var3.indexOf("5.0") != -1) { // L: 48 + } else if (var3.indexOf("5.0") != -1) { // L: 49 var7 = 4; - } else if (var3.indexOf("5.1") != -1) { // L: 49 + } else if (var3.indexOf("5.1") != -1) { // L: 50 var7 = 5; - } else if (var3.indexOf("5.2") != -1) { // L: 50 + } else if (var3.indexOf("5.2") != -1) { // L: 51 var7 = 8; - } else if (var3.indexOf("6.0") != -1) { // L: 51 + } else if (var3.indexOf("6.0") != -1) { // L: 52 var7 = 6; - } else if (var3.indexOf("6.1") != -1) { // L: 52 + } else if (var3.indexOf("6.1") != -1) { // L: 53 var7 = 7; - } else if (var3.indexOf("6.2") != -1) { // L: 53 + } else if (var3.indexOf("6.2") != -1) { // L: 54 var7 = 9; - } else if (var3.indexOf("6.3") != -1) { // L: 54 + } else if (var3.indexOf("6.3") != -1) { // L: 55 var7 = 10; - } else if (var3.indexOf("10.0") != -1) { // L: 55 + } else if (var3.indexOf("10.0") != -1) { // L: 56 var7 = 11; } - } else if (var1 == 2) { // L: 57 - if (var3.indexOf("10.4") != -1) { // L: 58 + } else if (var1 == 2) { // L: 58 + if (var3.indexOf("10.4") != -1) { // L: 59 var7 = 20; - } else if (var3.indexOf("10.5") != -1) { // L: 59 + } else if (var3.indexOf("10.5") != -1) { // L: 60 var7 = 21; - } else if (var3.indexOf("10.6") != -1) { // L: 60 + } else if (var3.indexOf("10.6") != -1) { // L: 61 var7 = 22; - } else if (var3.indexOf("10.7") != -1) { // L: 61 + } else if (var3.indexOf("10.7") != -1) { // L: 62 var7 = 23; - } else if (var3.indexOf("10.8") != -1) { // L: 62 + } else if (var3.indexOf("10.8") != -1) { // L: 63 var7 = 24; - } else if (var3.indexOf("10.9") != -1) { // L: 63 + } else if (var3.indexOf("10.9") != -1) { // L: 64 var7 = 25; } else if (var3.indexOf("10.10") != -1) { - var7 = 26; // L: 64 - } else if (var3.indexOf("10.11") != -1) { // L: 65 + var7 = 26; // L: 65 + } else if (var3.indexOf("10.11") != -1) { // L: 66 var7 = 27; - } else if (var3.indexOf("10.12") != -1) { // L: 66 + } else if (var3.indexOf("10.12") != -1) { // L: 67 var7 = 28; - } else if (var3.indexOf("10.13") != -1) { // L: 67 + } else if (var3.indexOf("10.13") != -1) { // L: 68 var7 = 29; } } byte var8; - if (var4.toLowerCase().indexOf("sun") != -1) { // L: 70 + if (var4.toLowerCase().indexOf("sun") != -1) { // L: 71 var8 = 1; - } else if (var4.toLowerCase().indexOf("microsoft") != -1) { // L: 71 + } else if (var4.toLowerCase().indexOf("microsoft") != -1) { // L: 72 var8 = 2; - } else if (var4.toLowerCase().indexOf("apple") != -1) { // L: 72 + } else if (var4.toLowerCase().indexOf("apple") != -1) { // L: 73 var8 = 3; - } else if (var4.toLowerCase().indexOf("oracle") != -1) { // L: 73 + } else if (var4.toLowerCase().indexOf("oracle") != -1) { // L: 74 var8 = 5; } else { - var8 = 4; // L: 74 + var8 = 4; // L: 75 } - this.method7178(var5); // L: 75 - int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; // L: 77 + this.method6988(var5); // L: 76 + boolean var9 = false; // L: 77 + int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; // L: 78 int var11; - if (this.field4413 > 3) { // L: 80 + if (this.field4468 > 3) { // L: 81 var11 = Runtime.getRuntime().availableProcessors(); } else { - var11 = 0; // L: 81 + var11 = 0; // L: 82 } - byte var12 = 0; // L: 82 - String var13 = ""; // L: 83 - String var14 = ""; // L: 84 - String var15 = ""; // L: 85 - String var16 = ""; // L: 86 - String var17 = ""; // L: 87 - String var18 = ""; // L: 88 - int[] var23 = new int[3]; // L: 93 - return new PlatformInfo(var1, var24, var7, var8, this.field4413, this.field4412, this.field4416, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 97 + byte var12 = 0; // L: 83 + String var13 = ""; // L: 84 + String var14 = ""; // L: 85 + String var15 = ""; // L: 86 + String var16 = ""; // L: 87 + String var17 = ""; // L: 88 + String var18 = ""; // L: 89 + boolean var19 = false; // L: 90 + boolean var20 = false; // L: 91 + boolean var21 = false; // L: 92 + boolean var22 = false; // L: 93 + int[] var23 = new int[3]; // L: 94 + boolean var24 = false; // L: 95 + String var25 = ""; // L: 96 + boolean var26 = false; // L: 97 + return new PlatformInfo(var1, var27, var7, var8, this.field4468, this.field4472, this.field4473, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 98 } - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "559180637" - ) - void method7178(String var1) { - if (var1.startsWith("1.")) { // L: 101 - this.method7179(var1); // L: 102 - } else { - this.method7177(var1); // L: 105 - } - - } // L: 107 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "435492533" - ) - void method7179(String var1) { - String[] var2 = var1.split("\\."); // L: 110 - - try { - this.field4413 = Integer.parseInt(var2[1]); // L: 112 - var2 = var2[2].split("_"); // L: 113 - this.field4412 = Integer.parseInt(var2[0]); // L: 114 - this.field4416 = Integer.parseInt(var2[1]); // L: 115 - } catch (Exception var4) { // L: 117 - } - - } // L: 118 - - @ObfuscatedName("f") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)V", - garbageValue = "120" + garbageValue = "99" ) - void method7177(String var1) { - String[] var2 = var1.split("\\."); // L: 121 - - try { - this.field4413 = Integer.parseInt(var2[0]); // L: 123 - this.field4412 = Integer.parseInt(var2[1]); // L: 124 - this.field4416 = Integer.parseInt(var2[2]); // L: 125 - } catch (Exception var4) { // L: 127 + void method6988(String var1) { + if (var1.startsWith("1.")) { // L: 102 + this.method6991(var1); // L: 103 + } else { + this.method6996(var1); // L: 106 } - } // L: 128 + } // L: 108 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-380169429" + ) + void method6991(String var1) { + String[] var2 = var1.split("\\."); // L: 111 + + try { + this.field4468 = Integer.parseInt(var2[1]); // L: 113 + var2 = var2[2].split("_"); // L: 114 + this.field4472 = Integer.parseInt(var2[0]); // L: 115 + this.field4473 = Integer.parseInt(var2[1]); // L: 116 + } catch (Exception var4) { // L: 118 + } + + } // L: 119 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-68" + ) + void method6996(String var1) { + String[] var2 = var1.split("\\."); // L: 122 + + try { + this.field4468 = Integer.parseInt(var2[0]); // L: 124 + this.field4472 = Integer.parseInt(var2[1]); // L: 125 + this.field4473 = Integer.parseInt(var2[2]); // L: 126 + } catch (Exception var4) { // L: 128 + } + + } // L: 129 } diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index 9ef79d4012..eb682d757e 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -9,114 +9,114 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ae") +@ObfuscatedName("ag") @Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("format") AudioFormat format; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("line") SourceDataLine line; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1556714099 + intValue = 30092841 ) @Export("capacity2") int capacity2; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("byteSamples") byte[] byteSamples; DevicePcmPlayer() { } // L: 18 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-843995592" + garbageValue = "-125708948" ) @Export("init") protected void init() { - this.format = new AudioFormat((float)PcmPlayer.field268, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); // L: 21 - this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 22 - } // L: 23 + this.format = new AudioFormat((float)PcmPlayer.field300, 16, ArchiveDiskAction.PcmPlayer_stereo ? 2 : 1, true, false); // L: 22 + this.byteSamples = new byte[256 << (ArchiveDiskAction.PcmPlayer_stereo ? 2 : 1)]; // L: 23 + } // L: 24 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1651380399" + descriptor = "(IS)V", + garbageValue = "-30840" ) @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 - this.line = (SourceDataLine)AudioSystem.getLine(var2); // L: 28 - this.line.open(); // L: 29 - this.line.start(); // L: 30 - this.capacity2 = var1; // L: 31 - } catch (LineUnavailableException var3) { // L: 33 - if (class150.method3150(var1) != 1) { // L: 34 - this.open(class67.method1909(var1)); // L: 35 + Info var2 = new Info(SourceDataLine.class, this.format, var1 << (ArchiveDiskAction.PcmPlayer_stereo ? 2 : 1)); // L: 29 + this.line = (SourceDataLine)AudioSystem.getLine(var2); // L: 30 + this.line.open(); // L: 31 + this.line.start(); // L: 32 + this.capacity2 = var1; // L: 33 + } catch (LineUnavailableException var3) { // L: 35 + if (VarcInt.method3324(var1) != 1) { // L: 36 + this.open(FontName.method7228(var1)); // L: 37 } else { - this.line = null; // L: 38 - throw var3; // L: 39 + this.line = null; // L: 40 + throw var3; // L: 41 } } - } // L: 36 41 + } // L: 38 43 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "244839095" + descriptor = "(S)I", + garbageValue = "181" ) @Export("position") protected int position() { - return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 44 + return this.capacity2 - (this.line.available() >> (ArchiveDiskAction.PcmPlayer_stereo ? 2 : 1)); // L: 47 } - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("write") protected void write() { - int var1 = 256; // L: 49 - if (PcmPlayer.PcmPlayer_stereo) { // L: 50 + int var1 = 256; // L: 53 + if (ArchiveDiskAction.PcmPlayer_stereo) { // L: 54 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: 55 + int var3 = super.samples[var2]; // L: 56 + if ((var3 + 8388608 & -16777216) != 0) { // L: 57 + var3 = 8388607 ^ var3 >> 31; // L: 58 } - 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: 60 + this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); // L: 61 } - this.line.write(this.byteSamples, 0, var1 << 1); // L: 59 - } // L: 60 + this.line.write(this.byteSamples, 0, var1 << 1); // L: 63 + } // L: 64 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1662003992" + descriptor = "(B)V", + garbageValue = "25" ) @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: 68 + this.line.close(); // L: 69 + this.line = null; // L: 70 } - } // L: 67 + } // L: 72 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1137884684" + garbageValue = "207475579" ) @Export("discard") protected void discard() { - this.line.flush(); // L: 70 - } // L: 71 + this.line.flush(); // L: 76 + } // L: 77 } diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index 83209f2e7d..c1e2005a24 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -1,43 +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("z") +@ObfuscatedName("i") @Implements("DevicePcmPlayerProvider") -public class DevicePcmPlayerProvider implements class45 { - @ObfuscatedName("sx") - @ObfuscatedGetter( - intValue = 1132145401 - ) - static int field154; - @ObfuscatedName("b") +public class DevicePcmPlayerProvider implements class47 { + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "[Lbb;" + descriptor = "Lqi;" ) - @Export("World_worlds") - static World[] World_worlds; - @ObfuscatedName("l") - @Export("ItemDefinition_inMembersWorld") - static boolean ItemDefinition_inMembersWorld; - @ObfuscatedName("ns") - @ObfuscatedSignature( - descriptor = "Lky;" - ) - @Export("mousedOverWidgetIf1") - static Widget mousedOverWidgetIf1; + @Export("rasterProvider") + public static AbstractRasterProvider rasterProvider; DevicePcmPlayerProvider() { } // L: 7 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Lay;", - garbageValue = "-262480710" + descriptor = "(I)Lal;", + garbageValue = "-1051033843" ) @Export("player") public PcmPlayer player() { - return new DevicePcmPlayer(); // L: 10 + return new DevicePcmPlayer(); // L: 11 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Llp;Llp;I)I", + garbageValue = "654375877" + ) + static int method338(AbstractArchive var0, AbstractArchive var1) { + int var2 = 0; + String[] var3 = Login.field910; + + int var4; + String var5; + for (var4 = 0; var4 < var3.length; ++var4) { // L: 162 + var5 = var3[var4]; // L: 163 + if (var0.tryLoadFileByNames(var5, "")) { // L: 165 + ++var2; + } + } + + var3 = Login.field911; // L: 170 + + for (var4 = 0; var4 < var3.length; ++var4) { // L: 171 + var5 = var3[var4]; // L: 172 + if (var1.tryLoadFileByNames(var5, "")) { // L: 174 + ++var2; + } + } + + return var2; // L: 178 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "296751671" + ) + static void method336(int var0, int var1) { + long var2 = (long)((var0 << 16) + var1); // L: 157 + NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); // L: 158 + if (var4 != null) { // L: 159 + NetCache.NetCache_pendingWritesQueue.addLast(var4); // L: 160 + } + } // L: 161 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "7" + ) + static final int method340(int var0, int var1) { + if (var0 == -1) { // L: 969 + return 12345678; + } else { + var1 = (var0 & 127) * var1 / 128; // L: 970 + if (var1 < 2) { // L: 971 + var1 = 2; + } else if (var1 > 126) { // L: 972 + var1 = 126; + } + + return (var0 & 65408) + var1; // L: 973 + } + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(ILbb;ZI)I", + garbageValue = "1672362230" + ) + static int method335(int var0, Script var1, boolean var2) { + if (var0 == 6800) { // L: 4511 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 4512 + return 1; // L: 4513 + } else if (var0 != 6801 && var0 != 6802) { // L: 4515 + if (var0 == 6850) { // L: 4519 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 4520 + return 1; // L: 4521 + } else if (var0 != 6851 && var0 != 6852) { // L: 4523 + if (var0 == 6853) { // L: 4527 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4528 + return 1; // L: 4529 + } else { + return 2; // L: 4531 + } + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4524 + return 1; // L: 4525 + } + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4516 + return 1; // L: 4517 + } } } diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index f5228e3f6a..a8fa1875b7 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -4,26 +4,25 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("js") +@ObfuscatedName("jl") @Implements("DirectByteArrayCopier") public class DirectByteArrayCopier extends AbstractByteArrayCopier { - @ObfuscatedName("pf") + @ObfuscatedName("gx") @ObfuscatedSignature( - descriptor = "Lpj;" + descriptor = "Lnf;" ) - @Export("HitSplatDefinition_cached") - static class426 HitSplatDefinition_cached; - @ObfuscatedName("v") + static AbstractSocket field3337; + @ObfuscatedName("o") @Export("directBuffer") ByteBuffer directBuffer; DirectByteArrayCopier() { } // L: 10 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "2035077648" + descriptor = "(B)[B", + garbageValue = "70" ) @Export("get") byte[] get() { @@ -33,24 +32,37 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { return var1; // L: 16 } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "-1279201457" + garbageValue = "-362326915" ) @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 + this.directBuffer = ByteBuffer.allocateDirect(var1.length); + this.directBuffer.position(0); + this.directBuffer.put(var1); + } - @ObfuscatedName("i") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1117680233" + descriptor = "(IB)Lft;", + garbageValue = "12" ) - public static boolean method5516(int var0) { - return (var0 >> 20 & 1) != 0; // L: 17 + @Export("getInvDefinition") + public static InvDefinition getInvDefinition(int var0) { + InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 17 + if (var1 != null) { // L: 18 + return var1; + } else { + byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); // L: 19 + var1 = new InvDefinition(); // L: 20 + if (var2 != null) { // L: 21 + var1.decode(new Buffer(var2)); + } + + InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 22 + return var1; // L: 23 + } } } diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java index 5eb131ace3..bc02e6a1c9 100644 --- a/runescape-client/src/main/java/DirectWrapper.java +++ b/runescape-client/src/main/java/DirectWrapper.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("id") +@ObfuscatedName("il") @Implements("DirectWrapper") public class DirectWrapper extends Wrapper { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("obj") Object obj; @@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper { this.obj = var1; // L: 8 } // L: 9 - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("get") Object get() { return this.obj; // L: 12 } - @ObfuscatedName("c") + @ObfuscatedName("q") @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 54bb69c86f..48ca6c2ab2 100644 --- a/runescape-client/src/main/java/DualNode.java +++ b/runescape-client/src/main/java/DualNode.java @@ -3,26 +3,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oz") +@ObfuscatedName("oq") @Implements("DualNode") public class DualNode extends Node { - @ObfuscatedName("cd") + @ObfuscatedName("dh") @Export("keyDual") public long keyDual; - @ObfuscatedName("cw") + @ObfuscatedName("dj") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) @Export("previousDual") public DualNode previousDual; - @ObfuscatedName("cx") + @ObfuscatedName("dx") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) @Export("nextDual") public DualNode nextDual; - @ObfuscatedName("de") + @ObfuscatedName("dx") @Export("removeDual") public void removeDual() { if (this.nextDual != null) { // L: 9 diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java index b73866baab..75084c461e 100644 --- a/runescape-client/src/main/java/DualNodeDeque.java +++ b/runescape-client/src/main/java/DualNodeDeque.java @@ -3,12 +3,12 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("la") +@ObfuscatedName("lr") @Implements("DualNodeDeque") public final class DualNodeDeque { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) @Export("sentinel") DualNode sentinel; @@ -19,9 +19,9 @@ public final class DualNodeDeque { this.sentinel.nextDual = this.sentinel; // L: 10 } // L: 11 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Loz;)V" + descriptor = "(Loq;)V" ) @Export("addFirst") public void addFirst(DualNode var1) { @@ -35,9 +35,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; // L: 18 } // L: 19 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Loz;)V" + descriptor = "(Loq;)V" ) @Export("addLast") public void addLast(DualNode var1) { @@ -51,9 +51,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; // L: 26 } // L: 27 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Loz;" + descriptor = "()Loq;" ) @Export("removeLast") public DualNode removeLast() { diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index b61f2906e7..fd117844e9 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -3,76 +3,68 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bc") +@ObfuscatedName("bm") @Implements("DynamicObject") public class DynamicObject extends Renderable { - @ObfuscatedName("gx") - @ObfuscatedSignature( - descriptor = "Lfx;" - ) - @Export("socketTask") - static Task socketTask; - @ObfuscatedName("hp") - @Export("regionMapArchives") - static byte[][] regionMapArchives; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 920193097 + intValue = 393913769 ) @Export("id") int id; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1286565411 + intValue = 992153197 ) @Export("type") int type; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -971153847 + intValue = 849198695 ) @Export("orientation") int orientation; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 326052965 + intValue = 2111003401 ) @Export("plane") int plane; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1315093071 + intValue = -1849101915 ) @Export("x") int x; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 255854397 + intValue = 1844772961 ) @Export("y") int y; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Lgq;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 896717489 + intValue = 1649346091 ) @Export("frame") int frame; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 131494325 + intValue = -1098148309 ) @Export("cycleStart") int cycleStart; @ObfuscatedSignature( - descriptor = "(IIIIIIIZLix;)V" + descriptor = "(IIIIIIIZLgx;)V" ) DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Renderable var9) { this.id = var1; // L: 20 @@ -82,10 +74,10 @@ public class DynamicObject extends Renderable { this.x = var5; // L: 24 this.y = var6; // L: 25 if (var7 != -1) { // L: 26 - this.sequenceDefinition = class163.SequenceDefinition_get(var7); // L: 27 + this.sequenceDefinition = class114.SequenceDefinition_get(var7); // L: 27 this.frame = 0; // L: 28 this.cycleStart = Client.cycle - 1; // L: 29 - if (this.sequenceDefinition.field2161 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30 + if (this.sequenceDefinition.field2208 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30 DynamicObject var10 = (DynamicObject)var9; // L: 31 if (this.sequenceDefinition == var10.sequenceDefinition) { // L: 32 this.frame = var10.frame; // L: 33 @@ -99,17 +91,17 @@ public class DynamicObject extends Renderable { this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length); // L: 40 this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]); // L: 41 } else { - this.frame = (int)(Math.random() * (double)this.sequenceDefinition.method3844()); // L: 44 + this.frame = (int)(Math.random() * (double)this.sequenceDefinition.method3729()); // L: 44 } } } } // L: 48 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)Liq;", - garbageValue = "103" + descriptor = "(I)Lhv;", + garbageValue = "-238822980" ) @Export("getModel") protected final Model getModel() { @@ -121,7 +113,7 @@ public class DynamicObject extends Renderable { } if (this.sequenceDefinition.isCachedModelIdSet()) { // L: 54 - var2 = this.sequenceDefinition.method3844(); // L: 68 + var2 = this.sequenceDefinition.method3729(); // L: 68 this.frame += var1; // L: 69 var1 = 0; // L: 70 if (this.frame >= var2) { // L: 71 @@ -131,11 +123,11 @@ public class DynamicObject extends Renderable { } } } else { - label79: { + label81: { do { do { if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 55 - break label79; + break label81; } var1 -= this.sequenceDefinition.frameLengths[this.frame]; // L: 56 @@ -152,9 +144,9 @@ public class DynamicObject extends Renderable { this.cycleStart = Client.cycle - var1; // L: 78 } - ObjectComposition var12 = class146.getObjectDefinition(this.id); // L: 80 - if (var12.transforms != null) { - var12 = var12.transform(); // L: 81 + ObjectComposition var12 = class82.getObjectDefinition(this.id); // L: 80 + if (var12.transforms != null) { // L: 81 + var12 = var12.transform(); } if (var12 == null) { // L: 82 @@ -181,45 +173,432 @@ public class DynamicObject extends Renderable { } } - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "57" + descriptor = "(IIII)I", + garbageValue = "-1327477180" ) - static void method2003() { - Login.Login_username = Login.Login_username.trim(); // L: 1152 - if (Login.Login_username.length() == 0) { // L: 1153 - class4.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 1154 + public static int method1957(int var0, int var1, int var2) { + int var3 = class147.method3000(var2 - var1 + 1); // L: 62 + var3 <<= var1; // L: 63 + return var0 & ~var3; // L: 64 + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(ILbb;ZI)I", + garbageValue = "2018004509" + ) + static int method1963(int var0, Script var1, boolean var2) { + String var7; + if (var0 == ScriptOpcodes.MES) { // L: 1470 + var7 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1471 + WorldMapEvent.addGameMessage(0, "", var7); // L: 1472 + return 1; // L: 1473 + } else if (var0 == ScriptOpcodes.ANIM) { + class12.Interpreter_intStackSize -= 2; // L: 1476 + JagexCache.performPlayerAnimation(ModelData0.localPlayer, Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]); // L: 1477 + return 1; // L: 1478 + } else if (var0 == ScriptOpcodes.IF_CLOSE) { + if (!Interpreter.field833) { // L: 1481 + Interpreter.field835 = true; // L: 1482 + } + + return 1; // L: 1484 } else { - long var1 = World.method1678(); // L: 1158 - int var0; - if (0L == var1) { // L: 1159 - var0 = 5; + int var15; + if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1487 + var15 = 0; // L: 1488 + if (NetFileRequest.isNumber(var7)) { // L: 1489 + var15 = class92.method2373(var7); + } + + PacketBufferNode var13 = WallDecoration.getPacketBufferNode(ClientPacket.field2972, Client.packetWriter.isaacCipher); // L: 1491 + var13.packetBuffer.writeInt(var15); // L: 1492 + Client.packetWriter.addNode(var13); // L: 1493 + return 1; // L: 1494 } else { - var0 = WorldMapSectionType.method4312(var1, Login.Login_username); // L: 1160 - } + PacketBufferNode var11; + if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1497 + var11 = WallDecoration.getPacketBufferNode(ClientPacket.field3048, Client.packetWriter.isaacCipher); // L: 1499 + var11.packetBuffer.writeByte(var7.length() + 1); // L: 1500 + var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1501 + Client.packetWriter.addNode(var11); // L: 1502 + return 1; // L: 1503 + } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1506 + var11 = WallDecoration.getPacketBufferNode(ClientPacket.field3033, Client.packetWriter.isaacCipher); // L: 1508 + var11.packetBuffer.writeByte(var7.length() + 1); // L: 1509 + var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1510 + Client.packetWriter.addNode(var11); // L: 1511 + return 1; // L: 1512 + } else { + String var4; + int var10; + if (var0 == ScriptOpcodes.OPPLAYER) { + var10 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1515 + var4 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1516 + method1964(var10, var4); // L: 1517 + return 1; // L: 1518 + } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { + class12.Interpreter_intStackSize -= 3; // L: 1521 + var10 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 1522 + var15 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 1523 + int var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 1524 + Widget var14 = class92.getWidget(var9); // L: 1525 + class10.clickWidget(var14, var10, var15); // L: 1526 + return 1; // L: 1527 + } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { + class12.Interpreter_intStackSize -= 2; // L: 1530 + var10 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 1531 + var15 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 1532 + Widget var12 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 1533 + class10.clickWidget(var12, var10, var15); // L: 1534 + return 1; // L: 1535 + } else if (var0 == ScriptOpcodes.MOUSECAM) { + Login.mouseCam = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1538 + return 1; // L: 1539 + } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class12.clientPreferences.method2222() ? 1 : 0; // L: 1542 + return 1; // L: 1543 + } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { + class12.clientPreferences.method2219(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1); // L: 1546 + return 1; // L: 1547 + } else if (var0 == ScriptOpcodes.OPENURL) { + var7 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1550 + boolean var8 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1551 + ScriptEvent.openURL(var7, var8, false); // L: 1552 + return 1; // L: 1553 + } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { + var10 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1556 + var11 = WallDecoration.getPacketBufferNode(ClientPacket.field3017, Client.packetWriter.isaacCipher); // L: 1558 + var11.packetBuffer.writeShort(var10); // L: 1559 + Client.packetWriter.addNode(var11); // L: 1560 + return 1; // L: 1561 + } else if (var0 == ScriptOpcodes.BUG_REPORT) { + var10 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1564 + class9.Interpreter_stringStackSize -= 2; // L: 1565 + var4 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize]; // L: 1566 + String var5 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize + 1]; // L: 1567 + if (var4.length() > 500) { // L: 1568 + return 1; + } else if (var5.length() > 500) { // L: 1569 + return 1; + } else { + PacketBufferNode var6 = WallDecoration.getPacketBufferNode(ClientPacket.field3044, Client.packetWriter.isaacCipher); // L: 1570 + var6.packetBuffer.writeShort(1 + class392.stringCp1252NullTerminatedByteSize(var4) + class392.stringCp1252NullTerminatedByteSize(var5)); // L: 1571 + var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1572 + var6.packetBuffer.method7687(var10); // L: 1573 + var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1574 + Client.packetWriter.addNode(var6); // L: 1575 + return 1; // L: 1576 + } + } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { + Client.shiftClickDrop = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1579 + return 1; // L: 1580 + } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { + Client.showMouseOverText = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1583 + return 1; // L: 1584 + } else if (var0 == ScriptOpcodes.RENDERSELF) { + Client.renderSelf = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1587 + return 1; // L: 1588 + } else if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1) { // L: 1591 + Client.drawPlayerNames |= 1; + } else { + Client.drawPlayerNames &= -2; // L: 1592 + } - switch(var0) { // L: 1161 - case 2: - class4.setLoginResponseString(Strings.field3628, Strings.field3870, Strings.field3646); // L: 1169 - Ignored.method6828(6); // L: 1170 - break; // L: 1171 - case 3: - class4.setLoginResponseString("", "Error connecting to server.", ""); // L: 1173 - break; // L: 1174 - case 4: - class4.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 1166 - break; // L: 1167 - case 5: - class4.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 1163 - break; - case 6: - class4.setLoginResponseString("", "Error connecting to server.", ""); // L: 1179 - break; - case 7: - class4.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: 1176 - } + return 1; // L: 1593 + } else if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1) { // L: 1596 + Client.drawPlayerNames |= 2; + } else { + Client.drawPlayerNames &= -3; // L: 1597 + } + return 1; // L: 1598 + } else if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1) { // L: 1601 + Client.drawPlayerNames |= 4; + } else { + Client.drawPlayerNames &= -5; // L: 1602 + } + + return 1; // L: 1603 + } else if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1) { // L: 1606 + Client.drawPlayerNames |= 8; + } else { + Client.drawPlayerNames &= -9; // L: 1607 + } + + return 1; // L: 1608 + } else if (var0 == 3124) { + Client.drawPlayerNames = 0; // L: 1611 + return 1; // L: 1612 + } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { + Client.showMouseCross = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1615 + return 1; // L: 1616 + } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1619 + return 1; // L: 1620 + } else if (var0 == ScriptOpcodes.SETTAPTODROP) { + class33.setTapToDrop(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1); // L: 1623 + return 1; // L: 1624 + } else if (var0 == ScriptOpcodes.GETTAPTODROP) { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = WallDecoration.getTapToDrop() ? 1 : 0; // L: 1627 + return 1; // L: 1628 + } else if (var0 == 3129) { + class12.Interpreter_intStackSize -= 2; // L: 1631 + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 1632 + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 1633 + return 1; // L: 1634 + } else if (var0 == 3130) { + class12.Interpreter_intStackSize -= 2; // L: 1637 + return 1; // L: 1638 + } else if (var0 == 3131) { + --class12.Interpreter_intStackSize; // L: 1641 + return 1; // L: 1642 + } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = GraphicsObject.canvasWidth; // L: 1645 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class433.canvasHeight; // L: 1646 + return 1; // L: 1647 + } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { + --class12.Interpreter_intStackSize; // L: 1650 + return 1; // L: 1651 + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { + return 1; // L: 1654 + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { + class12.Interpreter_intStackSize -= 2; // L: 1657 + return 1; // L: 1658 + } else if (var0 == 3136) { + Client.field487 = 3; // L: 1661 + Client.field657 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1662 + return 1; // L: 1663 + } else if (var0 == 3137) { + Client.field487 = 2; // L: 1666 + Client.field657 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1667 + return 1; // L: 1668 + } else if (var0 == 3138) { + Client.field487 = 0; // L: 1671 + return 1; // L: 1672 + } else if (var0 == 3139) { + Client.field487 = 1; // L: 1675 + return 1; // L: 1676 + } else if (var0 == 3140) { + Client.field487 = 3; // L: 1679 + Client.field657 = var2 ? Interpreter.scriptDotWidget.id * 1115174973 * -203153643 : KeyHandler.scriptActiveWidget.id * 1115174973 * -203153643; // L: 1680 + return 1; // L: 1681 + } else { + boolean var3; + if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1684 + class12.clientPreferences.method2223(var3); // L: 1685 + return 1; // L: 1686 + } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class12.clientPreferences.method2257() ? 1 : 0; // L: 1689 + return 1; // L: 1690 + } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1693 + Client.Login_isUsernameRemembered = var3; // L: 1694 + if (!var3) { // L: 1695 + class12.clientPreferences.method2297(""); // L: 1696 + } + + return 1; // L: 1698 + } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1701 + return 1; // L: 1702 + } else if (var0 == ScriptOpcodes.SHOW_IOS_REVIEW) { + return 1; // L: 1705 + } else if (var0 == 3146) { + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1708 + class12.clientPreferences.method2305(!var3); // L: 1709 + return 1; // L: 1710 + } else if (var0 == 3147) { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class12.clientPreferences.method2226() ? 0 : 1; // L: 1713 + return 1; // L: 1714 + } else if (var0 == 3148) { + return 1; // L: 1717 + } else if (var0 == 3149) { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1720 + return 1; // L: 1721 + } else if (var0 == 3150) { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1724 + return 1; // L: 1725 + } else if (var0 == 3151) { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1728 + return 1; // L: 1729 + } else if (var0 == 3152) { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1732 + return 1; // L: 1733 + } else if (var0 == 3153) { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1736 + return 1; // L: 1737 + } else if (var0 == 3154) { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class136.method2868(); // L: 1740 + return 1; // L: 1741 + } else if (var0 == 3155) { + --class9.Interpreter_stringStackSize; // L: 1744 + return 1; // L: 1745 + } else if (var0 == 3156) { + return 1; // L: 1748 + } else if (var0 == 3157) { + class12.Interpreter_intStackSize -= 2; // L: 1751 + return 1; // L: 1752 + } else if (var0 == 3158) { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1755 + return 1; // L: 1756 + } else if (var0 == 3159) { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1759 + return 1; // L: 1760 + } else if (var0 == 3160) { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1763 + return 1; // L: 1764 + } else if (var0 == 3161) { + --class12.Interpreter_intStackSize; // L: 1767 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1768 + return 1; // L: 1769 + } else if (var0 == 3162) { + --class12.Interpreter_intStackSize; // L: 1772 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1773 + return 1; // L: 1774 + } else if (var0 == 3163) { + --class9.Interpreter_stringStackSize; // L: 1777 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1778 + return 1; // L: 1779 + } else if (var0 == 3164) { + --class12.Interpreter_intStackSize; // L: 1782 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1783 + return 1; // L: 1784 + } else if (var0 == 3165) { + --class12.Interpreter_intStackSize; // L: 1787 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1788 + return 1; // L: 1789 + } else if (var0 == 3166) { + class12.Interpreter_intStackSize -= 2; // L: 1792 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1793 + return 1; // L: 1794 + } else if (var0 == 3167) { + class12.Interpreter_intStackSize -= 2; // L: 1797 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1798 + return 1; // L: 1799 + } else if (var0 == 3168) { + class12.Interpreter_intStackSize -= 2; // L: 1802 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1803 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1804 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1805 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1806 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1807 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1808 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1809 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1810 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1811 + return 1; // L: 1812 + } else if (var0 == 3169) { + return 1; // L: 1815 + } else if (var0 == 3170) { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1818 + return 1; // L: 1819 + } else if (var0 == 3171) { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1822 + return 1; // L: 1823 + } else if (var0 == 3172) { + --class12.Interpreter_intStackSize; // L: 1826 + return 1; // L: 1827 + } else if (var0 == 3173) { + --class12.Interpreter_intStackSize; // L: 1830 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1831 + return 1; // L: 1832 + } else if (var0 == 3174) { + --class12.Interpreter_intStackSize; // L: 1835 + return 1; // L: 1836 + } else if (var0 == 3175) { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1839 + return 1; // L: 1840 + } else if (var0 == 3176) { + return 1; // L: 1843 + } else if (var0 == 3177) { + return 1; // L: 1846 + } else if (var0 == 3178) { + --class9.Interpreter_stringStackSize; // L: 1849 + return 1; // L: 1850 + } else if (var0 == 3179) { + return 1; // L: 1853 + } else if (var0 == 3180) { + --class9.Interpreter_stringStackSize; // L: 1856 + return 1; // L: 1857 + } else if (var0 == 3181) { + World.method1664(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1860 + return 1; // L: 1861 + } else if (var0 == 3182) { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = GameBuild.method5586(); // L: 1864 + return 1; // L: 1865 + } else if (var0 != 3183 && var0 != 3184) { + if (var0 == 3187) { + class9.Interpreter_stringStackSize -= 2; // L: 1872 + return 1; // L: 1873 + } else { + return var0 == 3188 ? 1 : 2; // L: 1876 1878 + } + } else { + --class12.Interpreter_intStackSize; // L: 1868 + return 1; // L: 1869 + } + } + } + } } - } // L: 1155 1182 + } + + @ObfuscatedName("ii") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;I)V", + garbageValue = "424896925" + ) + static void method1964(int var0, String var1) { + int var2 = Players.Players_count; // L: 9727 + int[] var3 = Players.Players_indices; // L: 9728 + boolean var4 = false; // L: 9729 + Username var5 = new Username(var1, class391.loginType); // L: 9730 + + for (int var6 = 0; var6 < var2; ++var6) { // L: 9731 + Player var7 = Client.players[var3[var6]]; // L: 9732 + if (var7 != null && var7 != ModelData0.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 9733 + PacketBufferNode var8; + if (var0 == 1) { // L: 9734 + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2965, Client.packetWriter.isaacCipher); // L: 9736 + var8.packetBuffer.writeShort(var3[var6]); // L: 9737 + var8.packetBuffer.method7687(0); // L: 9738 + Client.packetWriter.addNode(var8); // L: 9739 + } else if (var0 == 4) { // L: 9741 + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2962, Client.packetWriter.isaacCipher); // L: 9743 + var8.packetBuffer.writeByte(0); // L: 9744 + var8.packetBuffer.method7641(var3[var6]); // L: 9745 + Client.packetWriter.addNode(var8); // L: 9746 + } else if (var0 == 6) { // L: 9748 + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2969, Client.packetWriter.isaacCipher); // L: 9750 + var8.packetBuffer.method7641(var3[var6]); // L: 9751 + var8.packetBuffer.method7687(0); // L: 9752 + Client.packetWriter.addNode(var8); // L: 9753 + } else if (var0 == 7) { // L: 9755 + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2980, Client.packetWriter.isaacCipher); // L: 9757 + var8.packetBuffer.method7596(0); // L: 9758 + var8.packetBuffer.method7641(var3[var6]); // L: 9759 + Client.packetWriter.addNode(var8); // L: 9760 + } + + var4 = true; // L: 9762 + break; + } + } + + if (!var4) { // L: 9766 + WorldMapEvent.addGameMessage(4, "", "Unable to find " + var1); + } + + } // L: 9767 } diff --git a/runescape-client/src/main/java/EnumComposition.java b/runescape-client/src/main/java/EnumComposition.java index 32bc0be8e4..fea85d7788 100644 --- a/runescape-client/src/main/java/EnumComposition.java +++ b/runescape-client/src/main/java/EnumComposition.java @@ -4,49 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fs") +@ObfuscatedName("fc") @Implements("EnumComposition") public class EnumComposition extends DualNode { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("EnumDefinition_archive") - static AbstractArchive EnumDefinition_archive; - @ObfuscatedName("c") + public static AbstractArchive EnumDefinition_archive; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("inputType") public char inputType; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("outputType") public char outputType; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1966559045 + intValue = -1422398085 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1434238149 + intValue = -1977259169 ) @Export("outputCount") public int outputCount; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("keys") public int[] keys; - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("intVals") public int[] intVals; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("strVals") public String[] strVals; @@ -59,85 +59,108 @@ public class EnumComposition extends DualNode { this.outputCount = 0; // L: 17 } // L: 22 - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-91" + descriptor = "(Lpx;B)V", + garbageValue = "2" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 40 - if (var2 == 0) { // L: 41 - return; // L: 44 + int var2 = var1.readUnsignedByte(); // L: 36 + if (var2 == 0) { // L: 37 + return; // L: 40 } - this.decodeNext(var1, var2); // L: 42 + this.decodeNext(var1, var2); // L: 38 } } - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-2119565699" + descriptor = "(Lpx;II)V", + garbageValue = "2123865922" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 47 + if (var2 == 1) { // L: 43 this.inputType = (char)var1.readUnsignedByte(); - } else if (var2 == 2) { // L: 48 + } else if (var2 == 2) { // L: 44 this.outputType = (char)var1.readUnsignedByte(); - } else if (var2 == 3) { // L: 49 + } else if (var2 == 3) { // L: 45 this.defaultStr = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { // L: 50 + } else if (var2 == 4) { // L: 46 this.defaultInt = var1.readInt(); } else { int var3; - if (var2 == 5) { // L: 51 - this.outputCount = var1.readUnsignedShort(); // L: 52 - this.keys = new int[this.outputCount]; // L: 53 - this.strVals = new String[this.outputCount]; // L: 54 + if (var2 == 5) { // L: 47 + this.outputCount = var1.readUnsignedShort(); // L: 48 + this.keys = new int[this.outputCount]; // L: 49 + this.strVals = new String[this.outputCount]; // L: 50 - for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 55 - this.keys[var3] = var1.readInt(); // L: 56 - this.strVals[var3] = var1.readStringCp1252NullTerminated(); // L: 57 + for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 51 + this.keys[var3] = var1.readInt(); // L: 52 + this.strVals[var3] = var1.readStringCp1252NullTerminated(); // L: 53 } - } else if (var2 == 6) { // L: 60 - this.outputCount = var1.readUnsignedShort(); // L: 61 - this.keys = new int[this.outputCount]; // L: 62 - this.intVals = new int[this.outputCount]; // L: 63 + } else if (var2 == 6) { // L: 56 + this.outputCount = var1.readUnsignedShort(); // L: 57 + this.keys = new int[this.outputCount]; // L: 58 + this.intVals = new int[this.outputCount]; // L: 59 - for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 64 - this.keys[var3] = var1.readInt(); // L: 65 - this.intVals[var3] = var1.readInt(); // L: 66 + for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 60 + this.keys[var3] = var1.readInt(); // L: 61 + this.intVals[var3] = var1.readInt(); // L: 62 } } } - } // L: 70 + } // L: 66 - @ObfuscatedName("b") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" + descriptor = "(I)I", + garbageValue = "1493000853" ) @Export("size") public int size() { - return this.outputCount; // L: 73 + return this.outputCount; // L: 69 } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lky;IIII)V", - garbageValue = "-585894477" + descriptor = "([BIII)Ljava/lang/String;", + garbageValue = "2111850720" ) - @Export("Widget_setKeyRate") - static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { - if (var0.field3417 == null) { // L: 1012 - throw new RuntimeException(); // L: 1013 - } else { - var0.field3417[var1] = var2; // L: 1015 - var0.field3418[var1] = var3; // L: 1016 + @Export("decodeStringCp1252") + public static String decodeStringCp1252(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; // L: 82 + int var4 = 0; // L: 83 + + for (int var5 = 0; var5 < var2; ++var5) { // L: 84 + int var6 = var0[var5 + var1] & 255; // L: 85 + if (var6 != 0) { // L: 86 + if (var6 >= 128 && var6 < 160) { // L: 87 + char var7 = class341.cp1252AsciiExtension[var6 - 128]; // L: 88 + if (var7 == 0) { // L: 89 + var7 = '?'; + } + + var6 = var7; // L: 90 + } + + var3[var4++] = (char)var6; // L: 92 + } } - } // L: 1017 + + return new String(var3, 0, var4); // L: 94 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2023636787" + ) + public static void method3400() { + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 96 + } // L: 97 } diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index 6c205799a6..5fabda62b7 100644 --- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java +++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java @@ -3,30 +3,30 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ig") +@ObfuscatedName("ir") @Implements("EvictingDualNodeHashTable") public final class EvictingDualNodeHashTable { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) @Export("dualNode") DualNode dualNode; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("capacity") int capacity; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("remainingCapacity") int remainingCapacity; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lpt;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lmr;" + descriptor = "Lma;" ) @Export("deque") IterableDualNodeQueue deque; @@ -44,61 +44,61 @@ public final class EvictingDualNodeHashTable { this.hashTable = new IterableNodeHashTable(var2); // L: 19 } // L: 20 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(J)Loz;" + descriptor = "(J)Loq;" ) @Export("get") public DualNode get(long var1) { - DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 23 - if (var3 != null) { // L: 24 - this.deque.add(var3); // L: 25 + DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 24 + if (var3 != null) { // L: 25 + this.deque.add(var3); // L: 26 } - return var3; // L: 28 + return var3; // L: 29 } - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("remove") public void remove(long var1) { - DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 32 - if (var3 != null) { // L: 33 - var3.remove(); // L: 34 - var3.removeDual(); // L: 35 - ++this.remainingCapacity; // L: 36 + DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 33 + if (var3 != null) { // L: 34 + var3.remove(); // L: 35 + var3.removeDual(); // L: 36 + ++this.remainingCapacity; // L: 37 } - } // L: 38 + } // L: 39 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Loz;J)V" + descriptor = "(Loq;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.dualNode) { // L: 45 - var4 = this.deque.removeLast(); // L: 46 - var4.remove(); // L: 47 - var4.removeDual(); // L: 48 + if (this.remainingCapacity == 0) { // L: 42 + DualNode var4 = this.deque.removeLast(); // L: 43 + var4.remove(); // L: 44 + var4.removeDual(); // L: 45 + if (var4 == this.dualNode) { // L: 46 + var4 = this.deque.removeLast(); // L: 47 + var4.remove(); // L: 48 + var4.removeDual(); // L: 49 } } else { - --this.remainingCapacity; // L: 51 + --this.remainingCapacity; // L: 52 } - this.hashTable.put(var1, var2); // L: 52 - this.deque.add(var1); // L: 53 - } // L: 54 + this.hashTable.put(var1, var2); // L: 53 + this.deque.add(var1); // L: 54 + } // L: 55 - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("clear") public void clear() { - this.deque.clear(); // L: 57 - this.hashTable.clear(); // L: 58 - this.dualNode = new DualNode(); // L: 59 - this.remainingCapacity = this.capacity; // L: 60 - } // L: 61 + this.deque.clear(); // L: 58 + this.hashTable.clear(); // L: 59 + this.dualNode = new DualNode(); // L: 60 + this.remainingCapacity = this.capacity; // L: 61 + } // L: 62 } diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java index c0073a8526..f5fad0e5e9 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -2,34 +2,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; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ia") +@ObfuscatedName("gg") @Implements("FaceNormal") public class FaceNormal { - @ObfuscatedName("b") + @ObfuscatedName("jg") @ObfuscatedGetter( - intValue = -360796493 + intValue = 1186041129 ) - static int field2664; - @ObfuscatedName("v") + @Export("cameraZ") + static int cameraZ; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1964753239 + intValue = 1839266109 ) @Export("x") int x; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 538442569 + intValue = 475209611 ) @Export("y") int y; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 708188277 + intValue = 1225057041 ) @Export("z") int z; FaceNormal() { } // L: 8 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(ILbb;ZI)I", + garbageValue = "-1800924378" + ) + static int method4212(int var0, Script var1, boolean var2) { + Widget var7; + if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1269 + int var4; + if (var0 == ScriptOpcodes.CC_TRIGGEROP) { // L: 1286 + var7 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 1287 + var4 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1288 + if (var4 >= 1 && var4 <= 10) { // L: 1289 + class93 var8 = new class93(var4, var7.id, var7.childIndex, var7.itemId); // L: 1292 + Interpreter.field821.add(var8); // L: 1293 + return 1; // L: 1294 + } else { + throw new RuntimeException(); // L: 1290 + } + } else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { // L: 1296 + class12.Interpreter_intStackSize -= 3; // L: 1297 + int var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 1298 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 1299 + int var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 1300 + if (var5 >= 1 && var5 <= 10) { // L: 1301 + class93 var6 = new class93(var5, var3, var4, class92.getWidget(var3).itemId); // L: 1304 + Interpreter.field821.add(var6); // L: 1305 + return 1; // L: 1306 + } else { + throw new RuntimeException(); // L: 1302 + } + } else { + return 2; // L: 1308 + } + } else if (Interpreter.field823 >= 10) { // L: 1270 + throw new RuntimeException(); // L: 1271 + } else { + if (var0 >= 2000) { // L: 1274 + var7 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1275 + } else { + var7 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 1277 + } + + if (var7.onResize == null) { // L: 1278 + return 0; + } else { + ScriptEvent var9 = new ScriptEvent(); // L: 1279 + var9.widget = var7; // L: 1280 + var9.args = var7.onResize; // L: 1281 + var9.field1054 = Interpreter.field823 + 1; // L: 1282 + Client.scriptEvents.addFirst(var9); // L: 1283 + return 1; // L: 1284 + } + } + } } diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java index 9009f8dd69..59707a3b74 100644 --- a/runescape-client/src/main/java/FileSystem.java +++ b/runescape-client/src/main/java/FileSystem.java @@ -1,26 +1,144 @@ +import java.io.File; import java.util.Hashtable; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fm") +@ObfuscatedName("fg") @Implements("FileSystem") public class FileSystem { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("FileSystem_hasPermissions") static boolean FileSystem_hasPermissions; - @ObfuscatedName("i") + @ObfuscatedName("q") + @Export("FileSystem_cacheDir") + static File FileSystem_cacheDir; + @ObfuscatedName("l") @Export("FileSystem_cacheFiles") static Hashtable FileSystem_cacheFiles; + @ObfuscatedName("x") + @Export("ByteArrayPool_alternativeSizes") + static int[] ByteArrayPool_alternativeSizes; static { FileSystem_hasPermissions = false; // L: 7 FileSystem_cacheFiles = new Hashtable(16); } // L: 9 - @ObfuscatedName("b") - @Export("Entity_unpackID") - public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 4294967295L); // L: 65 + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IB)Lgl;", + garbageValue = "75" + ) + @Export("ItemDefinition_get") + public static ItemComposition ItemDefinition_get(int var0) { + ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); // L: 84 + if (var1 != null) { // L: 85 + return var1; + } else { + byte[] var2 = ItemComposition.ItemDefinition_archive.takeFile(10, var0); // L: 86 + var1 = new ItemComposition(); // L: 87 + var1.id = var0; // L: 88 + if (var2 != null) { // L: 89 + var1.decode(new Buffer(var2)); + } + + var1.post(); // L: 90 + if (var1.noteTemplate != -1) { // L: 91 + var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); + } + + if (var1.notedId != -1) { // L: 92 + var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); + } + + if (var1.placeholderTemplate != -1) { // L: 93 + var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); + } + + if (!class82.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 94 + var1.name = "Members object"; // L: 95 + var1.isTradable = false; // L: 96 + + int var3; + for (var3 = 0; var3 < var1.groundActions.length; ++var3) { // L: 97 + var1.groundActions[var3] = null; // L: 98 + } + + for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { // L: 100 + if (var3 != 4) { // L: 101 + var1.inventoryActions[var3] = null; // L: 102 + } + } + + var1.shiftClickIndex = -2; // L: 105 + var1.team = 0; // L: 106 + if (var1.params != null) { // L: 107 + boolean var6 = false; // L: 108 + + for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 109 + ParamComposition var5 = class78.getParamDefinition((int)var4.key); // L: 110 + if (var5.autoDisable) { // L: 111 + var4.remove(); + } else { + var6 = true; // L: 112 + } + } + + if (!var6) { // L: 114 + var1.params = null; + } + } + } + + ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 117 + return var1; // L: 118 + } } + + @ObfuscatedName("jf") + @ObfuscatedSignature( + descriptor = "(Lki;IIIIIIB)V", + garbageValue = "-43" + ) + static final void method3168(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Client.field559) { // L: 10831 + Client.alternativeScrollbarWidth = 32; + } else { + Client.alternativeScrollbarWidth = 0; // L: 10832 + } + + Client.field559 = false; // L: 10833 + int var7; + if (MouseHandler.MouseHandler_currentButton == 1 || !Login.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 10834 + if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 10835 + var0.scrollY -= 4; // L: 10836 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var0); // L: 10837 + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 10839 + var0.scrollY += 4; // L: 10840 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var0); // L: 10841 + } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 10843 + var7 = var3 * (var3 - 32) / var4; // L: 10844 + if (var7 < 8) { // L: 10845 + var7 = 8; + } + + int var8 = var6 - var2 - 16 - var7 / 2; // L: 10846 + int var9 = var3 - 32 - var7; // L: 10847 + var0.scrollY = var8 * (var4 - var3) / var9; // L: 10848 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var0); // L: 10849 + Client.field559 = true; // L: 10850 + } + } + + if (Client.mouseWheelRotation != 0) { // L: 10853 + var7 = var0.width; // L: 10854 + if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 10855 + var0.scrollY += Client.mouseWheelRotation * 45; // L: 10856 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var0); // L: 10857 + } + } + + } // L: 10860 } diff --git a/runescape-client/src/main/java/FillMode.java b/runescape-client/src/main/java/FillMode.java index e6271c05a4..a64af0aa6c 100644 --- a/runescape-client/src/main/java/FillMode.java +++ b/runescape-client/src/main/java/FillMode.java @@ -4,49 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qe") +@ObfuscatedName("qw") @Implements("FillMode") public enum FillMode implements MouseWheel { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lqe;" + descriptor = "Lqw;" ) @Export("SOLID") SOLID(0, 0), - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lqe;" + descriptor = "Lqw;" ) - field4695(1, 1), - @ObfuscatedName("i") + field4754(1, 1), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lqe;" + descriptor = "Lqw;" ) - field4694(2, 2); + field4753(2, 2); - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1363476013 + intValue = 1271749217 ) - public final int field4699; - @ObfuscatedName("b") + public final int field4756; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -2111018979 + intValue = 1401042551 ) - final int field4698; + final int field4757; FillMode(int var3, int var4) { - this.field4699 = var3; // L: 19 - this.field4698 = var4; // L: 20 + this.field4756 = var3; // L: 19 + this.field4757 = var4; // L: 20 } // L: 21 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4698; // L: 24 + return this.field4757; // L: 25 } } diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index 6fb84b5db0..c23810fa27 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -4,168 +4,46 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hp") +@ObfuscatedName("ga") @Implements("FloorDecoration") public final class FloorDecoration { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 330018341 + intValue = -1072704917 ) @Export("z") int z; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1177773149 + intValue = 1879154845 ) @Export("x") int x; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 541305317 + intValue = -514738537 ) @Export("y") int y; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Lgx;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - longValue = 1757180845189134269L + longValue = 7063129096182387665L ) @Export("tag") public long tag; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1754694829 + intValue = 43519557 ) @Export("flags") int flags; FloorDecoration() { } // L: 11 - - @ObfuscatedName("i") - public static int method4592(long var0) { - return (int)(var0 >>> 14 & 3L); // L: 57 - } - - @ObfuscatedName("hx") - @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "718192951" - ) - static final void method4591(int var0, int var1, boolean var2) { - if (!var2 || var0 != ScriptEvent.field1042 || KitDefinition.field1855 != var1) { // L: 5544 - ScriptEvent.field1042 = var0; // L: 5547 - KitDefinition.field1855 = var1; // L: 5548 - Decimator.updateGameState(25); // L: 5549 - MusicPatch.drawLoadingMessage("Loading - please wait.", true); // L: 5550 - int var3 = GrandExchangeOfferOwnWorldComparator.baseX; // L: 5551 - int var4 = VarcInt.baseY; // L: 5552 - GrandExchangeOfferOwnWorldComparator.baseX = (var0 - 6) * 8; // L: 5553 - VarcInt.baseY = (var1 - 6) * 8; // L: 5554 - int var5 = GrandExchangeOfferOwnWorldComparator.baseX - var3; // L: 5555 - int var6 = VarcInt.baseY - var4; // L: 5556 - var3 = GrandExchangeOfferOwnWorldComparator.baseX; // L: 5557 - var4 = VarcInt.baseY; // L: 5558 - - int var7; - int var9; - int[] var10000; - for (var7 = 0; var7 < 32768; ++var7) { // L: 5559 - NPC var19 = Client.npcs[var7]; // L: 5560 - if (var19 != null) { // L: 5561 - for (var9 = 0; var9 < 10; ++var9) { // L: 5562 - var10000 = var19.pathX; // L: 5563 - var10000[var9] -= var5; - var10000 = var19.pathY; // L: 5564 - var10000[var9] -= var6; - } - - var19.x -= var5 * 128; // L: 5566 - var19.y -= var6 * 128; // L: 5567 - } - } - - for (var7 = 0; var7 < 2048; ++var7) { // L: 5570 - Player var22 = Client.players[var7]; // L: 5571 - if (var22 != null) { // L: 5572 - for (var9 = 0; var9 < 10; ++var9) { // L: 5573 - var10000 = var22.pathX; // L: 5574 - var10000[var9] -= var5; - var10000 = var22.pathY; // L: 5575 - var10000[var9] -= var6; - } - - var22.x -= var5 * 128; // L: 5577 - var22.y -= var6 * 128; // L: 5578 - } - } - - byte var20 = 0; // L: 5581 - byte var8 = 104; // L: 5582 - byte var21 = 1; // L: 5583 - if (var5 < 0) { // L: 5584 - var20 = 103; // L: 5585 - var8 = -1; // L: 5586 - var21 = -1; // L: 5587 - } - - byte var10 = 0; // L: 5589 - byte var11 = 104; // L: 5590 - byte var12 = 1; // L: 5591 - if (var6 < 0) { // L: 5592 - var10 = 103; // L: 5593 - var11 = -1; // L: 5594 - var12 = -1; // L: 5595 - } - - int var14; - for (int var13 = var20; var13 != var8; var13 += var21) { // L: 5597 - for (var14 = var10; var11 != var14; var14 += var12) { // L: 5598 - int var15 = var5 + var13; // L: 5599 - int var16 = var14 + var6; // L: 5600 - - for (int var17 = 0; var17 < 4; ++var17) { // L: 5601 - if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { - Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 5602 - } else { - Client.groundItems[var17][var13][var14] = null; // L: 5603 - } - } - } - } - - for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5607 5608 5612 - var18.x -= var5; // L: 5609 - var18.y -= var6; // L: 5610 - if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 5611 - var18.remove(); - } - } - - if (Client.destinationX != 0) { // L: 5614 - Client.destinationX -= var5; // L: 5615 - Client.destinationY -= var6; // L: 5616 - } - - Client.soundEffectCount = 0; // L: 5618 - Client.isCameraLocked = false; // L: 5619 - WorldMapLabelSize.cameraX -= var5 << 7; // L: 5620 - class154.cameraZ -= var6 << 7; // L: 5621 - class10.oculusOrbFocalPointX -= var5 << 7; // L: 5622 - ClientPacket.oculusOrbFocalPointY -= var6 << 7; // L: 5623 - Client.field714 = -1; // L: 5624 - Client.graphicsObjects.clear(); // L: 5625 - Client.projectiles.clear(); // L: 5626 - - for (var14 = 0; var14 < 4; ++var14) { // L: 5627 - Client.collisionMaps[var14].clear(); - } - - } - } // L: 5545 5628 } diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index 2179a1a805..b6d08f6719 100644 --- a/runescape-client/src/main/java/FloorOverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -1,84 +1,78 @@ -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("gc") +@ObfuscatedName("gi") @Implements("FloorOverlayDefinition") public class FloorOverlayDefinition extends DualNode { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("FloorOverlayDefinition_archive") public static AbstractArchive FloorOverlayDefinition_archive; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("FloorOverlayDefinition_cached") public static EvictingDualNodeHashTable FloorOverlayDefinition_cached; - @ObfuscatedName("u") - @Export("ByteArrayPool_alternativeSizes") - static int[] ByteArrayPool_alternativeSizes; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 858309139 + intValue = 789415847 ) @Export("primaryRgb") public int primaryRgb; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -297032293 + intValue = -1583015683 ) @Export("texture") public int texture; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("hideUnderlay") public boolean hideUnderlay; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 183406227 + intValue = 84531747 ) @Export("secondaryRgb") public int secondaryRgb; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -769091361 + intValue = 416276119 ) @Export("hue") public int hue; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1068550667 + intValue = 334853597 ) @Export("saturation") public int saturation; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 539781723 + intValue = -1974079687 ) @Export("lightness") public int lightness; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1744203063 + intValue = 247371203 ) @Export("secondaryHue") public int secondaryHue; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1545602265 + intValue = -1197955665 ) @Export("secondarySaturation") public int secondarySaturation; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 658215089 + intValue = 845891437 ) @Export("secondaryLightness") public int secondaryLightness; @@ -87,251 +81,186 @@ public class FloorOverlayDefinition extends DualNode { FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 } - FloorOverlayDefinition() { + public FloorOverlayDefinition() { this.primaryRgb = 0; // L: 12 this.texture = -1; // L: 13 this.hideUnderlay = true; // L: 14 this.secondaryRgb = -1; // L: 15 - } // L: 23 + } - @ObfuscatedName("c") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1367888420" + garbageValue = "462057937" ) @Export("postDecode") - void postDecode() { - if (this.secondaryRgb != -1) { // L: 37 - this.setHsl(this.secondaryRgb); // L: 38 - this.secondaryHue = this.hue; // L: 39 - this.secondarySaturation = this.saturation; - this.secondaryLightness = this.lightness; + public void postDecode() { + if (this.secondaryRgb != -1) { // L: 39 + this.setHsl(this.secondaryRgb); // L: 40 + this.secondaryHue = this.hue; // L: 41 + this.secondarySaturation = this.saturation; // L: 42 + this.secondaryLightness = this.lightness; // L: 43 } - this.setHsl(this.primaryRgb); - } // L: 44 + this.setHsl(this.primaryRgb); // L: 45 + } // L: 46 - @ObfuscatedName("i") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "1515870395" + descriptor = "(Lpx;IB)V", + garbageValue = "125" ) @Export("decode") - void decode(Buffer var1, int var2) { + public void decode(Buffer var1, int var2) { while (true) { - int var3 = var1.readUnsignedByte(); - if (var3 == 0) { // L: 49 - return; // L: 52 + int var3 = var1.readUnsignedByte(); // L: 50 + if (var3 == 0) { // L: 51 + return; // L: 54 } - this.decodeNext(var1, var3, var2); + this.decodeNext(var1, var3, var2); // L: 52 } } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lpi;III)V", - garbageValue = "-343485551" + descriptor = "(Lpx;IIB)V", + garbageValue = "104" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { - if (var2 == 1) { + if (var2 == 1) { // L: 57 this.primaryRgb = var1.readMedium(); - } else if (var2 == 2) { + } else if (var2 == 2) { // L: 58 this.texture = var1.readUnsignedByte(); - } else if (var2 == 5) { // L: 57 + } else if (var2 == 5) { // L: 59 this.hideUnderlay = false; } else if (var2 == 7) { - this.secondaryRgb = var1.readMedium(); // L: 58 - } else if (var2 == 8) { + this.secondaryRgb = var1.readMedium(); // L: 60 + } else if (var2 == 8) { // L: 61 } - } + } // L: 63 - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1828314979" + garbageValue = "-451287005" ) @Export("setHsl") void setHsl(int var1) { - double var2 = (double)(var1 >> 16 & 255) / 256.0D; - double var4 = (double)(var1 >> 8 & 255) / 256.0D; - double var6 = (double)(var1 & 255) / 256.0D; - double var8 = var2; - if (var4 < var2) { + double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 66 + double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 67 + double var6 = (double)(var1 & 255) / 256.0D; // L: 68 + double var8 = var2; // L: 69 + if (var4 < var2) { // L: 70 var8 = var4; } - if (var6 < var8) { + if (var6 < var8) { // L: 71 var8 = var6; } - double var10 = var2; - if (var4 > var2) { + double var10 = var2; // L: 72 + if (var4 > var2) { // L: 73 var10 = var4; } - if (var6 > var10) { // L: 72 + if (var6 > var10) { // L: 74 var10 = var6; } - double var12 = 0.0D; - double var14 = 0.0D; - double var16 = (var8 + var10) / 2.0D; - if (var8 != var10) { // L: 76 - if (var16 < 0.5D) { + double var12 = 0.0D; // L: 75 + double var14 = 0.0D; // L: 76 + double var16 = (var10 + var8) / 2.0D; // L: 77 + if (var8 != var10) { // L: 78 + if (var16 < 0.5D) { // L: 79 var14 = (var10 - var8) / (var8 + var10); } - if (var16 >= 0.5D) { // L: 78 + if (var16 >= 0.5D) { // L: 80 var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var10 == var2) { // L: 79 + if (var2 == var10) { // L: 81 var12 = (var4 - var6) / (var10 - var8); - } else if (var10 == var4) { // L: 80 - var12 = 2.0D + (var6 - var2) / (var10 - var8); - } else if (var10 == var6) { - var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 81 + } else if (var10 == var4) { // L: 82 + var12 = (var6 - var2) / (var10 - var8) + 2.0D; + } else if (var6 == var10) { + var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 83 } } - var12 /= 6.0D; // L: 83 - this.hue = (int)(var12 * 256.0D); - this.saturation = (int)(256.0D * var14); // L: 85 - this.lightness = (int)(256.0D * var16); // L: 86 - if (this.saturation < 0) { + var12 /= 6.0D; // L: 85 + this.hue = (int)(var12 * 256.0D); // L: 86 + this.saturation = (int)(256.0D * var14); // L: 87 + this.lightness = (int)(256.0D * var16); // L: 88 + if (this.saturation < 0) { // L: 89 this.saturation = 0; - } else if (this.saturation > 255) { + } else if (this.saturation > 255) { // L: 90 this.saturation = 255; } - if (this.lightness < 0) { + if (this.lightness < 0) { // L: 91 this.lightness = 0; - } else if (this.lightness > 255) { // L: 90 + } else if (this.lightness > 255) { // L: 92 this.lightness = 255; } - } // L: 91 + } // L: 93 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIB)V", - garbageValue = "55" + descriptor = "(I)Ljm;", + garbageValue = "2018260435" ) - public static void method3788(String var0, String var1, int var2, int var3) throws IOException { - JagexCache.idxCount = var3; // L: 40 - WorldMapSection1.cacheGamebuild = var2; // L: 41 + static PacketBufferNode method3700() { + return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 22 23 + } - try { - class10.operatingSystemName = System.getProperty("os.name"); // L: 43 - } catch (Exception var15) { // L: 45 - class10.operatingSystemName = "Unknown"; // L: 46 + @ObfuscatedName("jb") + @ObfuscatedSignature( + descriptor = "(Lki;IIZB)V", + garbageValue = "60" + ) + @Export("alignWidgetSize") + static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { + int var4 = var0.width; // L: 10796 + int var5 = var0.height; // L: 10797 + if (var0.widthAlignment == 0) { // L: 10798 + var0.width = var0.rawWidth; + } else if (var0.widthAlignment == 1) { // L: 10799 + var0.width = var1 - var0.rawWidth; + } else if (var0.widthAlignment == 2) { // L: 10800 + var0.width = var0.rawWidth * var1 >> 14; } - class128.formattedOperatingSystemName = class10.operatingSystemName.toLowerCase(); // L: 48 - - try { - NetSocket.userHomeDirectory = System.getProperty("user.home"); // L: 50 - if (NetSocket.userHomeDirectory != null) { // L: 51 - NetSocket.userHomeDirectory = NetSocket.userHomeDirectory + "/"; - } - } catch (Exception var14) { // L: 53 + if (var0.heightAlignment == 0) { // L: 10801 + var0.height = var0.rawHeight; + } else if (var0.heightAlignment == 1) { // L: 10802 + var0.height = var2 - var0.rawHeight; + } else if (var0.heightAlignment == 2) { + var0.height = var2 * var0.rawHeight >> 14; // L: 10803 } - try { - if (class128.formattedOperatingSystemName.startsWith("win")) { // L: 55 - if (NetSocket.userHomeDirectory == null) { // L: 56 - NetSocket.userHomeDirectory = System.getenv("USERPROFILE"); - } - } else if (NetSocket.userHomeDirectory == null) { // L: 59 - NetSocket.userHomeDirectory = System.getenv("HOME"); - } - - if (NetSocket.userHomeDirectory != null) { // L: 61 - NetSocket.userHomeDirectory = NetSocket.userHomeDirectory + "/"; - } - } catch (Exception var13) { // L: 63 + if (var0.widthAlignment == 4) { // L: 10804 + var0.width = var0.height * var0.field3411 / var0.field3494; } - if (NetSocket.userHomeDirectory == null) { // L: 64 - NetSocket.userHomeDirectory = "~/"; + if (var0.heightAlignment == 4) { // L: 10805 + var0.height = var0.field3494 * var0.width / var0.field3411; } - ItemContainer.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", NetSocket.userHomeDirectory, "/tmp/", ""}; // L: 65 - class216.cacheSubPaths = new String[]{".jagex_cache_" + WorldMapSection1.cacheGamebuild, ".file_store_" + WorldMapSection1.cacheGamebuild}; // L: 66 - int var9 = 0; - - label128: - while (var9 < 4) { - JagexCache.cacheDir = WorldMapArea.method4036(var0, var1, var9); // L: 68 - if (!JagexCache.cacheDir.exists()) { // L: 69 - JagexCache.cacheDir.mkdirs(); - } - - File[] var5 = JagexCache.cacheDir.listFiles(); // L: 70 - if (var5 == null) { // L: 71 - break; - } - - File[] var6 = var5; // L: 73 - int var7 = 0; - - while (true) { - if (var7 >= var6.length) { - break label128; - } - - File var8 = var6[var7]; // L: 75 - if (!AbstractWorldMapIcon.method4405(var8, false)) { // L: 77 - ++var9; // L: 67 - break; - } - - ++var7; // L: 74 - } + if (var0.contentType == 1337) { // L: 10806 + Client.viewportWidget = var0; } - class128.method2856(JagexCache.cacheDir); // L: 84 - - try { - File var4 = new File(NetSocket.userHomeDirectory, "random.dat"); // L: 87 - int var11; - if (var4.exists()) { // L: 88 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var4, "rw", 25L), 24, 0); // L: 89 - } else { - label110: - for (int var10 = 0; var10 < class216.cacheSubPaths.length; ++var10) { // L: 92 - for (var11 = 0; var11 < ItemContainer.cacheParentPaths.length; ++var11) { // L: 93 - File var12 = new File(ItemContainer.cacheParentPaths[var11] + class216.cacheSubPaths[var10] + File.separatorChar + "random.dat"); // L: 94 - if (var12.exists()) { // L: 95 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var12, "rw", 25L), 24, 0); // L: 96 - break label110; // L: 97 - } - } - } - } - - if (JagexCache.JagexCache_randomDat == null) { // L: 102 - RandomAccessFile var17 = new RandomAccessFile(var4, "rw"); // L: 103 - var11 = var17.read(); // L: 104 - var17.seek(0L); // L: 105 - var17.write(var11); // L: 106 - var17.seek(0L); // L: 107 - var17.close(); // L: 108 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var4, "rw", 25L), 24, 0); // L: 109 - } - } catch (IOException var16) { // L: 112 + if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 10807 + ScriptEvent var6 = new ScriptEvent(); // L: 10808 + var6.widget = var0; // L: 10809 + var6.args = var0.onResize; // L: 10810 + Client.scriptEvents.addFirst(var6); // L: 10811 } - JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(Message.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 114 - JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(Message.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 115 - class115.JagexCache_idxFiles = new BufferedFile[JagexCache.idxCount]; // L: 116 - - for (var9 = 0; var9 < JagexCache.idxCount; ++var9) { // L: 117 - class115.JagexCache_idxFiles[var9] = new BufferedFile(new AccessFile(Message.getFile("main_file_cache.idx" + var9), "rw", 1048576L), 6000, 0); // L: 118 - } - - } // L: 120 + } // L: 10813 } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index efb2ae2bc3..05dc82a77a 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -4,48 +4,57 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fk") +@ObfuscatedName("fa") @Implements("FloorUnderlayDefinition") public class FloorUnderlayDefinition extends DualNode { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("FloorUnderlayDefinition_archive") public static AbstractArchive FloorUnderlayDefinition_archive; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("FloorUnderlayDefinition_cached") static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; - @ObfuscatedName("i") + @ObfuscatedName("hn") + @Export("regionMapArchives") + static byte[][] regionMapArchives; + @ObfuscatedName("iz") @ObfuscatedGetter( - intValue = 2001140681 + intValue = -1688031679 + ) + @Export("selectedItemId") + static int selectedItemId; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1166691661 ) @Export("rgb") int rgb; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1442875069 + intValue = 1101049757 ) @Export("hue") public int hue; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1249056165 + intValue = 2015074227 ) @Export("saturation") public int saturation; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1727815031 + intValue = 1371638813 ) @Export("lightness") public int lightness; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 634259911 + intValue = -1786707103 ) @Export("hueMultiplier") public int hueMultiplier; @@ -58,20 +67,20 @@ public class FloorUnderlayDefinition extends DualNode { this.rgb = 0; // L: 12 } // L: 18 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1803560536" + descriptor = "(B)V", + garbageValue = "86" ) @Export("postDecode") void postDecode() { this.setHsl(this.rgb); // L: 32 } // L: 33 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "141274967" + descriptor = "(Lpx;II)V", + garbageValue = "-1229195714" ) @Export("decode") void decode(Buffer var1, int var2) { @@ -85,10 +94,10 @@ public class FloorUnderlayDefinition extends DualNode { } } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lpi;III)V", - garbageValue = "-606456868" + descriptor = "(Lpx;III)V", + garbageValue = "1871549003" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -98,10 +107,10 @@ public class FloorUnderlayDefinition extends DualNode { } // L: 46 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "15" + garbageValue = "118" ) @Export("setHsl") void setHsl(int var1) { @@ -128,10 +137,10 @@ public class FloorUnderlayDefinition extends DualNode { double var12 = 0.0D; // L: 58 double var14 = 0.0D; // L: 59 - double var16 = (var8 + var10) / 2.0D; // L: 60 + double var16 = (var10 + var8) / 2.0D; // L: 60 if (var8 != var10) { // L: 61 if (var16 < 0.5D) { // L: 62 - var14 = (var10 - var8) / (var10 + var8); + var14 = (var10 - var8) / (var8 + var10); } if (var16 >= 0.5D) { // L: 63 @@ -142,14 +151,14 @@ public class FloorUnderlayDefinition extends DualNode { var12 = (var4 - var6) / (var10 - var8); } else if (var10 == var4) { // L: 65 var12 = (var6 - var2) / (var10 - var8) + 2.0D; - } else if (var10 == var6) { + } else if (var6 == var10) { var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 66 } } var12 /= 6.0D; // L: 68 this.saturation = (int)(var14 * 256.0D); // L: 69 - this.lightness = (int)(var16 * 256.0D); // L: 70 + this.lightness = (int)(256.0D * var16); // L: 70 if (this.saturation < 0) { // L: 71 this.saturation = 0; } else if (this.saturation > 255) { // L: 72 @@ -163,15 +172,131 @@ public class FloorUnderlayDefinition extends DualNode { } if (var16 > 0.5D) { // L: 75 - this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D); + this.hueMultiplier = (int)(512.0D * (1.0D - var16) * var14); } else { - this.hueMultiplier = (int)(var14 * var16 * 512.0D); // L: 76 + this.hueMultiplier = (int)(512.0D * var16 * var14); // L: 76 } if (this.hueMultiplier < 1) { // L: 77 this.hueMultiplier = 1; } - this.hue = (int)((double)this.hueMultiplier * var12); // L: 78 + this.hue = (int)(var12 * (double)this.hueMultiplier); // L: 78 } // L: 79 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Lpc;II)Z", + garbageValue = "1224143507" + ) + @Export("updateExternalPlayer") + static boolean updateExternalPlayer(PacketBuffer var0, int var1) { + int var2 = var0.readBits(2); // L: 376 + int var3; + int var4; + int var7; + int var8; + int var9; + int var10; + if (var2 == 0) { // L: 377 + if (var0.readBits(1) != 0) { // L: 378 + updateExternalPlayer(var0, var1); + } + + var3 = var0.readBits(13); // L: 379 + var4 = var0.readBits(13); // L: 380 + boolean var12 = var0.readBits(1) == 1; // L: 381 + if (var12) { // L: 382 + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + if (Client.players[var1] != null) { // L: 383 + throw new RuntimeException(); // L: 384 + } else { + Player var11 = Client.players[var1] = new Player(); // L: 386 + var11.index = var1; // L: 387 + if (Players.field1307[var1] != null) { // L: 388 + var11.read(Players.field1307[var1]); + } + + var11.orientation = Players.Players_orientations[var1]; // L: 389 + var11.targetIndex = Players.Players_targetIndices[var1]; // L: 390 + var7 = Players.Players_regions[var1]; // L: 391 + var8 = var7 >> 28; // L: 392 + var9 = var7 >> 14 & 255; // L: 393 + var10 = var7 & 255; // L: 394 + var11.pathTraversed[0] = Players.field1302[var1]; // L: 395 + var11.plane = (byte)var8; // L: 396 + var11.resetPath((var9 << 13) + var3 - SecureRandomCallable.baseX, (var10 << 13) + var4 - GrandExchangeOfferOwnWorldComparator.baseY); // L: 397 + var11.field1095 = false; // L: 398 + return true; // L: 399 + } + } else if (var2 == 1) { // L: 401 + var3 = var0.readBits(2); // L: 402 + var4 = Players.Players_regions[var1]; // L: 403 + Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455); // L: 404 + return false; // L: 405 + } else { + int var5; + int var6; + if (var2 == 2) { // L: 407 + var3 = var0.readBits(5); // L: 408 + var4 = var3 >> 3; // L: 409 + var5 = var3 & 7; // L: 410 + var6 = Players.Players_regions[var1]; // L: 411 + var7 = (var6 >> 28) + var4 & 3; // L: 412 + var8 = var6 >> 14 & 255; // L: 413 + var9 = var6 & 255; // L: 414 + if (var5 == 0) { // L: 415 + --var8; // L: 416 + --var9; // L: 417 + } + + if (var5 == 1) { // L: 419 + --var9; + } + + if (var5 == 2) { // L: 420 + ++var8; // L: 421 + --var9; // L: 422 + } + + if (var5 == 3) { // L: 424 + --var8; + } + + if (var5 == 4) { // L: 425 + ++var8; + } + + if (var5 == 5) { // L: 426 + --var8; // L: 427 + ++var9; // L: 428 + } + + if (var5 == 6) { // L: 430 + ++var9; + } + + if (var5 == 7) { // L: 431 + ++var8; // L: 432 + ++var9; // L: 433 + } + + Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 435 + return false; // L: 436 + } else { + var3 = var0.readBits(18); // L: 438 + var4 = var3 >> 16; // L: 439 + var5 = var3 >> 8 & 255; // L: 440 + var6 = var3 & 255; // L: 441 + var7 = Players.Players_regions[var1]; // L: 442 + var8 = (var7 >> 28) + var4 & 3; // L: 443 + var9 = var5 + (var7 >> 14) & 255; // L: 444 + var10 = var7 + var6 & 255; // L: 445 + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 446 + return false; // L: 447 + } + } + } } diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index 308e3a16a9..600dbb2c40 100644 --- a/runescape-client/src/main/java/Font.java +++ b/runescape-client/src/main/java/Font.java @@ -2,7 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("md") +@ObfuscatedName("mx") @Implements("Font") public final class Font extends AbstractFont { public Font(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { @@ -13,7 +13,7 @@ public final class Font extends AbstractFont { super(var1); // L: 11 } // L: 12 - @ObfuscatedName("v") + @ObfuscatedName("o") @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 @@ -55,7 +55,7 @@ public final class Font extends AbstractFont { } } // L: 44 - @ObfuscatedName("c") + @ObfuscatedName("q") @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 diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 2ebce4d12e..1c6f9b2bb1 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -1,54 +1,61 @@ import 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("ow") +@ObfuscatedName("pi") @Implements("FontName") public class FontName { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpi;" ) @Export("FontName_plain11") public static final FontName FontName_plain11; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpi;" ) @Export("FontName_plain12") public static final FontName FontName_plain12; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpi;" ) @Export("FontName_bold12") public static final FontName FontName_bold12; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpi;" ) @Export("FontName_verdana11") public static final FontName FontName_verdana11; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpi;" ) @Export("FontName_verdana13") public static final FontName FontName_verdana13; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpi;" ) @Export("FontName_verdana15") public static final FontName FontName_verdana15; - @ObfuscatedName("ac") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lqu;" + descriptor = "Lek;" ) - @Export("rasterProvider") - public static AbstractRasterProvider rasterProvider; - @ObfuscatedName("s") + static ClanSettings field4583; + @ObfuscatedName("mm") + @ObfuscatedGetter( + intValue = 957028551 + ) + @Export("menuY") + static int menuY; + @ObfuscatedName("p") @Export("name") String name; @@ -62,47 +69,267 @@ public class FontName { } FontName(String var1) { - this.name = var1; // L: 16 - } // L: 17 + this.name = var1; // L: 20 + } // L: 21 - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-2021946113" + descriptor = "(II)V", + garbageValue = "2051101893" ) - static int method7415(int var0, int var1, int var2) { - if (var2 > 179) { // L: 84 - var1 /= 2; - } + static void method7230(int var0) { + } // L: 32 - if (var2 > 192) { // L: 85 - var1 /= 2; - } - - if (var2 > 217) { // L: 86 - var1 /= 2; - } - - if (var2 > 243) { // L: 87 - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 88 - return var3; // L: 89 + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)[Lpi;", + garbageValue = "-1328353728" + ) + public static FontName[] method7232() { + return new FontName[]{FontName_plain11, FontName_verdana13, FontName_bold12, FontName_verdana15, FontName_verdana11, FontName_plain12}; // L: 16 } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "-1556490427" + descriptor = "(IB)I", + garbageValue = "25" ) - public static int[] method7414() { - int[] var0 = new int[KeyHandler.field118]; // L: 251 + public static int method7228(int var0) { + --var0; // L: 75 + var0 |= var0 >>> 1; // L: 76 + var0 |= var0 >>> 2; // L: 77 + var0 |= var0 >>> 4; // L: 78 + var0 |= var0 >>> 8; // L: 79 + var0 |= var0 >>> 16; // L: 80 + return var0 + 1; // L: 81 + } - for (int var1 = 0; var1 < KeyHandler.field118; ++var1) { // L: 252 - var0[var1] = KeyHandler.field143[var1]; // L: 253 + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(ILbb;ZI)I", + garbageValue = "2124893336" + ) + static int method7231(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 3525 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 3526 + return 1; // L: 3527 + } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 3529 + class12.Interpreter_intStackSize -= 3; // L: 3530 + Client.publicChatMode = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3531 + class21.privateChatMode = class116.method2686(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]); // L: 3532 + if (class21.privateChatMode == null) { // L: 3533 + class21.privateChatMode = PrivateChatMode.field4794; + } + + Client.tradeChatMode = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 3534 + PacketBufferNode var13 = WallDecoration.getPacketBufferNode(ClientPacket.field3052, Client.packetWriter.isaacCipher); // L: 3536 + var13.packetBuffer.writeByte(Client.publicChatMode); // L: 3537 + var13.packetBuffer.writeByte(class21.privateChatMode.field4796); // L: 3538 + var13.packetBuffer.writeByte(Client.tradeChatMode); // L: 3539 + Client.packetWriter.addNode(var13); // L: 3540 + return 1; // L: 3541 + } else { + PacketBufferNode var6; + int var7; + String var8; + int var9; + if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 3543 + var8 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3544 + class12.Interpreter_intStackSize -= 2; // L: 3545 + var7 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3546 + var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3547 + var6 = WallDecoration.getPacketBufferNode(ClientPacket.field3039, Client.packetWriter.isaacCipher); // L: 3549 + var6.packetBuffer.writeByte(class392.stringCp1252NullTerminatedByteSize(var8) + 2); // L: 3550 + var6.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3551 + var6.packetBuffer.writeByte(var7 - 1); // L: 3552 + var6.packetBuffer.writeByte(var9); // L: 3553 + Client.packetWriter.addNode(var6); // L: 3554 + return 1; // L: 3555 + } else { + int var3; + Message var5; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 3557 + class12.Interpreter_intStackSize -= 2; // L: 3558 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3559 + var7 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3560 + var5 = class175.Messages_getByChannelAndID(var3, var7); // L: 3561 + if (var5 != null) { // L: 3562 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.count; // L: 3563 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.cycle; // L: 3564 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3565 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3566 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3567 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3568 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3571 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3572 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3573 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3574 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3575 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3576 + } + + return 1; // L: 3578 + } else { + Message var4; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 3580 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3581 + var4 = class12.Messages_getMessage(var3); // L: 3582 + if (var4 != null) { // L: 3583 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.type; // L: 3584 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.cycle; // L: 3585 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3586 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3587 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3588 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3589 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3592 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3593 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3594 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3595 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3596 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3597 + } + + return 1; // L: 3599 + } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 3601 + if (class21.privateChatMode == null) { // L: 3602 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class21.privateChatMode.field4796; // L: 3603 + } + + return 1; // L: 3604 + } else { + PacketBufferNode var12; + if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 3606 + var8 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3607 + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3608 + var12 = GrandExchangeOfferNameComparator.method5784(var7, var8, class263.clientLanguage, -1); // L: 3609 + Client.packetWriter.addNode(var12); // L: 3610 + return 1; // L: 3611 + } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3613 + class9.Interpreter_stringStackSize -= 2; // L: 3614 + var8 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize]; // L: 3615 + String var11 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize + 1]; // L: 3616 + var12 = WallDecoration.getPacketBufferNode(ClientPacket.field2953, Client.packetWriter.isaacCipher); // L: 3618 + var12.packetBuffer.writeShort(0); // L: 3619 + int var10 = var12.packetBuffer.offset; // L: 3620 + var12.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3621 + User.method6525(var12.packetBuffer, var11); // L: 3622 + var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); // L: 3623 + Client.packetWriter.addNode(var12); // L: 3624 + return 1; // L: 3625 + } else if (var0 == ScriptOpcodes.CHAT_SENDCLAN) { // L: 3627 + var8 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3628 + class12.Interpreter_intStackSize -= 2; // L: 3629 + var7 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3630 + var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3631 + var6 = GrandExchangeOfferNameComparator.method5784(var7, var8, class263.clientLanguage, var9); // L: 3632 + Client.packetWriter.addNode(var6); // L: 3633 + return 1; // L: 3634 + } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3636 + if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3643 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3644 + return 1; // L: 3645 + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3647 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3648 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class92.Messages_getHistorySize(var3); // L: 3649 + return 1; // L: 3650 + } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3652 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3653 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class4.Messages_getLastChatID(var3); // L: 3654 + return 1; // L: 3655 + } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3657 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3658 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = PendingSpawn.method2163(var3); // L: 3659 + return 1; // L: 3660 + } else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3662 + var8 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3663 + UrlRequester.doCheat(var8); // L: 3664 + return 1; // L: 3665 + } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3667 + Client.field549 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3668 + return 1; // L: 3669 + } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3671 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = Client.field549; // L: 3672 + return 1; // L: 3673 + } else if (var0 == ScriptOpcodes.WRITECONSOLE) { // L: 3675 + var8 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3676 + System.out.println(var8); // L: 3677 + return 1; // L: 3678 + } else if (var0 == 5024) { // L: 3680 + --class12.Interpreter_intStackSize; // L: 3681 + return 1; // L: 3682 + } else if (var0 == 5025) { // L: 3684 + ++class12.Interpreter_intStackSize; // L: 3685 + return 1; // L: 3686 + } else if (var0 == 5030) { // L: 3688 + class12.Interpreter_intStackSize -= 2; // L: 3689 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3690 + var7 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3691 + var5 = class175.Messages_getByChannelAndID(var3, var7); // L: 3692 + if (var5 != null) { // L: 3693 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.count; // L: 3694 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.cycle; // L: 3695 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3696 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3697 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3698 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3699 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3700 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3701 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3704 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3705 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3706 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3707 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3708 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3709 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3710 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3711 + } + + return 1; // L: 3713 + } else if (var0 == 5031) { // L: 3715 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3716 + var4 = class12.Messages_getMessage(var3); // L: 3717 + if (var4 != null) { // L: 3718 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.type; // L: 3719 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.cycle; // L: 3720 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3721 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3722 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3723 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3724 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3725 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3726 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3729 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3730 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3731 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3732 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3733 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3734 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3735 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3736 + } + + return 1; // L: 3738 + } else { + return 2; // L: 3740 + } + } else { + if (ModelData0.localPlayer != null && ModelData0.localPlayer.username != null) { // L: 3638 + var8 = ModelData0.localPlayer.username.getName(); + } else { + var8 = ""; // L: 3639 + } + + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var8; // L: 3640 + return 1; // L: 3641 + } + } + } + } } - - return var0; // L: 255 } } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index 7f14f18a55..73d61ac6f3 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -1,36 +1,36 @@ 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("of") +@ObfuscatedName("po") @Implements("Fonts") public class Fonts { - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 623297429 - ) - static int field4517; - @ObfuscatedName("v") + @ObfuscatedName("sc") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Lal;" + ) + @Export("pcmPlayer1") + static PcmPlayer pcmPlayer1; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Llp;" ) @Export("spritesArchive") AbstractArchive spritesArchive; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("fontsArchive") AbstractArchive fontsArchive; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("map") HashMap map; @ObfuscatedSignature( - descriptor = "(Lln;Lln;)V" + descriptor = "(Llp;Llp;)V" ) public Fonts(AbstractArchive var1, AbstractArchive var2) { this.spritesArchive = var1; // L: 14 @@ -38,10 +38,10 @@ public class Fonts { this.map = new HashMap(); // L: 16 } // L: 17 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([Low;I)Ljava/util/HashMap;", - garbageValue = "554923002" + descriptor = "([Lpi;I)Ljava/util/HashMap;", + garbageValue = "1588025566" ) @Export("createMap") public HashMap createMap(FontName[] var1) { @@ -53,7 +53,7 @@ public class Fonts { if (this.map.containsKey(var5)) { // L: 26 var2.put(var5, this.map.get(var5)); // L: 27 } else { - Font var6 = class431.method7594(this.spritesArchive, this.fontsArchive, var5.name, ""); // L: 30 + Font var6 = GrandExchangeOfferWorldComparator.method5808(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 @@ -61,52 +61,233 @@ public class Fonts { } } - return var2; + return var2; // L: 39 } - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lpz;B)V", - garbageValue = "0" + descriptor = "(IIIIIIILgm;Lgh;I)V", + garbageValue = "1253814318" ) - @Export("updatePlayer") - static final void updatePlayer(PacketBuffer var0) { - var0.importIndex(); // L: 37 - int var1 = Client.localPlayerIndex; // L: 38 - Player var2 = GrandExchangeEvents.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 - GrandExchangeOfferOwnWorldComparator.baseX; // L: 45 - var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46 - var2.pathY[0] = var6 - VarcInt.baseY; // L: 47 - var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48 - class18.Client_plane = var2.plane = var4; // L: 49 - if (Players.field1276[var1] != null) { // L: 50 - var2.read(Players.field1276[var1]); + static final void method7226(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) { + ObjectComposition var9 = class82.getObjectDefinition(var4); // L: 999 + int var10; + int var11; + if (var5 != 1 && var5 != 3) { // L: 1002 + var10 = var9.sizeX; // L: 1007 + var11 = var9.sizeY; // L: 1008 + } else { + var10 = var9.sizeY; // L: 1003 + var11 = var9.sizeX; // L: 1004 } - Players.Players_count = 0; // L: 51 - Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52 - Players.field1283[var1] = 0; // L: 53 - Players.Players_emptyIdxCount = 0; // L: 54 + int var12; + int var13; + if (var10 + var2 <= 104) { // L: 1014 + var12 = (var10 >> 1) + var2; // L: 1015 + var13 = var2 + (var10 + 1 >> 1); // L: 1016 + } else { + var12 = var2; // L: 1019 + var13 = var2 + 1; // L: 1020 + } - 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.field1283[var7] = 0; // L: 65 + int var14; + int var15; + if (var3 + var11 <= 104) { // L: 1022 + var14 = var3 + (var11 >> 1); // L: 1023 + var15 = var3 + (var11 + 1 >> 1); // L: 1024 + } else { + var14 = var3; // L: 1027 + var15 = var3 + 1; // L: 1028 + } + + int[][] var16 = Tiles.Tiles_heights[var1]; // L: 1030 + int var17 = var16[var13][var15] + var16[var12][var15] + var16[var12][var14] + var16[var13][var14] >> 2; // L: 1031 + int var18 = (var2 << 7) + (var10 << 6); // L: 1032 + int var19 = (var3 << 7) + (var11 << 6); // L: 1033 + long var20 = VarbitComposition.calculateTag(var2, var3, 2, var9.int1 == 0, var4); // L: 1034 + int var22 = (var5 << 6) + var6; // L: 1035 + if (var9.int3 == 1) { // L: 1036 + var22 += 256; + } + + Object var30; + if (var6 == 22) { // L: 1037 + if (var9.animationId == -1 && var9.transforms == null) { // L: 1039 + var30 = var9.getModel(22, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1040 } - } - var0.exportIndex(); // L: 67 - } // L: 68 + var7.newFloorDecoration(var0, var2, var3, var17, (Renderable)var30, var20, var22); // L: 1041 + if (var9.interactType == 1) { // L: 1042 + var8.setBlockedByFloorDec(var2, var3); + } + + } else if (var6 != 10 && var6 != 11) { // L: 1045 + if (var6 >= 12) { // L: 1053 + if (var9.animationId == -1 && var9.transforms == null) { // L: 1055 + var30 = var9.getModel(var6, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1056 + } + + var7.method4176(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); // L: 1057 + if (var9.interactType != 0) { // L: 1058 + var8.addGameObject(var2, var3, var10, var11, var9.boolean1); + } + + } else if (var6 == 0) { // L: 1061 + if (var9.animationId == -1 && var9.transforms == null) { // L: 1063 + var30 = var9.getModel(0, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1064 + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field988[var5], 0, var20, var22); // L: 1065 + if (var9.interactType != 0) { // L: 1066 + var8.method3749(var2, var3, var6, var5, var9.boolean1); + } + + } else if (var6 == 1) { // L: 1069 + if (var9.animationId == -1 && var9.transforms == null) { // L: 1071 + var30 = var9.getModel(1, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1072 + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field989[var5], 0, var20, var22); // L: 1073 + if (var9.interactType != 0) { // L: 1074 + var8.method3749(var2, var3, var6, var5, var9.boolean1); + } + + } else { + int var23; + if (var6 == 2) { // L: 1077 + var23 = var5 + 1 & 3; // L: 1078 + Object var25; + Object var31; + if (var9.animationId == -1 && var9.transforms == null) { // L: 1081 + var31 = var9.getModel(2, var5 + 4, var16, var18, var17, var19); // L: 1082 + var25 = var9.getModel(2, var23, var16, var18, var17, var19); // L: 1083 + } else { + var31 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1086 + var25 = new DynamicObject(var4, 2, var23, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1087 + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var31, (Renderable)var25, Tiles.field988[var5], Tiles.field988[var23], var20, var22); // L: 1089 + if (var9.interactType != 0) { // L: 1090 + var8.method3749(var2, var3, var6, var5, var9.boolean1); + } + + } else if (var6 == 3) { // L: 1093 + if (var9.animationId == -1 && var9.transforms == null) { // L: 1095 + var30 = var9.getModel(3, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1096 + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field989[var5], 0, var20, var22); // L: 1097 + if (var9.interactType != 0) { // L: 1098 + var8.method3749(var2, var3, var6, var5, var9.boolean1); + } + + } else if (var6 == 9) { // L: 1101 + if (var9.animationId == -1 && var9.transforms == null) { // L: 1103 + var30 = var9.getModel(var6, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1104 + } + + var7.method4176(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); // L: 1105 + if (var9.interactType != 0) { // L: 1106 + var8.addGameObject(var2, var3, var10, var11, var9.boolean1); + } + + } else if (var6 == 4) { // L: 1109 + if (var9.animationId == -1 && var9.transforms == null) { // L: 1111 + var30 = var9.getModel(4, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1112 + } + + var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field988[var5], 0, 0, 0, var20, var22); // L: 1113 + } else { + long var24; + Object var26; + if (var6 == 5) { // L: 1116 + var23 = 16; // L: 1117 + var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1118 + if (var24 != 0L) { // L: 1119 + var23 = class82.getObjectDefinition(NetSocket.Entity_unpackID(var24)).int2; + } + + if (var9.animationId == -1 && var9.transforms == null) { // L: 1121 + var26 = var9.getModel(4, var5, var16, var18, var17, var19); + } else { + var26 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1122 + } + + var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, Tiles.field988[var5], 0, var23 * Tiles.field990[var5], var23 * Tiles.field991[var5], var20, var22); // L: 1123 + } else if (var6 == 6) { // L: 1126 + var23 = 8; // L: 1127 + var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1128 + if (0L != var24) { // L: 1129 + var23 = class82.getObjectDefinition(NetSocket.Entity_unpackID(var24)).int2 / 2; + } + + if (var9.animationId == -1 && var9.transforms == null) { // L: 1131 + var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); + } else { + var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1132 + } + + var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, 256, var5, var23 * Tiles.field995[var5], var23 * Tiles.field993[var5], var20, var22); // L: 1133 + } else if (var6 == 7) { // L: 1136 + int var29 = var5 + 2 & 3; // L: 1138 + if (var9.animationId == -1 && var9.transforms == null) { // L: 1139 + var30 = var9.getModel(4, var29 + 4, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 4, var29 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1140 + } + + var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, 256, var29, 0, 0, var20, var22); // L: 1141 + } else if (var6 == 8) { // L: 1144 + var23 = 8; // L: 1145 + var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1146 + if (0L != var24) { // L: 1147 + var23 = class82.getObjectDefinition(NetSocket.Entity_unpackID(var24)).int2 / 2; + } + + int var28 = var5 + 2 & 3; // L: 1150 + Object var27; + if (var9.animationId == -1 && var9.transforms == null) { // L: 1151 + var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); // L: 1152 + var27 = var9.getModel(4, var28 + 4, var16, var18, var17, var19); // L: 1153 + } else { + var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1156 + var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1157 + } + + var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)var27, 256, var5, var23 * Tiles.field995[var5], var23 * Tiles.field993[var5], var20, var22); // L: 1159 + } + } + } + } else { + if (var9.animationId == -1 && var9.transforms == null) { // L: 1047 + var30 = var9.getModel(10, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1048 + } + + if (var30 != null) { // L: 1049 + var7.method4176(var0, var2, var3, var17, var10, var11, (Renderable)var30, var6 == 11 ? 256 : 0, var20, var22); + } + + if (var9.interactType != 0) { + var8.addGameObject(var2, var3, var10, var11, var9.boolean1); // L: 1050 + } + + } + } // L: 1043 1051 1059 1067 1075 1091 1099 1107 1114 1124 1134 1142 1160 1162 } diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index 0a48cc3415..eb05bd6410 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -1,72 +1,187 @@ +import java.awt.image.BufferedImage; +import java.awt.image.PixelGrabber; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import javax.imageio.ImageIO; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("im") +@ObfuscatedName("gt") @Implements("Frames") public class Frames extends DualNode { - @ObfuscatedName("v") + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -780977341 + ) + public static int field2492; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Lhf;" + descriptor = "[Lgu;" ) @Export("frames") Animation[] frames; @ObfuscatedSignature( - descriptor = "(Lln;Lln;IZ)V" + descriptor = "(Llp;Llp;IZ)V", + garbageValue = "0" ) - Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { - 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 + public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { + NodeDeque var5 = new NodeDeque(); // L: 11 + int var6 = var1.getGroupFileCount(var3); // L: 12 + this.frames = new Animation[var6]; // L: 13 + int[] var7 = var1.getGroupFileIds(var3); // L: 14 - 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 + for (int var8 = 0; var8 < var7.length; ++var8) { // L: 15 + byte[] var9 = var1.takeFile(var3, var7[var8]); // L: 16 + Skeleton var10 = null; // L: 17 + int var11 = (var9[0] & 255) << 8 | var9[1] & 255; // L: 18 - for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { // L: 43 44 49 - if (var11 == var12.id) { // L: 45 - var10 = var12; // L: 46 + for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { // L: 19 + if (var11 == var12.id) { // L: 21 + var10 = var12; break; } } - if (var10 == null) { // L: 51 - byte[] var13; - if (var4) { // L: 53 - var13 = var2.getFile(0, var11); - } else { - var13 = var2.getFile(var11, 0); // L: 54 - } - - var10 = new Skeleton(var11, var13); // L: 55 - var5.addFirst(var10); // L: 56 + if (var10 == null) { + byte[] var13 = var2.getFile(var11, 0); + var10 = new Skeleton(var11, var13); // L: 31 + var5.addFirst(var10); } - this.frames[var7[var8]] = new Animation(var9, var10); // L: 58 + this.frames[var7[var8]] = new Animation(var9, var10); } - } // L: 60 + } // L: 36 - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1974445635" + descriptor = "(IB)Z", + garbageValue = "-15" ) @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { - return this.frames[var1].hasAlphaTransform; // L: 63 + return this.frames[var1].hasAlphaTransform; // L: 39 } - @ObfuscatedName("f") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IS)I", - garbageValue = "500" + descriptor = "([BB)Lqr;", + garbageValue = "7" ) - public static int method4934(int var0) { - return FileSystem.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 61 + public static final SpritePixels method4217(byte[] var0) { + BufferedImage var1 = null; // L: 20 + + try { + Class var2 = ImageIO.class; // L: 22 + synchronized(ImageIO.class) { + var1 = ImageIO.read(new ByteArrayInputStream(var0)); // L: 23 + } // L: 24 + + int var6 = var1.getWidth(); // L: 25 + int var7 = var1.getHeight(); // L: 26 + int[] var4 = new int[var7 * var6]; // L: 27 + PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var6, var7, var4, 0, var6); // L: 28 + var5.grabPixels(); // L: 29 + return new SpritePixels(var4, var6, var7); // L: 30 + } catch (IOException var9) { // L: 32 + } catch (InterruptedException var10) { // L: 33 + } + + return new SpritePixels(0, 0); // L: 34 } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Llp;Ljava/lang/String;Ljava/lang/String;B)[Lqr;", + garbageValue = "16" + ) + public static SpritePixels[] method4218(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 91 + int var4 = var0.getFileId(var3, var2); // L: 92 + SpritePixels[] var5; + if (!User.method6514(var0, var3, var4)) { // L: 95 + var5 = null; // L: 96 + } else { + SpritePixels[] var7 = new SpritePixels[class453.SpriteBuffer_spriteCount]; // L: 101 + + for (int var8 = 0; var8 < class453.SpriteBuffer_spriteCount; ++var8) { // L: 102 + SpritePixels var9 = var7[var8] = new SpritePixels(); // L: 103 + var9.width = class453.SpriteBuffer_spriteWidth; // L: 104 + var9.height = class453.SpriteBuffer_spriteHeight; // L: 105 + var9.xOffset = class453.SpriteBuffer_xOffsets[var8]; // L: 106 + var9.yOffset = class453.SpriteBuffer_yOffsets[var8]; // L: 107 + var9.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[var8]; // L: 108 + var9.subHeight = class453.SpriteBuffer_spriteHeights[var8]; // L: 109 + int var10 = var9.subHeight * var9.subWidth; // L: 110 + byte[] var11 = class127.SpriteBuffer_pixels[var8]; // L: 111 + var9.pixels = new int[var10]; // L: 112 + + for (int var12 = 0; var12 < var10; ++var12) { // L: 113 + var9.pixels[var12] = Decimator.SpriteBuffer_spritePalette[var11[var12] & 255]; + } + } + + VarcInt.method3325(); // L: 115 + var5 = var7; // L: 118 + } + + return var5; // L: 120 + } + + @ObfuscatedName("he") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "13" + ) + @Export("updateItemPile") + static final void updateItemPile(int var0, int var1) { + NodeDeque var2 = Client.groundItems[class128.Client_plane][var0][var1]; // L: 7964 + if (var2 == null) { // L: 7965 + class175.scene.removeGroundItemPile(class128.Client_plane, var0, var1); // L: 7966 + } else { + long var3 = -99999999L; // L: 7969 + TileItem var5 = null; // L: 7970 + + TileItem var6; + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7971 7972 7980 + ItemComposition var7 = FileSystem.ItemDefinition_get(var6.id); // L: 7973 + long var11 = (long)var7.price; // L: 7974 + if (var7.isStackable == 1) { + var11 *= (long)(var6.quantity + 1); // L: 7975 + } + + if (var11 > var3) { // L: 7976 + var3 = var11; // L: 7977 + var5 = var6; // L: 7978 + } + } + + if (var5 == null) { // L: 7982 + class175.scene.removeGroundItemPile(class128.Client_plane, var0, var1); // L: 7983 + } else { + var2.addLast(var5); // L: 7986 + TileItem var13 = null; // L: 7987 + TileItem var8 = null; // L: 7988 + + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7989 7990 7995 + if (var6.id != var5.id) { // L: 7991 + if (var13 == null) { // L: 7992 + var13 = var6; + } + + if (var13.id != var6.id && var8 == null) { // L: 7993 + var8 = var6; + } + } + } + + long var9 = VarbitComposition.calculateTag(var0, var1, 3, false, 0); // L: 7997 + class175.scene.newGroundItemPile(class128.Client_plane, var0, var1, class202.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class128.Client_plane), var5, var9, var13, var8); // L: 7998 + } + } + } // L: 7967 7984 7999 } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index fe21644881..271d5b3d1b 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -3,21 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nh") +@ObfuscatedName("nn") @Implements("Friend") public class Friend extends Buddy { - @ObfuscatedName("v") - boolean field4237; - @ObfuscatedName("c") - boolean field4236; + @ObfuscatedName("o") + boolean field4311; + @ObfuscatedName("q") + boolean field4312; Friend() { } // L: 9 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnh;I)I", - garbageValue = "-1631917139" + descriptor = "(Lnn;I)I", + garbageValue = "1190428650" ) @Export("compareToFriend") int compareToFriend(Friend var1) { @@ -29,23 +29,23 @@ public class Friend extends Buddy { return -1; } else if (var1.world != 0 && super.world == 0) { // L: 15 return 1; - } else if (this.field4237 && !var1.field4237) { // L: 16 + } else if (this.field4311 && !var1.field4311) { // L: 16 return -1; - } else if (!this.field4237 && var1.field4237) { // L: 17 + } else if (!this.field4311 && var1.field4311) { // L: 17 return 1; - } else if (this.field4236 && !var1.field4236) { // L: 18 + } else if (this.field4312 && !var1.field4312) { // L: 18 return -1; - } else if (!this.field4236 && var1.field4236) { // L: 19 + } else if (!this.field4312 && var1.field4312) { // L: 19 return 1; } else { return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; // L: 20 21 24 } } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lnn;I)I", - garbageValue = "842367957" + descriptor = "(Lnb;I)I", + garbageValue = "434999779" ) @Export("compareTo_user") public int compareTo_user(User var1) { diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index 9b1f59b58b..edc32f763b 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -4,91 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nk") +@ObfuscatedName("nr") @Implements("FriendLoginUpdate") public class FriendLoginUpdate extends Link { - @ObfuscatedName("q") - @Export("SpriteBuffer_pixels") - public static byte[][] SpriteBuffer_pixels; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 900847361 + intValue = 281202653 ) - public int field4246; - @ObfuscatedName("c") + public int field4314; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lqb;" + descriptor = "Lqv;" ) @Export("username") public Username username; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("world") public short world; @ObfuscatedSignature( - descriptor = "(Lqb;I)V" + descriptor = "(Lqv;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.field4246 = (int)(class136.method2931() / 1000L); // L: 107 - this.username = var1; // L: 108 - this.world = (short)var2; // L: 109 - } // L: 110 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-635847249" - ) - public static void method6685() { - try { - JagexCache.JagexCache_dat2File.close(); // L: 276 - - for (int var0 = 0; var0 < JagexCache.idxCount; ++var0) { // L: 277 - class115.JagexCache_idxFiles[var0].close(); - } - - JagexCache.JagexCache_idx255File.close(); // L: 278 - JagexCache.JagexCache_randomDat.close(); // L: 279 - } catch (Exception var2) { // L: 281 - } - - } // L: 282 - - @ObfuscatedName("kp") - @ObfuscatedSignature( - descriptor = "(Lky;I)Lky;", - garbageValue = "177537571" - ) - static Widget method6686(Widget var0) { - Widget var2 = var0; // L: 11903 - int var3 = Players.method2420(class326.getWidgetFlags(var0)); // L: 11905 - Widget var1; - if (var3 == 0) { // L: 11906 - var1 = null; // L: 11907 - } else { - int var4 = 0; - - while (true) { - if (var4 >= var3) { - var1 = var2; // L: 11917 - break; - } - - var2 = class127.getWidget(var2.parentId); // L: 11911 - if (var2 == null) { // L: 11912 - var1 = null; // L: 11913 - break; // L: 11914 - } - - ++var4; // L: 11910 - } - } - - Widget var5 = var1; // L: 11919 - if (var1 == null) { // L: 11920 - var5 = var0.parent; - } - - return var5; // L: 11921 - } + this.field4314 = (int)(class113.method2624() / 1000L); // L: 109 + this.username = var1; // L: 110 + this.world = (short)var2; // L: 111 + } // L: 112 } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 811c014bf8..14578dc23f 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -1,559 +1,303 @@ +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bw") +@ObfuscatedName("bd") @Implements("FriendSystem") public class FriendSystem { - @ObfuscatedName("u") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lea;" - ) - static ClanChannel field808; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lpe;" + descriptor = "Lpj;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lnr;" + descriptor = "Lna;" ) @Export("friendsList") public final FriendsList friendsList; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lmw;" + descriptor = "Lnd;" ) @Export("ignoreList") public final IgnoreList ignoreList; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -189724235 + intValue = -2020260253 ) - int field805; + int field803; @ObfuscatedSignature( - descriptor = "(Lpe;)V" + descriptor = "(Lpj;)V" ) FriendSystem(LoginType var1) { - this.field805 = 0; // L: 23 + this.field803 = 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("o") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-76" + ) + boolean method1666() { + return this.field803 == 2; // L: 32 } - @ObfuscatedName("v") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-846146726" + descriptor = "(I)V", + garbageValue = "-990336643" ) - boolean method1681() { - return this.field805 == 2; // L: 32 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-22" - ) - final void method1726() { - this.field805 = 1; // L: 36 + final void method1667() { + this.field803 = 1; // L: 36 } // L: 37 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-1095656877" + descriptor = "(Lpx;II)V", + garbageValue = "1619915993" ) @Export("readUpdate") final void readUpdate(Buffer var1, int var2) { this.friendsList.read(var1, var2); // L: 40 - this.field805 = 2; // L: 41 - class295.method5732(); // L: 42 - } // L: 43 + this.field803 = 2; // L: 41 - @ObfuscatedName("f") + 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 + } + + Iterator var5 = Messages.Messages_hashTable.iterator(); // L: 48 + + while (var5.hasNext()) { + Message var6 = (Message)var5.next(); // L: 49 + var6.clearIsFromFriend(); // L: 51 + } + + if (PcmPlayer.friendsChat != null) { // L: 55 + PcmPlayer.friendsChat.clearFriends(); // L: 56 + } + + } // L: 59 + + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-6357" + descriptor = "(B)V", + garbageValue = "-29" ) @Export("processFriendUpdates") final void processFriendUpdates() { - for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { // L: 46 - if ((long)var1.field4246 < class136.method2931() / 1000L - 5L) { // L: 47 + for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { // L: 62 + if ((long)var1.field4314 < class113.method2624() / 1000L - 5L) { // L: 63 if (var1.world > 0) { - Actor.addGameMessage(5, "", var1.username + " has logged in."); // L: 48 + WorldMapEvent.addGameMessage(5, "", var1.username + " has logged in."); // L: 64 } - if (var1.world == 0) { // L: 49 - Actor.addGameMessage(5, "", var1.username + " has logged out."); + if (var1.world == 0) { // L: 65 + WorldMapEvent.addGameMessage(5, "", var1.username + " has logged out."); } - var1.remove(); // L: 50 + var1.remove(); // L: 66 } } - } // L: 53 + } // L: 69 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1878826448" + descriptor = "(S)V", + garbageValue = "-1844" ) @Export("clear") final void clear() { - this.field805 = 0; // L: 56 - this.friendsList.clear(); // L: 57 - this.ignoreList.clear(); // L: 58 - } // L: 59 + this.field803 = 0; // L: 72 + this.friendsList.clear(); // L: 73 + this.ignoreList.clear(); // L: 74 + } // L: 75 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lqb;ZS)Z", - garbageValue = "301" + descriptor = "(Lqv;ZS)Z", + garbageValue = "753" ) @Export("isFriended") final boolean isFriended(Username var1, boolean var2) { - if (var1 == null) { // L: 62 + if (var1 == null) { // L: 78 return false; - } else if (var1.equals(GrandExchangeEvents.localPlayer.username)) { // L: 63 + } else if (var1.equals(ModelData0.localPlayer.username)) { // L: 79 return true; } else { - return this.friendsList.isFriended(var1, var2); // L: 64 + return this.friendsList.isFriended(var1, var2); // L: 80 + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Lqv;I)Z", + garbageValue = "1274631135" + ) + @Export("isIgnored") + final boolean isIgnored(Username var1) { + if (var1 == null) { // L: 85 + return false; + } else { + return this.ignoreList.contains(var1); // L: 86 } } @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lqb;B)Z", - garbageValue = "24" - ) - @Export("isIgnored") - final boolean isIgnored(Username var1) { - if (var1 == null) { // L: 69 - return false; - } else { - return this.ignoreList.contains(var1); // L: 70 - } - } - - @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)V", - garbageValue = "95" + garbageValue = "-35" ) @Export("addFriend") final void addFriend(String var1) { - if (var1 != null) { // L: 75 - Username var2 = new Username(var1, this.loginType); // L: 76 - if (var2.hasCleanName()) { // L: 77 - if (this.friendsListIsFull()) { // L: 78 - class149.method3138("Your friend list is full. Max of 200 for free users, and 400 for members"); // L: 80 - } else if (GrandExchangeEvents.localPlayer.username.equals(var2)) { // L: 84 - ClanSettings.method3031(); // L: 85 - } else if (this.isFriended(var2, false)) { // L: 88 - class149.method3138(var1 + " is already on your friend list"); // L: 90 - } else if (this.isIgnored(var2)) { // L: 94 - Canvas.method359(var1); // L: 95 + if (var1 != null) { // L: 91 + Username var2 = new Username(var1, this.loginType); // L: 92 + if (var2.hasCleanName()) { // L: 93 + if (this.friendsListIsFull()) { // L: 94 + Tiles.method2017(); // L: 95 + } else if (ModelData0.localPlayer.username.equals(var2)) { // L: 98 + InterfaceParent.method2067("You can't add yourself to your own friend list"); // L: 100 + } else if (this.isFriended(var2, false)) { // L: 104 + InterfaceParent.method2067(var1 + " is already on your friend list"); // L: 106 + } else if (this.isIgnored(var2)) { // L: 110 + InterfaceParent.method2067("Please remove " + var1 + " from your ignore list first"); // L: 112 } else { - Skeleton.method4728(var1); // L: 98 + PacketBufferNode var3 = WallDecoration.getPacketBufferNode(ClientPacket.field2998, Client.packetWriter.isaacCipher); // L: 118 + var3.packetBuffer.writeByte(class392.stringCp1252NullTerminatedByteSize(var1)); // L: 119 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 120 + Client.packetWriter.addNode(var3); // L: 121 } } } - } // L: 82 86 92 96 99 + } // L: 96 102 108 114 123 - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1352470577" + garbageValue = "731924017" ) @Export("friendsListIsFull") final boolean friendsListIsFull() { - return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field544 != 1; // L: 122 + return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field610 != 1; // L: 134 } - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1994485705" + garbageValue = "-1674532630" ) @Export("addIgnore") final void addIgnore(String var1) { - if (var1 != null) { // L: 129 - Username var2 = new Username(var1, this.loginType); // L: 130 - if (var2.hasCleanName()) { // L: 131 - if (this.canAddIgnore()) { // L: 132 - ModeWhere.method6092(); // L: 133 - } else if (GrandExchangeEvents.localPlayer.username.equals(var2)) { // L: 136 - class149.method3138("You can't add yourself to your own ignore list"); // L: 138 - } else if (this.isIgnored(var2)) { // L: 142 - class149.method3138(var1 + " is already on your ignore list"); // L: 144 - } else if (this.isFriended(var2, false)) { // L: 148 - KeyHandler.method348(var1); // L: 149 + if (var1 != null) { // L: 141 + Username var2 = new Username(var1, this.loginType); // L: 142 + if (var2.hasCleanName()) { // L: 143 + if (this.canAddIgnore()) { // L: 144 + InterfaceParent.method2067("Your ignore list is full. Max of 100 for free users, and 400 for members"); // L: 146 + } else if (ModelData0.localPlayer.username.equals(var2)) { // L: 150 + UserComparator9.method2601(); // L: 151 + } else if (this.isIgnored(var2)) { // L: 154 + class230.method4731(var1); // L: 155 + } else if (this.isFriended(var2, false)) { // L: 158 + InterfaceParent.method2067("Please remove " + var1 + " from your friend list first"); // L: 160 } else { - GameEngine.method569(var1); // L: 152 + PacketBufferNode var3 = WallDecoration.getPacketBufferNode(ClientPacket.field2959, Client.packetWriter.isaacCipher); // L: 166 + var3.packetBuffer.writeByte(class392.stringCp1252NullTerminatedByteSize(var1)); // L: 167 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 168 + Client.packetWriter.addNode(var3); // L: 169 } } } - } // L: 134 140 146 150 153 + } // L: 148 152 156 162 171 @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1971481625" + garbageValue = "-799291101" ) @Export("canAddIgnore") final boolean canAddIgnore() { - return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field544 != 1; // L: 172 + return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field610 != 1; // L: 182 } @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-14" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1784311825" ) @Export("removeFriend") final void removeFriend(String var1) { - if (var1 != null) { // L: 179 - Username var2 = new Username(var1, this.loginType); // L: 180 - if (var2.hasCleanName()) { // L: 181 - if (this.friendsList.removeByUsername(var2)) { // L: 182 - Client.field701 = Client.cycleCntr; // L: 184 - PacketBufferNode var3 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2970, Client.packetWriter.isaacCipher); // L: 187 - var3.packetBuffer.writeByte(class425.stringCp1252NullTerminatedByteSize(var1)); // L: 188 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 189 - Client.packetWriter.addNode(var3); // L: 190 + if (var1 != null) { // L: 189 + Username var2 = new Username(var1, this.loginType); // L: 190 + if (var2.hasCleanName()) { // L: 191 + if (this.friendsList.removeByUsername(var2)) { // L: 192 + Renderable.method4210(); // L: 193 + PacketBufferNode var3 = WallDecoration.getPacketBufferNode(ClientPacket.field2954, Client.packetWriter.isaacCipher); // L: 195 + var3.packetBuffer.writeByte(class392.stringCp1252NullTerminatedByteSize(var1)); // L: 196 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 197 + Client.packetWriter.addNode(var3); // L: 198 + } + + for (int var5 = 0; var5 < Players.Players_count; ++var5) { // L: 201 + Player var4 = Client.players[Players.Players_indices[var5]]; // L: 202 + var4.clearIsFriend(); // L: 203 + } + + Iterator var6 = Messages.Messages_hashTable.iterator(); // L: 206 + + while (var6.hasNext()) { + Message var7 = (Message)var6.next(); // L: 207 + var7.clearIsFromFriend(); // L: 209 + } + + if (PcmPlayer.friendsChat != null) { // L: 213 + PcmPlayer.friendsChat.clearFriends(); // L: 214 } - class295.method5732(); // L: 192 } } - } // L: 193 + } // L: 217 @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "20346063" + garbageValue = "516139495" ) @Export("removeIgnore") final void removeIgnore(String var1) { - if (var1 != null) { // L: 196 - Username var2 = new Username(var1, this.loginType); // L: 197 - if (var2.hasCleanName()) { // L: 198 - if (this.ignoreList.removeByUsername(var2)) { // L: 199 - Client.field701 = Client.cycleCntr; // L: 201 - PacketBufferNode var3 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2991, Client.packetWriter.isaacCipher); // L: 204 - var3.packetBuffer.writeByte(class425.stringCp1252NullTerminatedByteSize(var1)); // L: 205 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 206 - Client.packetWriter.addNode(var3); // L: 207 + if (var1 != null) { // L: 220 + Username var2 = new Username(var1, this.loginType); // L: 221 + if (var2.hasCleanName()) { // L: 222 + if (this.ignoreList.removeByUsername(var2)) { // L: 223 + Renderable.method4210(); // L: 224 + PacketBufferNode var3 = WallDecoration.getPacketBufferNode(ClientPacket.field3034, Client.packetWriter.isaacCipher); // L: 226 + var3.packetBuffer.writeByte(class392.stringCp1252NullTerminatedByteSize(var1)); // L: 227 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 228 + Client.packetWriter.addNode(var3); // L: 229 } - KitDefinition.FriendSystem_invalidateIgnoreds(); // L: 209 + class121.FriendSystem_invalidateIgnoreds(); // L: 231 } } - } // L: 210 + } // L: 232 - @ObfuscatedName("y") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lqb;I)Z", - garbageValue = "-2101577013" + descriptor = "(Lqv;I)Z", + garbageValue = "723636782" ) @Export("isFriendAndHasWorld") final boolean isFriendAndHasWorld(Username var1) { - Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 222 - return var2 != null && var2.hasWorld(); // L: 223 + Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 244 + return var2 != null && var2.hasWorld(); // L: 245 } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)[Lcn;", - garbageValue = "-1586565487" - ) - static AttackOption[] method1743() { - return new AttackOption[]{AttackOption.field1263, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden, AttackOption.field1257}; // L: 12680 - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "106" - ) - public static boolean method1698(int var0) { - return (var0 >> 28 & 1) != 0; // L: 29 - } - - @ObfuscatedName("hy") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1628645730" - ) - static final void method1715() { - class389.method7094(false); // L: 5650 - Client.field747 = 0; // L: 5651 - boolean var0 = true; // L: 5652 - - int var1; - for (var1 = 0; var1 < Varcs.regionLandArchives.length; ++var1) { // L: 5653 - if (VarpDefinition.regionMapArchiveIds[var1] != -1 && Varcs.regionLandArchives[var1] == null) { // L: 5654 5655 - Varcs.regionLandArchives[var1] = Players.archive5.takeFile(VarpDefinition.regionMapArchiveIds[var1], 0); // L: 5656 - if (Varcs.regionLandArchives[var1] == null) { // L: 5657 - var0 = false; // L: 5658 - ++Client.field747; // L: 5659 - } - } - - if (class133.regionLandArchiveIds[var1] != -1 && DynamicObject.regionMapArchives[var1] == null) { // L: 5663 5664 - DynamicObject.regionMapArchives[var1] = Players.archive5.takeFileEncrypted(class133.regionLandArchiveIds[var1], 0, WorldMapSectionType.xteaKeys[var1]); // L: 5665 - if (DynamicObject.regionMapArchives[var1] == null) { // L: 5666 - var0 = false; // L: 5667 - ++Client.field747; // L: 5668 - } - } - } - - if (!var0) { // L: 5673 - Client.field560 = 1; // L: 5674 - } else { - Client.field558 = 0; // L: 5677 - var0 = true; // L: 5678 - - int var3; - int var4; - for (var1 = 0; var1 < Varcs.regionLandArchives.length; ++var1) { // L: 5679 - byte[] var15 = DynamicObject.regionMapArchives[var1]; // L: 5680 - if (var15 != null) { // L: 5681 - var3 = (class21.regions[var1] >> 8) * 64 - GrandExchangeOfferOwnWorldComparator.baseX; // L: 5682 - var4 = (class21.regions[var1] & 255) * 64 - VarcInt.baseY; // L: 5683 - if (Client.isInInstance) { // L: 5684 - var3 = 10; // L: 5685 - var4 = 10; // L: 5686 - } - - var0 &= ItemComposition.method3771(var15, var3, var4); // L: 5688 - } - } - - if (!var0) { // L: 5691 - Client.field560 = 2; // L: 5692 - } else { - if (Client.field560 != 0) { // L: 5695 - MusicPatch.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); - } - - class116.playPcmPlayers(); // L: 5696 - ArchiveLoader.scene.clear(); // L: 5697 - - for (var1 = 0; var1 < 4; ++var1) { // L: 5698 - Client.collisionMaps[var1].clear(); - } - - int var2; - for (var1 = 0; var1 < 4; ++var1) { // L: 5699 - for (var2 = 0; var2 < 104; ++var2) { // L: 5700 - for (var3 = 0; var3 < 104; ++var3) { // L: 5701 - Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 5702 - } - } - } - - class116.playPcmPlayers(); // L: 5706 - class321.method5996(); // L: 5707 - var1 = Varcs.regionLandArchives.length; // L: 5708 - ClientPreferences.method2259(); // L: 5709 - class389.method7094(true); // L: 5710 - int var5; - if (!Client.isInInstance) { // L: 5711 - byte[] var14; - for (var2 = 0; var2 < var1; ++var2) { // L: 5712 - var3 = (class21.regions[var2] >> 8) * 64 - GrandExchangeOfferOwnWorldComparator.baseX; // L: 5713 - var4 = (class21.regions[var2] & 255) * 64 - VarcInt.baseY; // L: 5714 - var14 = Varcs.regionLandArchives[var2]; // L: 5715 - if (var14 != null) { // L: 5716 - class116.playPcmPlayers(); // L: 5717 - class1.method9(var14, var3, var4, ScriptEvent.field1042 * 8 - 48, KitDefinition.field1855 * 8 - 48, Client.collisionMaps); // L: 5718 - } - } - - for (var2 = 0; var2 < var1; ++var2) { // L: 5721 - var3 = (class21.regions[var2] >> 8) * 64 - GrandExchangeOfferOwnWorldComparator.baseX; // L: 5722 - var4 = (class21.regions[var2] & 255) * 64 - VarcInt.baseY; // L: 5723 - var14 = Varcs.regionLandArchives[var2]; // L: 5724 - if (var14 == null && KitDefinition.field1855 < 800) { // L: 5725 - class116.playPcmPlayers(); // L: 5726 - class431.method7593(var3, var4, 64, 64); // L: 5727 - } - } - - class389.method7094(true); // L: 5730 - - for (var2 = 0; var2 < var1; ++var2) { // L: 5731 - byte[] var13 = DynamicObject.regionMapArchives[var2]; // L: 5732 - if (var13 != null) { // L: 5733 - var4 = (class21.regions[var2] >> 8) * 64 - GrandExchangeOfferOwnWorldComparator.baseX; // L: 5734 - var5 = (class21.regions[var2] & 255) * 64 - VarcInt.baseY; // L: 5735 - class116.playPcmPlayers(); // L: 5736 - Widget.method5681(var13, var4, var5, ArchiveLoader.scene, Client.collisionMaps); // L: 5737 - } - } - } - - int var6; - int var7; - int var8; - if (Client.isInInstance) { // L: 5741 - int var9; - int var10; - int var11; - for (var2 = 0; var2 < 4; ++var2) { // L: 5742 - class116.playPcmPlayers(); // L: 5743 - - for (var3 = 0; var3 < 13; ++var3) { // L: 5744 - for (var4 = 0; var4 < 13; ++var4) { // L: 5745 - boolean var16 = false; // L: 5746 - var6 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5747 - if (var6 != -1) { // L: 5748 - var7 = var6 >> 24 & 3; // L: 5749 - var8 = var6 >> 1 & 3; // L: 5750 - var9 = var6 >> 14 & 1023; // L: 5751 - var10 = var6 >> 3 & 2047; // L: 5752 - var11 = (var9 / 8 << 8) + var10 / 8; // L: 5753 - - for (int var12 = 0; var12 < class21.regions.length; ++var12) { // L: 5754 - if (class21.regions[var12] == var11 && Varcs.regionLandArchives[var12] != null) { // L: 5755 - class305.method5781(Varcs.regionLandArchives[var12], var2, var3 * 8, var4 * 8, var7, (var9 & 7) * 8, (var10 & 7) * 8, var8, Client.collisionMaps); // L: 5756 - var16 = true; // L: 5757 - break; - } - } - } - - if (!var16) { // L: 5762 - KeyHandler.method337(var2, var3 * 8, var4 * 8); // L: 5763 - } - } - } - } - - for (var2 = 0; var2 < 13; ++var2) { // L: 5768 - for (var3 = 0; var3 < 13; ++var3) { // L: 5769 - var4 = Client.instanceChunkTemplates[0][var2][var3]; // L: 5770 - if (var4 == -1) { // L: 5771 - class431.method7593(var2 * 8, var3 * 8, 8, 8); // L: 5772 - } - } - } - - class389.method7094(true); // L: 5776 - - for (var2 = 0; var2 < 4; ++var2) { // L: 5777 - class116.playPcmPlayers(); // L: 5778 - - for (var3 = 0; var3 < 13; ++var3) { // L: 5779 - for (var4 = 0; var4 < 13; ++var4) { // L: 5780 - var5 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5781 - if (var5 != -1) { // L: 5782 - var6 = var5 >> 24 & 3; // L: 5783 - var7 = var5 >> 1 & 3; // L: 5784 - var8 = var5 >> 14 & 1023; // L: 5785 - var9 = var5 >> 3 & 2047; // L: 5786 - var10 = (var8 / 8 << 8) + var9 / 8; // L: 5787 - - for (var11 = 0; var11 < class21.regions.length; ++var11) { // L: 5788 - if (class21.regions[var11] == var10 && DynamicObject.regionMapArchives[var11] != null) { // L: 5789 - Tiles.method2015(DynamicObject.regionMapArchives[var11], var2, var3 * 8, var4 * 8, var6, (var8 & 7) * 8, (var9 & 7) * 8, var7, ArchiveLoader.scene, Client.collisionMaps); // L: 5790 - break; // L: 5791 - } - } - } - } - } - } - } - - class389.method7094(true); // L: 5799 - class116.playPcmPlayers(); // L: 5800 - GraphicsDefaults.method6939(ArchiveLoader.scene, Client.collisionMaps); // L: 5801 - class389.method7094(true); // L: 5802 - var2 = Tiles.Tiles_minPlane; // L: 5803 - if (var2 > class18.Client_plane) { // L: 5804 - var2 = class18.Client_plane; - } - - if (var2 < class18.Client_plane - 1) { // L: 5805 - var2 = class18.Client_plane - 1; - } - - if (Client.isLowDetail) { // L: 5806 - ArchiveLoader.scene.init(Tiles.Tiles_minPlane); - } else { - ArchiveLoader.scene.init(0); // L: 5807 - } - - for (var3 = 0; var3 < 104; ++var3) { // L: 5808 - for (var4 = 0; var4 < 104; ++var4) { // L: 5809 - UserComparator3.updateItemPile(var3, var4); // L: 5810 - } - } - - class116.playPcmPlayers(); // L: 5813 - class28.method390(); // L: 5814 - ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 5815 - PacketBufferNode var17; - if (class127.client.hasFrame()) { // L: 5816 - var17 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2893, Client.packetWriter.isaacCipher); // L: 5818 - var17.packetBuffer.writeInt(1057001181); // L: 5819 - Client.packetWriter.addNode(var17); // L: 5820 - } - - if (!Client.isInInstance) { // L: 5822 - var3 = (ScriptEvent.field1042 - 6) / 8; // L: 5823 - var4 = (ScriptEvent.field1042 + 6) / 8; // L: 5824 - var5 = (KitDefinition.field1855 - 6) / 8; // L: 5825 - var6 = (KitDefinition.field1855 + 6) / 8; // L: 5826 - - for (var7 = var3 - 1; var7 <= var4 + 1; ++var7) { // L: 5827 - for (var8 = var5 - 1; var8 <= var6 + 1; ++var8) { // L: 5828 - if (var7 < var3 || var7 > var4 || var8 < var5 || var8 > var6) { // L: 5829 - Players.archive5.loadRegionFromName("m" + var7 + "_" + var8); // L: 5830 - Players.archive5.loadRegionFromName("l" + var7 + "_" + var8); // L: 5831 - } - } - } - } - - Decimator.updateGameState(30); // L: 5835 - class116.playPcmPlayers(); // L: 5836 - NPC.method2360(); // L: 5837 - var17 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2973, Client.packetWriter.isaacCipher); // L: 5838 - Client.packetWriter.addNode(var17); // L: 5839 - UserComparator9.method2619(); // L: 5840 - } - } - } // L: 5675 5693 5841 - - @ObfuscatedName("iu") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-825343638" - ) - @Export("Widget_runOnTargetLeave") - static void Widget_runOnTargetLeave() { - if (Client.isSpellSelected) { // L: 9666 - Widget var0 = ItemComposition.getWidgetChild(Timer.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 9667 - if (var0 != null && var0.onTargetLeave != null) { // L: 9668 - ScriptEvent var1 = new ScriptEvent(); // L: 9669 - var1.widget = var0; // L: 9670 - var1.args = var0.onTargetLeave; // L: 9671 - ClanSettings.runScriptEvent(var1); // L: 9672 - } - - Client.selectedSpellItemId = -1; // L: 9674 - Client.isSpellSelected = false; // L: 9675 - class346.invalidateWidget(var0); // L: 9676 - } - } // L: 9677 } diff --git a/runescape-client/src/main/java/FriendsChat.java b/runescape-client/src/main/java/FriendsChat.java index 190f5cdb23..5639ca2812 100644 --- a/runescape-client/src/main/java/FriendsChat.java +++ b/runescape-client/src/main/java/FriendsChat.java @@ -4,282 +4,209 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ns") +@ObfuscatedName("nx") @Implements("FriendsChat") public class FriendsChat extends UserList { - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lpe;" + descriptor = "Lpj;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lnp;" + descriptor = "Lnj;" ) @Export("localUser") final Usernamed localUser; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("name") public String name; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("owner") public String owner; - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("minKick") public byte minKick; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1273194957 + intValue = -546532963 ) @Export("rank") public int rank; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 923261223 + intValue = -335963343 ) - int field4244; + int field4309; @ObfuscatedSignature( - descriptor = "(Lpe;Lnp;)V" + descriptor = "(Lpj;Lnj;)V" ) public FriendsChat(LoginType var1, Usernamed var2) { super(100); // L: 19 this.name = null; // L: 12 this.owner = null; // L: 13 - this.field4244 = 1; // L: 16 + this.field4309 = 1; // L: 16 this.loginType = var1; // L: 20 this.localUser = var2; // L: 21 } // L: 22 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Lnn;", - garbageValue = "-2105397576" + descriptor = "(I)Lnb;", + garbageValue = "-1695844600" ) @Export("newInstance") User newInstance() { - return new ClanMate(); // L: 25 + return new ClanMate(); // L: 26 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(II)[Lnn;", - garbageValue = "1888809026" + descriptor = "(II)[Lnb;", + garbageValue = "1788836658" ) @Export("newTypedArray") User[] newTypedArray(int var1) { - return new ClanMate[var1]; // L: 29 + return new ClanMate[var1]; // L: 31 } - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "106117795" - ) - @Export("readName") - final void readName(String var1) { - long var5 = 0L; // L: 37 - int var7 = var1.length(); // L: 38 - - for (int var8 = 0; var8 < var7; ++var8) { // L: 39 - var5 *= 37L; // L: 40 - char var9 = var1.charAt(var8); // L: 41 - if (var9 >= 'A' && var9 <= 'Z') { // L: 42 - var5 += (long)(var9 + 1 - 65); - } else if (var9 >= 'a' && var9 <= 'z') { // L: 43 - var5 += (long)(var9 + 1 - 97); - } else if (var9 >= '0' && var9 <= '9') { - var5 += (long)(var9 + 27 - 48); // L: 44 - } - - if (var5 >= 177917621779460413L) { // L: 45 - break; - } - } - - while (var5 % 37L == 0L && var5 != 0L) { // L: 47 - var5 /= 37L; - } - - String var10 = class82.base37DecodeLong(var5); // L: 50 - if (var10 == null) { // L: 51 - var10 = ""; - } - - this.name = var10; // L: 54 - } // L: 55 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1333219984" - ) - @Export("setOwner") - final void setOwner(String var1) { - long var5 = 0L; // L: 62 - int var7 = var1.length(); // L: 63 - - for (int var8 = 0; var8 < var7; ++var8) { // L: 64 - var5 *= 37L; // L: 65 - char var9 = var1.charAt(var8); // L: 66 - if (var9 >= 'A' && var9 <= 'Z') { // L: 67 - var5 += (long)(var9 + 1 - 65); - } else if (var9 >= 'a' && var9 <= 'z') { // L: 68 - var5 += (long)(var9 + 1 - 97); - } else if (var9 >= '0' && var9 <= '9') { - var5 += (long)(var9 + 27 - 48); // L: 69 - } - - if (var5 >= 177917621779460413L) { // L: 70 - break; - } - } - - while (0L == var5 % 37L && 0L != var5) { // L: 72 - var5 /= 37L; - } - - String var10 = class82.base37DecodeLong(var5); // L: 75 - if (var10 == null) { // L: 76 - var10 = ""; - } - - this.owner = var10; // L: 79 - } // L: 80 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-896267822" - ) - @Export("readUpdate") - public final void readUpdate(Buffer var1) { - this.setOwner(var1.readStringCp1252NullTerminated()); // L: 83 - long var2 = var1.readLong(); // L: 84 - long var5 = var2; // L: 86 - String var4; - int var7; - if (var2 > 0L && var2 < 6582952005840035281L) { // L: 88 - if (0L == var2 % 37L) { // L: 92 - var4 = null; // L: 93 - } else { - var7 = 0; // L: 96 - - for (long var8 = var2; var8 != 0L; var8 /= 37L) { // L: 97 98 100 - ++var7; // L: 99 - } - - StringBuilder var10 = new StringBuilder(var7); // L: 102 - - while (0L != var5) { // L: 103 - long var11 = var5; // L: 104 - var5 /= 37L; // L: 105 - var10.append(class349.base37Table[(int)(var11 - var5 * 37L)]); // L: 106 - } - - var4 = var10.reverse().toString(); // L: 108 - } - } else { - var4 = null; // L: 89 - } - - this.readName(var4); // L: 110 - this.minKick = var1.readByte(); // L: 111 - var7 = var1.readUnsignedByte(); // L: 112 - if (var7 != 255) { // L: 113 - this.clear(); // L: 114 - - for (int var13 = 0; var13 < var7; ++var13) { // L: 115 - ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 116 - int var14 = var1.readUnsignedShort(); // L: 117 - var9.set(var14, ++this.field4244 - 1); // L: 118 - var9.rank = var1.readByte(); // L: 119 - var1.readStringCp1252NullTerminated(); // L: 120 - this.isLocalPlayer(var9); // L: 121 - } - - } - } // L: 123 - @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-432033095" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1717144210" ) - public final void method6661(Buffer var1) { - Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 126 - int var3 = var1.readUnsignedShort(); // L: 127 - byte var4 = var1.readByte(); // L: 128 - boolean var5 = false; // L: 129 - if (var4 == -128) { // L: 130 + @Export("readName") + final void readName(String var1) { + String var3 = class263.base37DecodeLong(class114.method2626(var1)); // L: 37 + if (var3 == null) { + var3 = ""; // L: 38 + } + + this.name = var3; // L: 41 + } // L: 42 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1165437728" + ) + @Export("setOwner") + final void setOwner(String var1) { + String var3 = class263.base37DecodeLong(class114.method2626(var1)); // L: 47 + if (var3 == null) { + var3 = ""; // L: 48 + } + + this.owner = var3; // L: 51 + } // L: 52 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Lpx;B)V", + garbageValue = "-38" + ) + @Export("readUpdate") + public final void readUpdate(Buffer var1) { + this.setOwner(var1.readStringCp1252NullTerminated()); // L: 55 + long var2 = var1.readLong(); // L: 56 + this.readName(class293.method5431(var2)); // L: 57 + this.minKick = var1.readByte(); // L: 58 + int var4 = var1.readUnsignedByte(); // L: 59 + if (var4 != 255) { // L: 60 + this.clear(); // L: 61 + + for (int var5 = 0; var5 < var4; ++var5) { // L: 62 + ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 63 + int var7 = var1.readUnsignedShort(); // L: 64 + var6.set(var7, ++this.field4309 - 1); // L: 65 + var6.rank = var1.readByte(); // L: 66 + var1.readStringCp1252NullTerminated(); // L: 67 + this.isLocalPlayer(var6); // L: 68 + } + + } + } // L: 70 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lpx;B)V", + garbageValue = "2" + ) + public final void method6463(Buffer var1) { + Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 73 + int var3 = var1.readUnsignedShort(); // L: 74 + byte var4 = var1.readByte(); // L: 75 + boolean var5 = false; // L: 76 + if (var4 == -128) { // L: 77 var5 = true; } ClanMate var6; - if (var5) { // L: 131 - if (this.getSize() == 0) { // L: 132 + if (var5) { // L: 78 + if (this.getSize() == 0) { // L: 79 return; } - var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 133 - if (var6 != null && var6.getWorld() == var3) { // L: 134 - this.remove(var6); // L: 135 + var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 80 + if (var6 != null && var6.getWorld() == var3) { // L: 81 + this.remove(var6); // L: 82 } } else { - var1.readStringCp1252NullTerminated(); // L: 139 - var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 140 - if (var6 == null) { // L: 141 - if (this.getSize() > super.capacity) { // L: 142 + var1.readStringCp1252NullTerminated(); // L: 86 + var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 87 + if (var6 == null) { // L: 88 + if (this.getSize() > super.capacity) { // L: 89 return; } - var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 143 + var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 90 } - var6.set(var3, ++this.field4244 - 1); // L: 145 - var6.rank = var4; // L: 146 - this.isLocalPlayer(var6); // L: 147 + var6.set(var3, ++this.field4309 - 1); // L: 92 + var6.rank = var4; // L: 93 + this.isLocalPlayer(var6); // L: 94 } - } // L: 149 + } // L: 96 - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-990148862" + garbageValue = "-570861245" ) @Export("clearFriends") public final void clearFriends() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 152 - ((ClanMate)this.get(var1)).clearIsFriend(); // L: 153 + for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 99 + ((ClanMate)this.get(var1)).clearIsFriend(); // L: 100 } - } // L: 155 + } // L: 102 - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1742976679" + garbageValue = "-295246975" ) @Export("invalidateIgnoreds") public final void invalidateIgnoreds() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 158 - ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 159 + for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 105 + ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 106 } - } // L: 161 + } // L: 108 - @ObfuscatedName("p") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lne;I)V", - garbageValue = "-103692595" + descriptor = "(Lnm;I)V", + garbageValue = "402509546" ) @Export("isLocalPlayer") final void isLocalPlayer(ClanMate var1) { - if (var1.getUsername().equals(this.localUser.username())) { // L: 164 + if (var1.getUsername().equals(this.localUser.username())) { // L: 111 this.rank = var1.rank; } - } // L: 165 + } // L: 112 } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index baba09a922..4ca338429a 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -3,159 +3,210 @@ 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("nr") +@ObfuscatedName("na") @Implements("FriendsList") public class FriendsList extends UserList { - @ObfuscatedName("i") + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1971678933 + ) + @Export("musicTrackFileId") + public static int musicTrackFileId; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lpe;" + descriptor = "Lpj;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -676332345 + intValue = 1205835661 ) - int field4235; - @ObfuscatedName("b") + int field4299; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llm;" ) @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( - descriptor = "(Lpe;)V" + descriptor = "(Lpj;)V" ) public FriendsList(LoginType var1) { super(400); // L: 18 - this.field4235 = 1; // L: 14 + this.field4299 = 1; // L: 14 this.friendLoginUpdates = new LinkDeque(); // L: 15 this.loginType = var1; // L: 19 } // L: 20 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Lnn;", - garbageValue = "-2105397576" + descriptor = "(I)Lnb;", + garbageValue = "-1695844600" ) @Export("newInstance") User newInstance() { - return new Friend(); // L: 23 + return new Friend(); // L: 24 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(II)[Lnn;", - garbageValue = "1888809026" + descriptor = "(II)[Lnb;", + garbageValue = "1788836658" ) @Export("newTypedArray") User[] newTypedArray(int var1) { - return new Friend[var1]; // L: 27 + return new Friend[var1]; // L: 29 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lqb;ZB)Z", - garbageValue = "-86" + descriptor = "(Lqv;ZB)Z", + garbageValue = "-17" ) @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { - Friend var3 = (Friend)this.getByUsername(var1); // L: 31 + Friend var3 = (Friend)this.getByUsername(var1); // L: 33 if (var3 == null) { - return false; // L: 32 + return false; // L: 34 } else { - return !var2 || var3.world != 0; // L: 33 + return !var2 || var3.world != 0; // L: 35 } } - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "1085083645" + descriptor = "(Lpx;IB)V", + garbageValue = "78" ) @Export("read") public void read(Buffer var1, int var2) { while (true) { - if (var1.offset < var2) { // L: 38 - boolean var3 = var1.readUnsignedByte() == 1; // L: 39 - Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 40 - Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 41 - int var6 = var1.readUnsignedShort(); // L: 42 - int var7 = var1.readUnsignedByte(); // L: 43 - int var8 = var1.readUnsignedByte(); // L: 44 - boolean var9 = (var8 & 2) != 0; // L: 45 - boolean var10 = (var8 & 1) != 0; // L: 46 - if (var6 > 0) { // L: 47 - var1.readStringCp1252NullTerminated(); // L: 48 - var1.readUnsignedByte(); // L: 49 - var1.readInt(); // L: 50 + if (var1.offset < var2) { // L: 40 + boolean var3 = var1.readUnsignedByte() == 1; // L: 41 + Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 42 + Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 43 + int var6 = var1.readUnsignedShort(); // L: 44 + int var7 = var1.readUnsignedByte(); // L: 45 + int var8 = var1.readUnsignedByte(); // L: 46 + boolean var9 = (var8 & 2) != 0; // L: 47 + boolean var10 = (var8 & 1) != 0; // L: 48 + if (var6 > 0) { // L: 49 + var1.readStringCp1252NullTerminated(); // L: 50 + var1.readUnsignedByte(); // L: 51 + var1.readInt(); // L: 52 } - var1.readStringCp1252NullTerminated(); // L: 52 - if (var4 != null && var4.hasCleanName()) { // L: 53 - Friend var11 = (Friend)this.getByCurrentUsername(var4); // L: 54 - if (var3) { // L: 55 - Friend var12 = (Friend)this.getByCurrentUsername(var5); // L: 56 - if (var12 != null && var12 != var11) { // L: 57 - if (var11 != null) { // L: 58 - this.remove(var12); // L: 59 + var1.readStringCp1252NullTerminated(); // L: 54 + if (var4 != null && var4.hasCleanName()) { // L: 55 + Friend var11 = (Friend)this.getByCurrentUsername(var4); // L: 56 + if (var3) { // L: 57 + Friend var12 = (Friend)this.getByCurrentUsername(var5); // L: 58 + if (var12 != null && var12 != var11) { // L: 59 + if (var11 != null) { // L: 60 + this.remove(var12); // L: 61 } else { - var11 = var12; // L: 62 + var11 = var12; // L: 64 } } } - if (var11 != null) { // L: 66 - this.changeName(var11, var4, var5); // L: 67 - if (var6 != var11.world) { // L: 68 - boolean var14 = true; // L: 69 + if (var11 != null) { // L: 68 + this.changeName(var11, var4, var5); // L: 69 + if (var6 != var11.world) { // L: 70 + boolean var14 = true; // L: 71 - for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) { // L: 70 - if (var13.username.equals(var4)) { // L: 71 - if (var6 != 0 && var13.world == 0) { // L: 72 - var13.remove(); // L: 73 - var14 = false; // L: 74 - } else if (var6 == 0 && var13.world != 0) { // L: 76 - var13.remove(); // L: 77 - var14 = false; // L: 78 + for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) { // L: 72 + if (var13.username.equals(var4)) { // L: 73 + if (var6 != 0 && var13.world == 0) { // L: 74 + var13.remove(); // L: 75 + var14 = false; // L: 76 + } else if (var6 == 0 && var13.world != 0) { // L: 78 + var13.remove(); // L: 79 + var14 = false; // L: 80 } } } - if (var14) { // L: 82 + if (var14) { // L: 84 this.friendLoginUpdates.addFirst(new FriendLoginUpdate(var4, var6)); } } } else { - if (this.getSize() >= 400) { // L: 85 + if (this.getSize() >= 400) { // L: 87 continue; } - var11 = (Friend)this.addLast(var4, var5); // L: 86 + var11 = (Friend)this.addLast(var4, var5); // L: 88 } - if (var6 != var11.world) { // L: 89 - var11.int2 = ++this.field4235 - 1; // L: 90 - if (var11.world == -1 && var6 == 0) { // L: 91 - var11.int2 = -(var11.int2 * 859703757) * -1261040891; + if (var6 != var11.world) { // L: 91 + var11.int2 = ++this.field4299 - 1; // L: 92 + if (var11.world == -1 && var6 == 0) { // L: 93 + var11.int2 = -(var11.int2 * -1393296031) * 960063137; } - var11.world = var6; // L: 92 + var11.world = var6; // L: 94 } - var11.rank = var7; // L: 94 - var11.field4237 = var9; // L: 95 - var11.field4236 = var10; // L: 96 - continue; // L: 97 + var11.rank = var7; // L: 96 + var11.field4311 = var9; // L: 97 + var11.field4312 = var10; // L: 98 + continue; // L: 99 } throw new IllegalStateException(); } - this.sort(); // L: 98 - return; // L: 99 + this.sort(); // L: 100 + return; // L: 101 } } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(ILbb;ZB)I", + garbageValue = "8" + ) + static int method6454(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 1101 + if (var0 == ScriptOpcodes.CC_GETX) { // L: 1102 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.x; // L: 1103 + return 1; // L: 1104 + } else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1106 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.y; // L: 1107 + return 1; // L: 1108 + } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1110 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.width; // L: 1111 + return 1; // L: 1112 + } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1114 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.height; // L: 1115 + return 1; // L: 1116 + } else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1118 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1119 + return 1; // L: 1120 + } else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1122 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.parentId; // L: 1123 + return 1; // L: 1124 + } else { + return 2; // L: 1126 + } + } + + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "(ILkd;ZB)V", + garbageValue = "20" + ) + static void method6449(int var0, Coord var1, boolean var2) { + WorldMapArea var3 = MilliClock.getWorldMap().getMapArea(var0); // L: 4737 + int var4 = ModelData0.localPlayer.plane; // L: 4738 + int var5 = (ModelData0.localPlayer.x >> 7) + SecureRandomCallable.baseX; // L: 4739 + int var6 = (ModelData0.localPlayer.y >> 7) + GrandExchangeOfferOwnWorldComparator.baseY; // L: 4740 + Coord var7 = new Coord(var4, var5, var6); // L: 4741 + MilliClock.getWorldMap().method7039(var3, var7, var1, var2); // L: 4742 + } // L: 4743 } diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java index ed476c2991..1dd1f4d386 100644 --- a/runescape-client/src/main/java/GZipDecompressor.java +++ b/runescape-client/src/main/java/GZipDecompressor.java @@ -4,10 +4,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qg") +@ObfuscatedName("qj") @Implements("GZipDecompressor") public class GZipDecompressor { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("inflater") Inflater inflater; @@ -22,10 +22,10 @@ public class GZipDecompressor { this(-1, 1000000, 1000000); // L: 10 } // L: 11 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;[BI)V", - garbageValue = "21631557" + descriptor = "(Lpx;[BI)V", + garbageValue = "-621970666" ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { diff --git a/runescape-client/src/main/java/GameBuild.java b/runescape-client/src/main/java/GameBuild.java index 2c607ca8a3..1bd3c2308b 100644 --- a/runescape-client/src/main/java/GameBuild.java +++ b/runescape-client/src/main/java/GameBuild.java @@ -4,42 +4,39 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kl") +@ObfuscatedName("kt") @Implements("GameBuild") public class GameBuild { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lkt;" ) @Export("LIVE") static final GameBuild LIVE; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lkt;" ) @Export("BUILDLIVE") static final GameBuild BUILDLIVE; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lkt;" ) @Export("RC") static final GameBuild RC; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lkt;" ) @Export("WIP") static final GameBuild WIP; - @ObfuscatedName("dk") - @Export("mouseCam") - static boolean mouseCam; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("name") public final String name; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -21967843 + intValue = -1924800269 ) @Export("buildId") final int buildId; @@ -52,16 +49,17 @@ public class GameBuild { } GameBuild(String var1, int var2) { - this.name = var1; // L: 17 - this.buildId = var2; // L: 18 - } // L: 19 + this.name = var1; // L: 13 + this.buildId = var2; // L: 14 + } // L: 15 - @ObfuscatedName("id") + @ObfuscatedName("kp") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-733827758" + garbageValue = "206667436" ) - static final int method5773() { - return Client.menuOptionsCount - 1; // L: 9844 + static final int method5586() { + float var0 = 200.0F * ((float)class12.clientPreferences.method2225() - 0.5F); // L: 12049 + return 100 - Math.round(var0); // L: 12050 } } diff --git a/runescape-client/src/main/java/GameEngine.java b/runescape-client/src/main/java/GameEngine.java index 89201eaf8f..91b59f8f6b 100644 --- a/runescape-client/src/main/java/GameEngine.java +++ b/runescape-client/src/main/java/GameEngine.java @@ -4,6 +4,7 @@ import java.awt.Container; import java.awt.EventQueue; import java.awt.Frame; import java.awt.Graphics; +import java.awt.Image; import java.awt.Insets; import java.awt.LayoutManager; import java.awt.Rectangle; @@ -24,176 +25,181 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ao") +@ObfuscatedName("aj") @Implements("GameEngine") public abstract class GameEngine extends Applet implements Runnable, FocusListener, WindowListener { - @ObfuscatedName("qj") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lqa;" - ) - @Export("privateChatMode") - static PrivateChatMode privateChatMode; - @ObfuscatedName("uu") - @ObfuscatedGetter( - intValue = 399090461 - ) - @Export("foundItemIndex") - static int foundItemIndex; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lff;" + descriptor = "Lfs;" ) @Export("taskHandler") protected static TaskHandler taskHandler; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lao;" + descriptor = "Laj;" ) @Export("gameEngine") static GameEngine gameEngine; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1669508535 + intValue = 1340668149 ) @Export("GameEngine_redundantStartThreadCount") static int GameEngine_redundantStartThreadCount; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = -5981543505247076235L + longValue = 5444631392140601951L ) @Export("stopTimeMs") static long stopTimeMs; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("isKilled") static boolean isKilled; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 449978353 + intValue = 1364048335 + ) + @Export("gameCyclesToDo") + static int gameCyclesToDo; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -443642851 ) @Export("cycleDurationMillis") static int cycleDurationMillis; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1442597045 + intValue = -266522013 ) @Export("fiveOrOne") static int fiveOrOne; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1121679723 + intValue = 2010044877 ) @Export("fps") protected static int fps; - @ObfuscatedName("k") + @ObfuscatedName("t") @Export("graphicsTickTimes") static long[] graphicsTickTimes; - @ObfuscatedName("m") + @ObfuscatedName("n") @Export("clientTickTimes") static long[] clientTickTimes; - @ObfuscatedName("at") + @ObfuscatedName("ap") + static Image field201; + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1397179313 + intValue = 1165072175 ) - static int field206; - @ObfuscatedName("ad") + static int field202; + @ObfuscatedName("al") + protected static String field206; + @ObfuscatedName("ah") @Export("volatileFocus") static volatile boolean volatileFocus; - @ObfuscatedName("ar") + @ObfuscatedName("ai") @ObfuscatedGetter( - longValue = -4858752129692683603L + longValue = -2931367862207381165L ) @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; - @ObfuscatedName("ap") + @ObfuscatedName("ay") @ObfuscatedGetter( - longValue = -1651553175101575951L + longValue = -8675189738146457979L ) @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; - @ObfuscatedName("cy") - @ObfuscatedGetter( - intValue = -543979185 + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "[Lqr;" ) - public static int field218; - @ObfuscatedName("n") + @Export("worldSelectBackSprites") + static SpritePixels[] worldSelectBackSprites; + @ObfuscatedName("jn") + @ObfuscatedGetter( + intValue = -154619629 + ) + @Export("cameraPitch") + static int cameraPitch; + @ObfuscatedName("m") @Export("hasErrored") boolean hasErrored; - @ObfuscatedName("t") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1855082601 + intValue = 1099544145 ) @Export("contentWidth") protected int contentWidth; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 995503961 + intValue = -1288492019 ) @Export("contentHeight") protected int contentHeight; - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1680473879 + intValue = -278167239 ) @Export("canvasX") int canvasX; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -63361611 + intValue = 1947120919 ) @Export("canvasY") int canvasY; - @ObfuscatedName("h") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 741948317 + intValue = 1170303839 ) - int field205; - @ObfuscatedName("ae") + int field194; + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 1573332371 + intValue = 184457781 ) - int field200; - @ObfuscatedName("aq") + int field195; + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1344171121 + intValue = -1623859667 ) @Export("maxCanvasWidth") int maxCanvasWidth; - @ObfuscatedName("aw") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -337625473 + intValue = 597778211 ) @Export("maxCanvasHeight") int maxCanvasHeight; - @ObfuscatedName("ao") + @ObfuscatedName("aj") @Export("frame") Frame frame; - @ObfuscatedName("aj") + @ObfuscatedName("ae") @Export("canvas") java.awt.Canvas canvas; - @ObfuscatedName("al") + @ObfuscatedName("az") @Export("fullRedraw") volatile boolean fullRedraw; - @ObfuscatedName("an") + @ObfuscatedName("au") @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; - @ObfuscatedName("ay") + @ObfuscatedName("ak") @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; - @ObfuscatedName("ag") + @ObfuscatedName("af") @ObfuscatedGetter( - longValue = 5910881770928839481L + longValue = 4087711299063743833L ) - volatile long field209; - @ObfuscatedName("ab") + volatile long field205; + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "Lj;" ) @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; - @ObfuscatedName("au") + @ObfuscatedName("an") @Export("clipboard") Clipboard clipboard; - @ObfuscatedName("af") + @ObfuscatedName("aw") @Export("eventQueue") final EventQueue eventQueue; @@ -202,25 +208,25 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen GameEngine_redundantStartThreadCount = 0; // L: 43 stopTimeMs = 0L; // L: 44 isKilled = false; // L: 45 - cycleDurationMillis = 20; // L: 48 - fiveOrOne = 1; // L: 49 + cycleDurationMillis = 20; + fiveOrOne = 1; fps = 0; // L: 50 graphicsTickTimes = new long[32]; // L: 53 clientTickTimes = new long[32]; // L: 55 - field206 = 500; // L: 73 + field202 = 500; // L: 73 volatileFocus = true; // L: 82 garbageCollectorLastCollectionTime = -1L; // L: 85 garbageCollectorLastCheckTimeMs = -1L; // L: 86 } protected GameEngine() { - this.hasErrored = false; // L: 46 + this.hasErrored = false; this.canvasX = 0; // L: 59 this.canvasY = 0; // L: 60 this.fullRedraw = true; // L: 71 this.resizeCanvasNextFrame = false; // L: 74 this.isCanvasInvalid = false; // L: 75 - this.field209 = 0L; // L: 76 + this.field205 = 0L; // L: 76 EventQueue var1 = null; // L: 89 try { @@ -230,34 +236,34 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen this.eventQueue = var1; // L: 94 DevicePcmPlayerProvider var2 = new DevicePcmPlayerProvider(); // L: 95 - class384.pcmPlayerProvider = var2; // L: 97 + PcmPlayer.pcmPlayerProvider = var2; // L: 97 } // L: 99 - @ObfuscatedName("f") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1436013377" + garbageValue = "-2144318891" ) @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { // L: 102 - this.method466(); + this.method425(); } this.maxCanvasWidth = var1; // L: 103 this.maxCanvasHeight = var2; // L: 104 } // L: 105 - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;I)V", - garbageValue = "82345296" + descriptor = "(Ljava/lang/Object;B)V", + garbageValue = "-75" ) @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 - class93.method2384(1L); + class241.method4815(1L); } if (var1 != null) { @@ -267,10 +273,10 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } } // L: 111 - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Lfo;", - garbageValue = "-1578740301" + descriptor = "(I)Lfy;", + garbageValue = "709191033" ) @Export("mouseWheel") protected class158 mouseWheel() { @@ -282,283 +288,303 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen return this.mouseWheelHandler; // L: 118 } - @ObfuscatedName("s") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1872048935" + garbageValue = "2000416889" ) @Export("setUpClipboard") protected void setUpClipboard() { this.clipboard = this.getToolkit().getSystemClipboard(); // L: 122 } // L: 123 - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)V", - garbageValue = "109" + garbageValue = "103" ) - protected void method452(String var1) { + protected void method429(String var1) { this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); // L: 126 } // L: 127 - @ObfuscatedName("q") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1077399719" + garbageValue = "-80802515" ) @Export("setUpKeyboard") protected final void setUpKeyboard() { - StudioGame.method5776(); // L: 130 - java.awt.Canvas var1 = this.canvas; // L: 131 - var1.setFocusTraversalKeysEnabled(false); // L: 133 - var1.addKeyListener(KeyHandler.KeyHandler_instance); - var1.addFocusListener(KeyHandler.KeyHandler_instance); // L: 135 - } + if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { // L: 131 + KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 132 + KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 133 + KeyHandler.KeyHandler_keyCodes[188] = 71; // L: 134 + KeyHandler.KeyHandler_keyCodes[189] = 26; // L: 135 + KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 136 + KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 137 + KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 138 + KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 139 + KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 140 + KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 141 + KeyHandler.KeyHandler_keyCodes[222] = 59; // L: 142 + KeyHandler.KeyHandler_keyCodes[223] = 28; // L: 143 + } else { + KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 146 + KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 147 + KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 148 + KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 149 + KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 150 + KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 151 + KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 152 + KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 153 + KeyHandler.KeyHandler_keyCodes[93] = 43; // L: 154 + KeyHandler.KeyHandler_keyCodes[192] = 28; // L: 155 + KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 156 + KeyHandler.KeyHandler_keyCodes[520] = 59; // L: 157 + } - @ObfuscatedName("o") + java.awt.Canvas var1 = this.canvas; // L: 160 + var1.setFocusTraversalKeysEnabled(false); // L: 162 + var1.addKeyListener(KeyHandler.KeyHandler_instance); // L: 163 + var1.addFocusListener(KeyHandler.KeyHandler_instance); // L: 164 + } // L: 166 + + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-41" + garbageValue = "-89" ) - protected final void method428() { - java.awt.Canvas var1 = this.canvas; - var1.addMouseListener(MouseHandler.MouseHandler_instance); - var1.addMouseMotionListener(MouseHandler.MouseHandler_instance); - var1.addFocusListener(MouseHandler.MouseHandler_instance); // L: 144 - } + protected final void method415() { + InvDefinition.method3264(this.canvas); // L: 169 + } // L: 170 - @ObfuscatedName("r") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "825452096" + descriptor = "(B)V", + garbageValue = "-62" ) @Export("resizeCanvas") final void resizeCanvas() { - Container var1 = this.container(); // L: 149 - if (var1 != null) { // L: 150 - Bounds var2 = this.getFrameContentBounds(); // L: 151 - this.contentWidth = Math.max(var2.highX, this.field205); // L: 152 - this.contentHeight = Math.max(var2.highY, this.field200); // L: 153 - if (this.contentWidth <= 0) { // L: 154 + Container var1 = this.container(); // L: 173 + if (var1 != null) { // L: 174 + Bounds var2 = this.getFrameContentBounds(); // L: 175 + this.contentWidth = Math.max(var2.highX, this.field194); // L: 176 + this.contentHeight = Math.max(var2.highY, this.field195); // L: 177 + if (this.contentWidth <= 0) { // L: 178 this.contentWidth = 1; } - if (this.contentHeight <= 0) { // L: 155 + if (this.contentHeight <= 0) { // L: 179 this.contentHeight = 1; } - InvDefinition.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 156 - class321.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 157 - this.canvasX = (this.contentWidth - InvDefinition.canvasWidth) / 2; // L: 158 - this.canvasY = 0; // L: 159 - this.canvas.setSize(InvDefinition.canvasWidth, class321.canvasHeight); // L: 160 - FontName.rasterProvider = new RasterProvider(InvDefinition.canvasWidth, class321.canvasHeight, this.canvas); // L: 161 - if (var1 == this.frame) { // L: 162 - Insets var3 = this.frame.getInsets(); // L: 163 - this.canvas.setLocation(this.canvasX + var3.left, this.canvasY + var3.top); // L: 164 + GraphicsObject.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 180 + class433.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 181 + this.canvasX = (this.contentWidth - GraphicsObject.canvasWidth) / 2; // L: 182 + this.canvasY = 0; // L: 183 + this.canvas.setSize(GraphicsObject.canvasWidth, class433.canvasHeight); // L: 184 + DevicePcmPlayerProvider.rasterProvider = new RasterProvider(GraphicsObject.canvasWidth, class433.canvasHeight, this.canvas); // L: 185 + if (var1 == this.frame) { // L: 186 + Insets var3 = this.frame.getInsets(); // L: 187 + this.canvas.setLocation(var3.left + this.canvasX, var3.top + this.canvasY); // L: 188 } else { - this.canvas.setLocation(this.canvasX, this.canvasY); + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 190 } - this.fullRedraw = true; - this.resizeGame(); + this.fullRedraw = true; // L: 191 + this.resizeGame(); // L: 192 } - } + } // L: 193 - @ObfuscatedName("p") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1462606142" + garbageValue = "-1437501286" ) @Export("resizeGame") protected abstract void resizeGame(); - @ObfuscatedName("w") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-977788049" + garbageValue = "1331148766" ) @Export("clearBackground") void clearBackground() { - int var1 = this.canvasX; // L: 174 - int var2 = this.canvasY; // L: 175 - int var3 = this.contentWidth - InvDefinition.canvasWidth - var1; // L: 176 - int var4 = this.contentHeight - class321.canvasHeight - var2; // L: 177 - if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 178 + int var1 = this.canvasX; // L: 198 + int var2 = this.canvasY; // L: 199 + int var3 = this.contentWidth - GraphicsObject.canvasWidth - var1; // L: 200 + int var4 = this.contentHeight - class433.canvasHeight - var2; // L: 201 + if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 202 try { - Container var5 = this.container(); // L: 180 - int var6 = 0; // L: 181 - int var7 = 0; // L: 182 - if (var5 == this.frame) { // L: 183 - Insets var8 = this.frame.getInsets(); // L: 184 - var6 = var8.left; // L: 185 - var7 = var8.top; // L: 186 + Container var5 = this.container(); // L: 204 + int var6 = 0; // L: 205 + int var7 = 0; // L: 206 + if (var5 == this.frame) { // L: 207 + Insets var8 = this.frame.getInsets(); // L: 208 + var6 = var8.left; // L: 209 + var7 = var8.top; // L: 210 } - Graphics var10 = var5.getGraphics(); // L: 188 - var10.setColor(Color.black); // L: 189 + Graphics var10 = var5.getGraphics(); // L: 212 + var10.setColor(Color.black); // L: 213 if (var1 > 0) { - var10.fillRect(var6, var7, var1, this.contentHeight); // L: 190 + var10.fillRect(var6, var7, var1, this.contentHeight); // L: 214 } - if (var2 > 0) { // L: 191 + if (var2 > 0) { // L: 215 var10.fillRect(var6, var7, this.contentWidth, var2); } - if (var3 > 0) { // L: 192 + if (var3 > 0) { // L: 216 var10.fillRect(var6 + this.contentWidth - var3, var7, var3, this.contentHeight); } - if (var4 > 0) { // L: 193 + if (var4 > 0) { // L: 217 var10.fillRect(var6, var7 + this.contentHeight - var4, this.contentWidth, var4); } - } catch (Exception var9) { // L: 195 + } catch (Exception var9) { // L: 219 } } - } // L: 197 + } // L: 221 - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-125" + garbageValue = "11" ) @Export("replaceCanvas") final void replaceCanvas() { - Renderable.method4928(this.canvas); // L: 200 - java.awt.Canvas var1 = this.canvas; // L: 201 - var1.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 203 - var1.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 204 - var1.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 205 - MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 206 - if (this.mouseWheelHandler != null) { // L: 208 + java.awt.Canvas var1 = this.canvas; // L: 224 + var1.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 226 + var1.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 227 + KeyHandler.field135 = -1; // L: 228 + UserList.method6543(this.canvas); // L: 230 + if (this.mouseWheelHandler != null) { // L: 231 this.mouseWheelHandler.removeFrom(this.canvas); } - this.addCanvas(); // L: 209 - java.awt.Canvas var2 = this.canvas; // L: 210 - var2.setFocusTraversalKeysEnabled(false); // L: 212 - var2.addKeyListener(KeyHandler.KeyHandler_instance); // L: 213 - var2.addFocusListener(KeyHandler.KeyHandler_instance); // L: 214 - java.awt.Canvas var3 = this.canvas; // L: 216 - var3.addMouseListener(MouseHandler.MouseHandler_instance); // L: 218 - var3.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 219 - var3.addFocusListener(MouseHandler.MouseHandler_instance); // L: 220 - if (this.mouseWheelHandler != null) { - this.mouseWheelHandler.addTo(this.canvas); // L: 222 + this.addCanvas(); // L: 232 + java.awt.Canvas var2 = this.canvas; // L: 233 + var2.setFocusTraversalKeysEnabled(false); // L: 235 + var2.addKeyListener(KeyHandler.KeyHandler_instance); // L: 236 + var2.addFocusListener(KeyHandler.KeyHandler_instance); // L: 237 + InvDefinition.method3264(this.canvas); // L: 239 + if (this.mouseWheelHandler != null) { // L: 240 + this.mouseWheelHandler.addTo(this.canvas); } - this.method466(); // L: 223 - } // L: 224 + this.method425(); // L: 241 + } // L: 242 - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "-34" + descriptor = "(IIII)V", + garbageValue = "-1913355803" ) @Export("startThread") protected final void startThread(int var1, int var2, int var3) { try { - if (gameEngine != null) { // L: 228 - ++GameEngine_redundantStartThreadCount; // L: 229 - if (GameEngine_redundantStartThreadCount >= 3) { // L: 230 - this.error("alreadyloaded"); // L: 231 - return; // L: 232 + if (gameEngine != null) { // L: 246 + ++GameEngine_redundantStartThreadCount; // L: 247 + if (GameEngine_redundantStartThreadCount >= 3) { // L: 248 + this.error("alreadyloaded"); // L: 249 + return; // L: 250 } - this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 234 - return; // L: 235 + this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 252 + return; // L: 253 } - gameEngine = this; // L: 237 - InvDefinition.canvasWidth = var1; // L: 238 - class321.canvasHeight = var2; // L: 239 - RunException.RunException_revision = var3; // L: 240 - RunException.RunException_applet = this; // L: 241 - if (taskHandler == null) { // L: 242 + gameEngine = this; // L: 255 + GraphicsObject.canvasWidth = var1; // L: 256 + class433.canvasHeight = var2; // L: 257 + class385.RunException_revision = var3; // L: 258 + RunException.RunException_applet = this; // L: 259 + if (taskHandler == null) { // L: 260 taskHandler = new TaskHandler(); } - taskHandler.newThreadTask(this, 1); // L: 243 - } catch (Exception var5) { // L: 245 - Widget.RunException_sendStackTrace((String)null, var5); // L: 246 - this.error("crash"); // L: 247 + taskHandler.newThreadTask(this, 1); // L: 261 + } catch (Exception var5) { // L: 263 + ArchiveDiskActionHandler.RunException_sendStackTrace((String)null, var5); // L: 264 + this.error("crash"); // L: 265 } - } // L: 249 + } // L: 267 - @ObfuscatedName("m") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2136462097" + garbageValue = "-1076329535" ) @Export("addCanvas") final synchronized void addCanvas() { - Container var1 = this.container(); // L: 252 - if (this.canvas != null) { // L: 253 - this.canvas.removeFocusListener(this); // L: 254 - var1.remove(this.canvas); // L: 255 + Container var1 = this.container(); // L: 270 + if (this.canvas != null) { // L: 271 + this.canvas.removeFocusListener(this); // L: 272 + var1.remove(this.canvas); // L: 273 } - InvDefinition.canvasWidth = Math.max(var1.getWidth(), this.field205); // L: 257 - class321.canvasHeight = Math.max(var1.getHeight(), this.field200); // L: 258 + GraphicsObject.canvasWidth = Math.max(var1.getWidth(), this.field194); // L: 275 + class433.canvasHeight = Math.max(var1.getHeight(), this.field195); // L: 276 Insets var2; - if (this.frame != null) { // L: 259 - var2 = this.frame.getInsets(); // L: 260 - InvDefinition.canvasWidth -= var2.right + var2.left; // L: 261 - class321.canvasHeight -= var2.top + var2.bottom; // L: 262 + if (this.frame != null) { // L: 277 + var2 = this.frame.getInsets(); // L: 278 + GraphicsObject.canvasWidth -= var2.left + var2.right; // L: 279 + class433.canvasHeight -= var2.bottom + var2.top; // L: 280 } - this.canvas = new Canvas(this); // L: 264 - var1.setBackground(Color.BLACK); // L: 265 - var1.setLayout((LayoutManager)null); // L: 266 - var1.add(this.canvas); // L: 267 - this.canvas.setSize(InvDefinition.canvasWidth, class321.canvasHeight); // L: 268 - this.canvas.setVisible(true); // L: 269 - this.canvas.setBackground(Color.BLACK); // L: 270 - if (var1 == this.frame) { // L: 271 - var2 = this.frame.getInsets(); // L: 272 - this.canvas.setLocation(this.canvasX + var2.left, this.canvasY + var2.top); // L: 273 + this.canvas = new Canvas(this); // L: 282 + var1.setBackground(Color.BLACK); // L: 283 + var1.setLayout((LayoutManager)null); // L: 284 + var1.add(this.canvas); // L: 285 + this.canvas.setSize(GraphicsObject.canvasWidth, class433.canvasHeight); // L: 286 + this.canvas.setVisible(true); // L: 287 + this.canvas.setBackground(Color.BLACK); // L: 288 + if (var1 == this.frame) { // L: 289 + var2 = this.frame.getInsets(); // L: 290 + this.canvas.setLocation(this.canvasX + var2.left, this.canvasY + var2.top); // L: 291 } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 275 + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 293 } - this.canvas.addFocusListener(this); // L: 276 - this.canvas.requestFocus(); // L: 277 - this.fullRedraw = true; // L: 278 - if (FontName.rasterProvider != null && InvDefinition.canvasWidth == FontName.rasterProvider.width && class321.canvasHeight == FontName.rasterProvider.height) { // L: 279 - ((RasterProvider)FontName.rasterProvider).setComponent(this.canvas); // L: 280 - FontName.rasterProvider.drawFull(0, 0); // L: 281 + this.canvas.addFocusListener(this); // L: 294 + this.canvas.requestFocus(); // L: 295 + this.fullRedraw = true; // L: 296 + if (DevicePcmPlayerProvider.rasterProvider != null && GraphicsObject.canvasWidth == DevicePcmPlayerProvider.rasterProvider.width && class433.canvasHeight == DevicePcmPlayerProvider.rasterProvider.height) { // L: 297 + ((RasterProvider)DevicePcmPlayerProvider.rasterProvider).setComponent(this.canvas); // L: 298 + DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0); // L: 299 } else { - FontName.rasterProvider = new RasterProvider(InvDefinition.canvasWidth, class321.canvasHeight, this.canvas); // L: 284 + DevicePcmPlayerProvider.rasterProvider = new RasterProvider(GraphicsObject.canvasWidth, class433.canvasHeight, this.canvas); // L: 302 } - this.isCanvasInvalid = false; // L: 286 - this.field209 = class136.method2931(); // L: 287 - } // L: 288 + this.isCanvasInvalid = false; // L: 304 + this.field205 = class113.method2624(); // L: 305 + } // L: 306 - @ObfuscatedName("u") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1626365648" + garbageValue = "-35604355" ) @Export("checkHost") protected final boolean checkHost() { - String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 291 - if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 292 - if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 293 - if (var1.endsWith("127.0.0.1")) { // L: 294 + String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 309 + if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 310 + if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 311 + if (var1.endsWith("127.0.0.1")) { // L: 312 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: 295 + var1 = var1.substring(0, var1.length() - 1); // L: 313 } - if (var1.endsWith("192.168.1.")) { // L: 296 + if (var1.endsWith("192.168.1.")) { // L: 314 return true; } else { - this.error("invalidhost"); // L: 297 - return false; // L: 298 + this.error("invalidhost"); // L: 315 + return false; // L: 316 } } } else { @@ -569,471 +595,432 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } } - @ObfuscatedName("t") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1855362741" + garbageValue = "1177653109" ) @Export("clientTick") void clientTick() { - long var1 = class136.method2931(); // L: 351 - long var3 = clientTickTimes[SoundCache.field311]; // L: 352 - clientTickTimes[SoundCache.field311] = var1; // L: 353 - SoundCache.field311 = SoundCache.field311 + 1 & 31; // L: 354 - if (var3 != 0L && var1 > var3) { // L: 355 + long var1 = class113.method2624(); // L: 360 + long var3 = clientTickTimes[PlayerType.field3985]; // L: 361 + clientTickTimes[PlayerType.field3985] = var1; // L: 362 + PlayerType.field3985 = PlayerType.field3985 + 1 & 31; // L: 363 + if (0L != var3 && var1 > var3) { // L: 364 } - synchronized(this) { // L: 356 - Varcs.hasFocus = volatileFocus; // L: 357 - } // L: 358 + synchronized(this) { // L: 365 + WorldMapArea.hasFocus = volatileFocus; // L: 366 + } // L: 367 - this.doCycle(); // L: 359 - } // L: 360 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "30" - ) - @Export("graphicsTick") - void graphicsTick() { - Container var1 = this.container(); // L: 363 - long var2 = class136.method2931(); // L: 364 - long var4 = graphicsTickTimes[Fonts.field4517]; // L: 365 - graphicsTickTimes[Fonts.field4517] = var2; // L: 366 - Fonts.field4517 = Fonts.field4517 + 1 & 31; // L: 367 - if (0L != var4 && var2 > var4) { // L: 368 - int var6 = (int)(var2 - var4); // L: 369 - fps = ((var6 >> 1) + 32000) / var6; // L: 370 - } - - if (++field206 - 1 > 50) { // L: 372 - field206 -= 50; // L: 373 - this.fullRedraw = true; // L: 374 - this.canvas.setSize(InvDefinition.canvasWidth, class321.canvasHeight); // L: 375 - this.canvas.setVisible(true); // L: 376 - if (var1 == this.frame) { // L: 377 - Insets var7 = this.frame.getInsets(); // L: 378 - this.canvas.setLocation(this.canvasX + var7.left, this.canvasY + var7.top); // L: 379 - } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 381 - } - } - - if (this.isCanvasInvalid) { // L: 383 - this.replaceCanvas(); - } - - this.method438(); // L: 384 - this.draw(this.fullRedraw); // L: 385 - if (this.fullRedraw) { // L: 386 - this.clearBackground(); - } - - this.fullRedraw = false; // L: 387 - } // L: 388 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-20" - ) - final void method438() { - Bounds var1 = this.getFrameContentBounds(); // L: 391 - if (var1.highX != this.contentWidth || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { // L: 392 - this.resizeCanvas(); // L: 393 - this.resizeCanvasNextFrame = false; // L: 394 - } - - } // L: 396 - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1741244290" - ) - final void method466() { - this.resizeCanvasNextFrame = true; // L: 399 - } // L: 400 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1463619182" - ) - @Export("kill") - final synchronized void kill() { - if (!isKilled) { // L: 403 - isKilled = true; // L: 404 - - try { - this.canvas.removeFocusListener(this); // L: 406 - } catch (Exception var5) { // L: 408 - } - - try { - this.kill0(); // L: 410 - } catch (Exception var4) { // L: 412 - } - - if (this.frame != null) { // L: 413 - try { - System.exit(0); // L: 415 - } catch (Throwable var3) { // L: 417 - } - } - - if (taskHandler != null) { // L: 419 - try { - taskHandler.close(); // L: 421 - } catch (Exception var2) { // L: 423 - } - } - - this.vmethod1140(); // L: 425 - } - } // L: 426 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1665364684" - ) - @Export("setUp") - protected abstract void setUp(); - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "612160698" - ) - @Export("doCycle") - protected abstract void doCycle(); - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(ZS)V", - garbageValue = "-8708" - ) - @Export("draw") - protected abstract void draw(boolean var1); - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1364313232" - ) - @Export("kill0") - protected abstract void kill0(); - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;ZB)V", - garbageValue = "40" - ) - @Export("drawInitial") - protected final void drawInitial(int var1, String var2, boolean var3) { - try { - Graphics var4 = this.canvas.getGraphics(); // L: 493 - if (WorldMapArchiveLoader.fontHelvetica13 == null) { // L: 494 - WorldMapArchiveLoader.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 495 - WorldMapSection1.loginScreenFontMetrics = this.canvas.getFontMetrics(WorldMapArchiveLoader.fontHelvetica13); // L: 496 - } - - if (var3) { // L: 498 - var4.setColor(Color.black); // L: 499 - var4.fillRect(0, 0, InvDefinition.canvasWidth, class321.canvasHeight); // L: 500 - } - - Color var5 = new Color(140, 17, 17); // L: 502 - - try { - if (class1.field3 == null) { // L: 504 - class1.field3 = this.canvas.createImage(304, 34); - } - - Graphics var6 = class1.field3.getGraphics(); // L: 505 - var6.setColor(var5); // L: 506 - var6.drawRect(0, 0, 303, 33); // L: 507 - var6.fillRect(2, 2, var1 * 3, 30); // L: 508 - var6.setColor(Color.black); // L: 509 - var6.drawRect(1, 1, 301, 31); // L: 510 - var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 511 - var6.setFont(WorldMapArchiveLoader.fontHelvetica13); // L: 512 - var6.setColor(Color.white); // L: 513 - var6.drawString(var2, (304 - WorldMapSection1.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 514 - var4.drawImage(class1.field3, InvDefinition.canvasWidth / 2 - 152, class321.canvasHeight / 2 - 18, (ImageObserver)null); // L: 515 - } catch (Exception var9) { // L: 517 - int var7 = InvDefinition.canvasWidth / 2 - 152; // L: 518 - int var8 = class321.canvasHeight / 2 - 18; // L: 519 - var4.setColor(var5); // L: 520 - var4.drawRect(var7, var8, 303, 33); // L: 521 - var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 522 - var4.setColor(Color.black); // L: 523 - var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 524 - var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 525 - var4.setFont(WorldMapArchiveLoader.fontHelvetica13); // L: 526 - var4.setColor(Color.white); // L: 527 - var4.drawString(var2, var7 + (304 - WorldMapSection1.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 528 - } - } catch (Exception var10) { // L: 531 - this.canvas.repaint(); // L: 532 - } - - } // L: 534 - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "900281563" - ) - protected final void method520() { - class1.field3 = null; // L: 537 - WorldMapArchiveLoader.fontHelvetica13 = null; // L: 538 - WorldMapSection1.loginScreenFontMetrics = null; // L: 539 - } // L: 540 - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1191491956" - ) - @Export("error") - protected void error(String var1) { - if (!this.hasErrored) { // L: 543 - this.hasErrored = true; // L: 544 - System.out.println("error_game_" + var1); // L: 545 - - try { - this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 547 - } catch (Exception var3) { // L: 549 - } - - } - } // L: 550 - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(B)Ljava/awt/Container;", - garbageValue = "-23" - ) - @Export("container") - Container container() { - return (Container)(this.frame != null ? this.frame : this); // L: 553 - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(S)Lnm;", - garbageValue = "5503" - ) - @Export("getFrameContentBounds") - Bounds getFrameContentBounds() { - Container var1 = this.container(); // L: 558 - int var2 = Math.max(var1.getWidth(), this.field205); // L: 559 - int var3 = Math.max(var1.getHeight(), this.field200); // L: 560 - if (this.frame != null) { // L: 561 - Insets var4 = this.frame.getInsets(); // L: 562 - var2 -= var4.left + var4.right; // L: 563 - var3 -= var4.top + var4.bottom; // L: 564 - } - - return new Bounds(var2, var3); // L: 566 - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "180596017" - ) - @Export("hasFrame") - protected final boolean hasFrame() { - return this.frame != null; // L: 570 - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "111435525" - ) - protected abstract void vmethod1140(); - - public final synchronized void paint(Graphics var1) { - if (this == gameEngine && !isKilled) { // L: 457 - this.fullRedraw = true; // L: 458 - if (class136.method2931() - this.field209 > 1000L) { // L: 459 - Rectangle var2 = var1.getClipBounds(); // L: 460 - if (var2 == null || var2.width >= InvDefinition.canvasWidth && var2.height >= class321.canvasHeight) { - this.isCanvasInvalid = true; // L: 461 - } - } - - } - } // L: 463 - - public final void destroy() { - if (this == gameEngine && !isKilled) { // L: 446 - stopTimeMs = class136.method2931(); // L: 447 - class93.method2384(5000L); // L: 448 - this.kill(); // L: 449 - } - } // L: 450 - - public final void windowActivated(WindowEvent var1) { - } // L: 474 - - public final void start() { - if (this == gameEngine && !isKilled) { // L: 436 - stopTimeMs = 0L; // L: 437 - } - } // L: 438 - - public final void stop() { - if (this == gameEngine && !isKilled) { // L: 441 - stopTimeMs = class136.method2931() + 4000L; // L: 442 - } - } // L: 443 - - public final void update(Graphics var1) { - this.paint(var1); // L: 453 - } // L: 454 - - public final void focusLost(FocusEvent var1) { - volatileFocus = false; // L: 471 - } // L: 472 - - public final void windowClosed(WindowEvent var1) { - } // L: 475 - - public final void windowClosing(WindowEvent var1) { - this.destroy(); // L: 478 - } // L: 479 - - public final void windowDeiconified(WindowEvent var1) { - } // L: 482 - - public final void windowIconified(WindowEvent var1) { - } // L: 483 - - public final void windowOpened(WindowEvent var1) { - } // L: 484 - - public abstract void init(); - - public final void focusGained(FocusEvent var1) { - volatileFocus = true; // L: 466 - this.fullRedraw = true; // L: 467 - } // L: 468 - - public final void windowDeactivated(WindowEvent var1) { - } // L: 481 - - public void run() { - try { - if (TaskHandler.javaVendor != null) { // L: 303 - String var1 = TaskHandler.javaVendor.toLowerCase(); // L: 304 - if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 305 - String var2 = TaskHandler.javaVersion; // L: 306 - 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: 307 - this.error("wrongjava"); // L: 308 - return; // L: 309 - } - - if (var2.startsWith("1.6.0_")) { // L: 311 - int var3; - for (var3 = 6; var3 < var2.length() && WorldMapElement.isDigit(var2.charAt(var3)); ++var3) { // L: 312 313 - } - - String var4 = var2.substring(6, var3); // L: 314 - if (class300.isNumber(var4) && class19.method288(var4) < 10) { // L: 315 - this.error("wrongjava"); // L: 316 - return; // L: 317 - } - } - - fiveOrOne = 5; // L: 320 - } - } - - this.setFocusCycleRoot(true); // L: 323 - this.addCanvas(); // L: 324 - this.setUp(); // L: 325 - - Object var8; - try { - var8 = new NanoClock(); // L: 329 - } catch (Throwable var6) { // L: 331 - var8 = new MilliClock(); // L: 332 - } - - class431.clock = (Clock)var8; // L: 335 - - while (stopTimeMs == 0L || class136.method2931() < stopTimeMs) { // L: 336 - TriBool.gameCyclesToDo = class431.clock.wait(cycleDurationMillis, fiveOrOne); // L: 337 - - for (int var5 = 0; var5 < TriBool.gameCyclesToDo; ++var5) { // L: 338 - this.clientTick(); - } - - this.graphicsTick(); // L: 339 - this.post(this.canvas); // L: 340 - } - } catch (Exception var7) { // L: 343 - Widget.RunException_sendStackTrace((String)null, var7); // L: 344 - this.error("crash"); // L: 345 - } - - this.kill(); // L: 347 - } // L: 348 + this.doCycle(); // L: 368 + } // L: 369 @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1147911593" + garbageValue = "1883267877" ) - @Export("savePreferences") - static void savePreferences() { - AccessFile var0 = null; // L: 134 - - try { - var0 = ModeWhere.getPreferencesFile("", Messages.field1305.name, true); // L: 136 - Buffer var1 = class131.clientPreferences.toBuffer(); // L: 137 - var0.write(var1.array, 0, var1.offset); // L: 138 - } catch (Exception var3) { // L: 140 + @Export("graphicsTick") + void graphicsTick() { + Container var1 = this.container(); // L: 372 + long var2 = class113.method2624(); // L: 373 + long var4 = graphicsTickTimes[ScriptFrame.field449]; // L: 374 + graphicsTickTimes[ScriptFrame.field449] = var2; // L: 375 + ScriptFrame.field449 = ScriptFrame.field449 + 1 & 31; // L: 376 + if (0L != var4 && var2 > var4) { // L: 377 + int var6 = (int)(var2 - var4); // L: 378 + fps = ((var6 >> 1) + 32000) / var6; // L: 379 } - try { - if (var0 != null) { // L: 142 - var0.closeSync(true); // L: 143 + if (++field202 - 1 > 50) { // L: 381 + field202 -= 50; // L: 382 + this.fullRedraw = true; // L: 383 + this.canvas.setSize(GraphicsObject.canvasWidth, class433.canvasHeight); // L: 384 + this.canvas.setVisible(true); // L: 385 + if (var1 == this.frame) { // L: 386 + Insets var7 = this.frame.getInsets(); // L: 387 + this.canvas.setLocation(this.canvasX + var7.left, this.canvasY + var7.top); // L: 388 + } else { + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 390 } - } catch (Exception var2) { // L: 146 } - } // L: 147 + if (this.isCanvasInvalid) { // L: 392 + this.replaceCanvas(); + } + + this.method424(); // L: 393 + this.draw(this.fullRedraw); // L: 394 + if (this.fullRedraw) { // L: 395 + this.clearBackground(); + } + + this.fullRedraw = false; // L: 396 + } // L: 397 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "33" + ) + final void method424() { + Bounds var1 = this.getFrameContentBounds(); // L: 400 + if (var1.highX != this.contentWidth || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { // L: 401 + this.resizeCanvas(); // L: 402 + this.resizeCanvasNextFrame = false; // L: 403 + } + + } // L: 405 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1201403905" + ) + final void method425() { + this.resizeCanvasNextFrame = true; // L: 408 + } // L: 409 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "8" + ) + @Export("kill") + final synchronized void kill() { + if (!isKilled) { // L: 412 + isKilled = true; // L: 413 + + try { + this.canvas.removeFocusListener(this); // L: 415 + } catch (Exception var5) { // L: 417 + } + + try { + this.kill0(); // L: 419 + } catch (Exception var4) { // L: 421 + } + + if (this.frame != null) { // L: 422 + try { + System.exit(0); // L: 424 + } catch (Throwable var3) { // L: 426 + } + } + + if (taskHandler != null) { // L: 428 + try { + taskHandler.close(); // L: 430 + } catch (Exception var2) { // L: 432 + } + } + + this.vmethod1448(); // L: 434 + } + } // L: 435 @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1079114439" + descriptor = "(S)V", + garbageValue = "-1311" ) - static final void method569(String var0) { - PacketBufferNode var1 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2912, Client.packetWriter.isaacCipher); // L: 165 - var1.packetBuffer.writeByte(class425.stringCp1252NullTerminatedByteSize(var0)); // L: 166 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 167 - Client.packetWriter.addNode(var1); // L: 168 - } // L: 169 + @Export("setUp") + protected abstract void setUp(); - @ObfuscatedName("bj") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(ILks;ZI)V", - garbageValue = "1109556006" + descriptor = "(I)V", + garbageValue = "-772264838" ) - static void method570(int var0, Coord var1, boolean var2) { - WorldMapArea var3 = class21.getWorldMap().getMapArea(var0); // L: 4737 - int var4 = GrandExchangeEvents.localPlayer.plane; // L: 4738 - int var5 = (GrandExchangeEvents.localPlayer.x >> 7) + GrandExchangeOfferOwnWorldComparator.baseX; // L: 4739 - int var6 = (GrandExchangeEvents.localPlayer.y >> 7) + VarcInt.baseY; // L: 4740 - Coord var7 = new Coord(var4, var5, var6); // L: 4741 - class21.getWorldMap().method7231(var3, var7, var1, var2); // L: 4742 - } // L: 4743 + @Export("doCycle") + protected abstract void doCycle(); + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-375798495" + ) + @Export("draw") + protected abstract void draw(boolean var1); + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-31" + ) + @Export("kill0") + protected abstract void kill0(); + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;ZB)V", + garbageValue = "30" + ) + @Export("drawInitial") + protected final void drawInitial(int var1, String var2, boolean var3) { + try { + Graphics var4 = this.canvas.getGraphics(); // L: 521 + if (class119.fontHelvetica13 == null) { // L: 522 + class119.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 523 + class135.loginScreenFontMetrics = this.canvas.getFontMetrics(class119.fontHelvetica13); // L: 524 + } + + if (var3) { // L: 526 + var4.setColor(Color.black); // L: 527 + var4.fillRect(0, 0, GraphicsObject.canvasWidth, class433.canvasHeight); // L: 528 + } + + Color var5 = new Color(140, 17, 17); // L: 530 + + try { + if (field201 == null) { // L: 532 + field201 = this.canvas.createImage(304, 34); + } + + Graphics var6 = field201.getGraphics(); // L: 533 + var6.setColor(var5); // L: 534 + var6.drawRect(0, 0, 303, 33); // L: 535 + var6.fillRect(2, 2, var1 * 3, 30); // L: 536 + var6.setColor(Color.black); // L: 537 + var6.drawRect(1, 1, 301, 31); // L: 538 + var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 539 + var6.setFont(class119.fontHelvetica13); // L: 540 + var6.setColor(Color.white); // L: 541 + var6.drawString(var2, (304 - class135.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 542 + var4.drawImage(field201, GraphicsObject.canvasWidth / 2 - 152, class433.canvasHeight / 2 - 18, (ImageObserver)null); // L: 543 + } catch (Exception var9) { // L: 545 + int var7 = GraphicsObject.canvasWidth / 2 - 152; // L: 546 + int var8 = class433.canvasHeight / 2 - 18; // L: 547 + var4.setColor(var5); // L: 548 + var4.drawRect(var7, var8, 303, 33); // L: 549 + var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 550 + var4.setColor(Color.black); // L: 551 + var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 552 + var4.fillRect(var7 + var1 * 3 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 553 + var4.setFont(class119.fontHelvetica13); // L: 554 + var4.setColor(Color.white); // L: 555 + var4.drawString(var2, var7 + (304 - class135.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 556 + } + } catch (Exception var10) { // L: 559 + this.canvas.repaint(); // L: 560 + } + + } // L: 562 + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "109" + ) + protected final void method438() { + field201 = null; // L: 565 + class119.fontHelvetica13 = null; // L: 566 + class135.loginScreenFontMetrics = null; // L: 567 + } // L: 568 + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1946007584" + ) + @Export("error") + protected void error(String var1) { + if (!this.hasErrored) { // L: 571 + this.hasErrored = true; // L: 572 + System.out.println("error_game_" + var1); // L: 573 + + try { + this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 575 + } catch (Exception var3) { // L: 577 + } + + } + } // L: 578 + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(B)Ljava/awt/Container;", + garbageValue = "116" + ) + @Export("container") + Container container() { + return (Container)(this.frame != null ? this.frame : this); // L: 581 + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(I)Lne;", + garbageValue = "-836413334" + ) + @Export("getFrameContentBounds") + Bounds getFrameContentBounds() { + Container var1 = this.container(); // L: 586 + int var2 = Math.max(var1.getWidth(), this.field194); // L: 587 + int var3 = Math.max(var1.getHeight(), this.field195); // L: 588 + if (this.frame != null) { // L: 589 + Insets var4 = this.frame.getInsets(); // L: 590 + var2 -= var4.right + var4.left; // L: 591 + var3 -= var4.bottom + var4.top; // L: 592 + } + + return new Bounds(var2, var3); // L: 594 + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-2076672136" + ) + @Export("hasFrame") + protected final boolean hasFrame() { + return this.frame != null; // L: 598 + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-9" + ) + protected abstract void vmethod1448(); + + public final void destroy() { + if (this == gameEngine && !isKilled) { // L: 458 + stopTimeMs = class113.method2624(); // L: 459 + class241.method4815(5000L); // L: 460 + this.kill(); // L: 461 + } + } // L: 462 + + public final synchronized void paint(Graphics var1) { + if (this == gameEngine && !isKilled) { // L: 471 + this.fullRedraw = true; // L: 472 + if (class113.method2624() - this.field205 > 1000L) { // L: 473 + Rectangle var2 = var1.getClipBounds(); // L: 474 + if (var2 == null || var2.width >= GraphicsObject.canvasWidth && var2.height >= class433.canvasHeight) { + this.isCanvasInvalid = true; // L: 475 + } + } + + } + } // L: 477 + + public final void windowActivated(WindowEvent var1) { + } // L: 491 + + public void run() { + try { + if (TaskHandler.javaVendor != null) { // L: 321 + String var1 = TaskHandler.javaVendor.toLowerCase(); // L: 322 + if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 323 + String var2 = TaskHandler.javaVersion; // L: 324 + 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: 325 + this.error("wrongjava"); // L: 326 + return; // L: 327 + } + + if (var2.startsWith("1.6.0_")) { // L: 329 + int var3; + for (var3 = 6; var3 < var2.length() && Coord.isDigit(var2.charAt(var3)); ++var3) { // L: 330 331 + } + + String var4 = var2.substring(6, var3); // L: 332 + if (NetFileRequest.isNumber(var4) && class92.method2373(var4) < 10) { // L: 333 + this.error("wrongjava"); // L: 334 + return; // L: 335 + } + } + + fiveOrOne = 5; // L: 338 + } + } + + this.setFocusCycleRoot(true); // L: 341 + this.addCanvas(); // L: 342 + this.setUp(); // L: 343 + UserComparator5.clock = class221.method4408(); // L: 344 + + while (stopTimeMs == 0L || class113.method2624() < stopTimeMs) { // L: 345 + gameCyclesToDo = UserComparator5.clock.wait(cycleDurationMillis, fiveOrOne); // L: 346 + + for (int var5 = 0; var5 < gameCyclesToDo; ++var5) { // L: 347 + this.clientTick(); + } + + this.graphicsTick(); // L: 348 + this.post(this.canvas); // L: 349 + } + } catch (Exception var6) { // L: 352 + ArchiveDiskActionHandler.RunException_sendStackTrace((String)null, var6); // L: 353 + this.error("crash"); // L: 354 + } + + this.kill(); // L: 356 + } // L: 357 + + public final void stop() { + if (this == gameEngine && !isKilled) { // L: 452 + stopTimeMs = class113.method2624() + 4000L; // L: 453 + } + } // L: 454 + + public final void update(Graphics var1) { + this.paint(var1); // L: 466 + } // L: 467 + + public final void focusGained(FocusEvent var1) { + volatileFocus = true; // L: 481 + this.fullRedraw = true; // L: 482 + } // L: 483 + + public final void windowClosing(WindowEvent var1) { + this.destroy(); // L: 498 + } // L: 499 + + public final void windowDeactivated(WindowEvent var1) { + } // L: 502 + + public final void windowDeiconified(WindowEvent var1) { + } // L: 505 + + public final void windowOpened(WindowEvent var1) { + } // L: 511 + + public final void focusLost(FocusEvent var1) { + volatileFocus = false; // L: 487 + } // L: 488 + + public final void windowClosed(WindowEvent var1) { + } // L: 494 + + public final void start() { + if (this == gameEngine && !isKilled) { // L: 446 + stopTimeMs = 0L; // L: 447 + } + } // L: 448 + + public final void windowIconified(WindowEvent var1) { + } // L: 508 + + public abstract void init(); + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Llp;Llp;Llp;I)V", + garbageValue = "-1740830707" + ) + public static void method505(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { + HitSplatDefinition.HitSplatDefinition_archive = var0; // L: 46 + ModelData0.field2654 = var1; // L: 47 + class1.HitSplatDefinition_fontsArchive = var2; // L: 48 + } // L: 49 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-24396542" + ) + public static int method555(int var0) { + return class402.field4444[var0 & 16383]; // L: 33 + } } diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index f4d85f3651..8597edcfdd 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -4,89 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iy") +@ObfuscatedName("hx") @Implements("GameObject") public final class GameObject { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1042326033 + intValue = -942035955 ) @Export("plane") int plane; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1852780791 + intValue = -97756121 ) @Export("z") int z; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1035014481 + intValue = 174940337 ) @Export("centerX") int centerX; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -491615683 + intValue = 474371985 ) @Export("centerY") int centerY; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Lgx;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 949419433 + intValue = -178209059 ) @Export("orientation") int orientation; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 341581995 + intValue = 1571383405 ) @Export("startX") int startX; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1189496713 + intValue = -1260565151 ) @Export("endX") int endX; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 897314371 + intValue = 1892090883 ) @Export("startY") int startY; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1130692301 + intValue = 1693444283 ) @Export("endY") int endY; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -278227507 + intValue = -986708627 ) - int field2865; - @ObfuscatedName("p") + int field2697; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 946452763 + intValue = -24170279 ) @Export("lastDrawn") int lastDrawn; @ObfuscatedName("w") @ObfuscatedGetter( - longValue = 3413023011063757331L + longValue = 9002525375587932575L ) @Export("tag") public long tag; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -742925927 + intValue = -304681645 ) @Export("flags") int flags; @@ -96,56 +96,79 @@ public final class GameObject { this.flags = 0; // L: 17 } // L: 19 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IIII)Lbd;", - garbageValue = "1018035869" + descriptor = "(IIIB)Lbb;", + garbageValue = "1" ) @Export("getWorldMapScript") static Script getWorldMapScript(int var0, int var1, int var2) { - int var3 = TileItem.method2393(var1, var0); // L: 38 - Script var4 = UserComparator5.method2600(var3, var0); // L: 39 - if (var4 != null) { // L: 40 - return var4; // L: 41 + int var3 = PcmPlayer.method744(var1, var0); // L: 38 + Script var5 = (Script)Script.Script_cached.get((long)(var3 << 16)); // L: 41 + Script var4; + if (var5 != null) { // L: 42 + var4 = var5; // L: 43 } else { - int var5 = (-3 - var2 << 8) + var0; // L: 45 - var4 = UserComparator5.method2600(var5, var0); // L: 48 - return var4 != null ? var4 : null; // L: 49 52 - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(IIIZIB)J", - garbageValue = "119" - ) - @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: 69 - if (var3) { // L: 70 - var5 |= 65536L; - } - - return var5; // L: 71 - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "329658125" - ) - static int method5111(int var0, Script var1, boolean var2) { - if (var0 != 3700 && var0 != 3701) { // L: 2697 - if (var0 == 3702) { // L: 2702 - ++Interpreter.Interpreter_intStackSize; // L: 2703 - return 1; // L: 2704 + String var6 = String.valueOf(var3); // L: 46 + int var7 = class115.archive12.getGroupId(var6); // L: 47 + if (var7 == -1) { // L: 48 + var4 = null; // L: 49 } else { - return 2; // L: 2706 + label59: { + byte[] var8 = class115.archive12.takeFileFlat(var7); // L: 52 + if (var8 != null) { // L: 53 + if (var8.length <= 1) { // L: 54 + var4 = null; // L: 55 + break label59; // L: 56 + } + + var5 = PcmPlayer.newScript(var8); // L: 58 + if (var5 != null) { // L: 59 + Script.Script_cached.put(var5, (long)(var3 << 16)); // L: 60 + var4 = var5; // L: 61 + break label59; // L: 62 + } + } + + var4 = null; // L: 65 + } } + } + + if (var4 != null) { // L: 68 + return var4; // L: 69 } else { - --Interpreter.Interpreter_intStackSize; // L: 2698 - --class122.Interpreter_stringStackSize; // L: 2699 - return 1; // L: 2700 + int var12 = (-3 - var2 << 8) + var0; // L: 73 + Script var14 = (Script)Script.Script_cached.get((long)(var12 << 16)); // L: 78 + Script var13; + if (var14 != null) { // L: 79 + var13 = var14; // L: 80 + } else { + String var9 = String.valueOf(var12); // L: 83 + int var10 = class115.archive12.getGroupId(var9); // L: 84 + if (var10 == -1) { // L: 85 + var13 = null; // L: 86 + } else { + byte[] var11 = class115.archive12.takeFileFlat(var10); // L: 89 + if (var11 != null) { // L: 90 + if (var11.length <= 1) { // L: 91 + var13 = null; // L: 92 + return var13 != null ? var13 : null; // L: 105 108 + } + + var14 = PcmPlayer.newScript(var11); // L: 95 + if (var14 != null) { // L: 96 + Script.Script_cached.put(var14, (long)(var12 << 16)); // L: 97 + var13 = var14; // L: 98 + return var13 != null ? var13 : null; + } + } + + var13 = null; // L: 102 + } + } + + return var13 != null ? var13 : null; } } } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index 4fbae5432e..a79347382c 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -4,42 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lc") +@ObfuscatedName("ln") @Implements("GrandExchangeEvent") public class GrandExchangeEvent { - @ObfuscatedName("kd") - @ObfuscatedSignature( - descriptor = "Lky;" - ) - @Export("hoveredItemContainer") - static Widget hoveredItemContainer; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 2120306507 + intValue = -1128323951 + ) + @Export("pcmSampleLength") + public static int pcmSampleLength; + @ObfuscatedName("ff") + @ObfuscatedGetter( + intValue = 1608944815 + ) + @Export("js5Port") + static int js5Port; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1027306067 ) @Export("world") public final int world; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - longValue = 4339962193294531453L + longValue = -6905147980507584697L ) @Export("age") public final long age; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Lly;" ) @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("offerName") String offerName; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("previousOfferName") String previousOfferName; @ObfuscatedSignature( - descriptor = "(Lpi;BI)V" + descriptor = "(Lpx;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.offerName = var1.readStringCp1252NullTerminated(); // L: 111 @@ -49,8 +55,8 @@ public class GrandExchangeEvent { int var4 = var1.readInt(); // L: 115 int var5 = var1.readInt(); // L: 116 this.grandExchangeOffer = new GrandExchangeOffer(); // L: 117 - this.grandExchangeOffer.method6018(2); // L: 118 - this.grandExchangeOffer.method6025(var2); // L: 119 + this.grandExchangeOffer.method5823(2); // L: 118 + this.grandExchangeOffer.method5826(var2); // L: 119 this.grandExchangeOffer.unitPrice = var4; // L: 120 this.grandExchangeOffer.totalQuantity = var5; // L: 121 this.grandExchangeOffer.currentQuantity = 0; // L: 122 @@ -58,20 +64,20 @@ public class GrandExchangeEvent { this.grandExchangeOffer.id = var3; // L: 124 } // L: 125 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1933113552" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "123" ) @Export("getOfferName") public String getOfferName() { return this.offerName; // L: 128 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-2144874603" + garbageValue = "-744625642" ) @Export("getPreviousOfferName") public String getPreviousOfferName() { diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 3e227ac765..9bfe5d7658 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -7,28 +7,25 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lu") +@ObfuscatedName("lb") @Implements("GrandExchangeEvents") public class GrandExchangeEvents { - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("GrandExchangeEvents_quantityComparator") public static Comparator GrandExchangeEvents_quantityComparator; - @ObfuscatedName("lp") - @ObfuscatedSignature( - descriptor = "Lcz;" - ) - @Export("localPlayer") - static Player localPlayer; - @ObfuscatedName("v") + @ObfuscatedName("n") + @Export("ByteArrayPool_altSizeArrayCounts") + static int[] ByteArrayPool_altSizeArrayCounts; + @ObfuscatedName("o") @Export("events") public final List events; @@ -41,7 +38,7 @@ public class GrandExchangeEvents { } // L: 67 @ObfuscatedSignature( - descriptor = "(Lpi;Z)V", + descriptor = "(Lpx;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { @@ -63,10 +60,10 @@ public class GrandExchangeEvents { } // L: 92 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Ljava/util/Comparator;ZI)V", - garbageValue = "-1621230645" + garbageValue = "1290370117" ) @Export("sort") public void sort(Comparator var1, boolean var2) { diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index 54ce9d075d..5d9df08f8f 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -4,42 +4,39 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lh") +@ObfuscatedName("ly") @Implements("GrandExchangeOffer") public class GrandExchangeOffer { - @ObfuscatedName("z") - @Export("BZip2Decompressor_block") - static int[] BZip2Decompressor_block; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("state") byte state; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 882617765 + intValue = -1429288873 ) @Export("id") public int id; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 274655921 + intValue = 708150215 ) @Export("unitPrice") public int unitPrice; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1718567641 + intValue = -1969215889 ) @Export("totalQuantity") public int totalQuantity; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 781050121 + intValue = 1702065649 ) @Export("currentQuantity") public int currentQuantity; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1429654689 + intValue = 2023629729 ) @Export("currentPrice") public int currentPrice; @@ -48,7 +45,7 @@ public class GrandExchangeOffer { } // L: 13 @ObfuscatedSignature( - descriptor = "(Lpi;Z)V", + descriptor = "(Lpx;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { @@ -60,55 +57,46 @@ public class GrandExchangeOffer { this.currentPrice = var1.readInt(); // L: 21 } // L: 22 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "3324" + descriptor = "(I)I", + garbageValue = "284680094" ) @Export("status") public int status() { return this.state & 7; // L: 50 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "126" + garbageValue = "17" ) @Export("type") public int type() { return (this.state & 8) == 8 ? 1 : 0; // L: 54 } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "659147953" + garbageValue = "585573305" ) - void method6018(int var1) { + void method5823(int var1) { this.state &= -8; // L: 58 this.state = (byte)(this.state | var1 & 7); // L: 59 } // L: 60 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1485129862" + garbageValue = "-1891202738" ) - void method6025(int var1) { + void method5826(int var1) { this.state &= -9; // L: 63 if (var1 == 1) { this.state = (byte)(this.state | 8); // L: 64 } } // L: 65 - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "41" - ) - static int method6032(int var0) { - return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); // L: 3837 - } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index e7acaf0de2..1cc3bb450b 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -1,22 +1,23 @@ import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lq") +@ObfuscatedName("lw") @Implements("GrandExchangeOfferAgeComparator") final class GrandExchangeOfferAgeComparator implements Comparator { - @ObfuscatedName("km") - @ObfuscatedSignature( - descriptor = "Lky;" + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -569064403 ) - static Widget field4011; + static int field4072; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Llc;Llc;B)I", - garbageValue = "1" + descriptor = "(Lln;Lln;I)I", + garbageValue = "1626653530" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -24,10 +25,119 @@ final class GrandExchangeOfferAgeComparator implements Comparator { } public boolean equals(Object var1) { - return super.equals(var1); // L: 21 + return super.equals(var1); } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 17 + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "([FIFZFZ[FI)I", + garbageValue = "-1890109041" + ) + public static int method5798(float[] var0, int var1, float var2, boolean var3, float var4, boolean var5, float[] var6) { + float var7 = 0.0F; // L: 15 + + for (int var8 = 0; var8 < var1 + 1; ++var8) { // L: 16 + var7 += Math.abs(var0[var8]); // L: 17 + } + + float var24 = (Math.abs(var2) + Math.abs(var4)) * (float)(var1 + 1) * class114.field1435; // L: 19 + if (var7 <= var24) { // L: 20 + return -1; // L: 21 + } else { + float[] var9 = new float[var1 + 1]; // L: 23 + + int var10; + for (var10 = 0; var10 < var1 + 1; ++var10) { // L: 24 + var9[var10] = 1.0F / var7 * var0[var10]; // L: 25 + } + + while (Math.abs(var9[var1]) < var24) { // L: 27 + --var1; // L: 28 + } + + var10 = 0; // L: 30 + if (var1 == 0) { // L: 31 + return var10; // L: 32 + } else if (var1 == 1) { // L: 34 + var6[0] = -var9[0] / var9[1]; // L: 35 + boolean var22 = var3 ? var2 < var24 + var6[0] : var2 < var6[0] - var24; // L: 36 + boolean var23 = var5 ? var4 > var6[0] - var24 : var4 > var6[0] + var24; // L: 37 + var10 = var22 && var23 ? 1 : 0; // L: 38 + if (var10 > 0) { // L: 39 + if (var3 && var6[0] < var2) { // L: 40 + var6[0] = var2; // L: 41 + } else if (var5 && var6[0] > var4) { // L: 43 + var6[0] = var4; // L: 44 + } + } + + return var10; // L: 47 + } else { + class390 var11 = new class390(var9, var1); // L: 50 + float[] var12 = new float[var1 + 1]; // L: 51 + + for (int var13 = 1; var13 <= var1; ++var13) { // L: 52 + var12[var13 - 1] = (float)var13 * var9[var13]; // L: 53 + } + + float[] var21 = new float[var1 + 1]; // L: 55 + int var14 = method5798(var12, var1 - 1, var2, false, var4, false, var21); // L: 56 + if (var14 == -1) { // L: 57 + return 0; // L: 58 + } else { + boolean var15 = false; // L: 60 + float var17 = 0.0F; // L: 62 + float var18 = 0.0F; // L: 63 + float var19 = 0.0F; // L: 64 + + for (int var20 = 0; var20 <= var14; ++var20) { // L: 65 + if (var10 > var1) { // L: 66 + return var10; + } + + float var16; + if (var20 == 0) { // L: 67 + var16 = var2; // L: 68 + var18 = Ignored.method6616(var9, var1, var2); // L: 69 + if (Math.abs(var18) <= var24 && var3) { // L: 70 + var6[var10++] = var2; + } + } else { + var16 = var19; // L: 73 + var18 = var17; // L: 74 + } + + if (var20 == var14) { // L: 76 + var19 = var4; // L: 77 + var15 = false; // L: 78 + } else { + var19 = var21[var20]; // L: 81 + } + + var17 = Ignored.method6616(var9, var1, var19); // L: 83 + if (var15) { // L: 84 + var15 = false; // L: 85 + } else if (Math.abs(var17) < var24) { // L: 88 + if (var20 != var14 || var5) { // L: 89 + var6[var10++] = var19; // L: 90 + var15 = true; // L: 91 + } + } else if (var18 < 0.0F && var17 > 0.0F || var18 > 0.0F && var17 < 0.0F) { // L: 94 + var6[var10++] = ReflectionCheck.method601(var11, var16, var19, 0.0F); // L: 95 + if (var10 > 1 && var6[var10 - 2] >= var6[var10 - 1] - var24) { // L: 96 + var6[var10 - 2] = (var6[var10 - 1] + var6[var10 - 2]) * 0.5F; // L: 97 + --var10; // L: 98 + } + } + } + + return var10; // L: 104 + } + } + } } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index 2039b0f366..4806530cda 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -3,29 +3,460 @@ 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("li") +@ObfuscatedName("la") @Implements("GrandExchangeOfferNameComparator") final class GrandExchangeOfferNameComparator implements Comparator { - @ObfuscatedName("f") - @Export("Interpreter_intLocals") - static int[] Interpreter_intLocals; - - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Llc;Llc;B)I", - garbageValue = "-86" + descriptor = "(Lln;Lln;I)I", + garbageValue = "-271291039" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.getOfferName().compareTo(var2.getOfferName()); // L: 56 + return var1.getOfferName().compareTo(var2.getOfferName()); } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 60 + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } public boolean equals(Object var1) { - return super.equals(var1); // L: 64 + return super.equals(var1); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;Llq;II)Ljm;", + garbageValue = "-1715525516" + ) + public static PacketBufferNode method5784(int var0, String var1, Language var2, int var3) { + PacketBufferNode var4 = WallDecoration.getPacketBufferNode(ClientPacket.field2973, Client.packetWriter.isaacCipher); // L: 17 + var4.packetBuffer.writeByte(0); // L: 18 + int var5 = var4.packetBuffer.offset; // L: 19 + var4.packetBuffer.writeByte(var0); // L: 20 + String var6 = var1.toLowerCase(); // L: 21 + byte var7 = 0; // L: 22 + if (var6.startsWith("yellow:")) { // L: 23 + var7 = 0; // L: 24 + var1 = var1.substring("yellow:".length()); // L: 25 + } else if (var6.startsWith("red:")) { // L: 27 + var7 = 1; // L: 28 + var1 = var1.substring("red:".length()); // L: 29 + } else if (var6.startsWith("green:")) { // L: 31 + var7 = 2; // L: 32 + var1 = var1.substring("green:".length()); // L: 33 + } else if (var6.startsWith("cyan:")) { // L: 35 + var7 = 3; // L: 36 + var1 = var1.substring("cyan:".length()); // L: 37 + } else if (var6.startsWith("purple:")) { // L: 39 + var7 = 4; // L: 40 + var1 = var1.substring("purple:".length()); // L: 41 + } else if (var6.startsWith("white:")) { // L: 43 + var7 = 5; // L: 44 + var1 = var1.substring("white:".length()); // L: 45 + } else if (var6.startsWith("flash1:")) { // L: 47 + var7 = 6; // L: 48 + var1 = var1.substring("flash1:".length()); // L: 49 + } else if (var6.startsWith("flash2:")) { // L: 51 + var7 = 7; // L: 52 + var1 = var1.substring("flash2:".length()); // L: 53 + } else if (var6.startsWith("flash3:")) { // L: 55 + var7 = 8; // L: 56 + var1 = var1.substring("flash3:".length()); // L: 57 + } else if (var6.startsWith("glow1:")) { // L: 59 + var7 = 9; // L: 60 + var1 = var1.substring("glow1:".length()); // L: 61 + } else if (var6.startsWith("glow2:")) { // L: 63 + var7 = 10; // L: 64 + var1 = var1.substring("glow2:".length()); // L: 65 + } else if (var6.startsWith("glow3:")) { // L: 67 + var7 = 11; // L: 68 + var1 = var1.substring("glow3:".length()); // L: 69 + } else if (var2 != Language.Language_EN) { // L: 71 + if (var6.startsWith("yellow:")) { + var7 = 0; // L: 73 + var1 = var1.substring("yellow:".length()); // L: 74 + } else if (var6.startsWith("red:")) { // L: 76 + var7 = 1; // L: 77 + var1 = var1.substring("red:".length()); // L: 78 + } else if (var6.startsWith("green:")) { // L: 80 + var7 = 2; // L: 81 + var1 = var1.substring("green:".length()); // L: 82 + } else if (var6.startsWith("cyan:")) { // L: 84 + var7 = 3; // L: 85 + var1 = var1.substring("cyan:".length()); // L: 86 + } else if (var6.startsWith("purple:")) { // L: 88 + var7 = 4; // L: 89 + var1 = var1.substring("purple:".length()); // L: 90 + } else if (var6.startsWith("white:")) { // L: 92 + var7 = 5; // L: 93 + var1 = var1.substring("white:".length()); // L: 94 + } else if (var6.startsWith("flash1:")) { // L: 96 + var7 = 6; // L: 97 + var1 = var1.substring("flash1:".length()); // L: 98 + } else if (var6.startsWith("flash2:")) { // L: 100 + var7 = 7; // L: 101 + var1 = var1.substring("flash2:".length()); // L: 102 + } else if (var6.startsWith("flash3:")) { // L: 104 + var7 = 8; // L: 105 + var1 = var1.substring("flash3:".length()); // L: 106 + } else if (var6.startsWith("glow1:")) { // L: 108 + var7 = 9; // L: 109 + var1 = var1.substring("glow1:".length()); // L: 110 + } else if (var6.startsWith("glow2:")) { // L: 112 + var7 = 10; // L: 113 + var1 = var1.substring("glow2:".length()); // L: 114 + } else if (var6.startsWith("glow3:")) { // L: 116 + var7 = 11; // L: 117 + var1 = var1.substring("glow3:".length()); // L: 118 + } + } + + var6 = var1.toLowerCase(); // L: 121 + byte var8 = 0; // L: 122 + if (var6.startsWith("wave:")) { // L: 123 + var8 = 1; // L: 124 + var1 = var1.substring("wave:".length()); // L: 125 + } else if (var6.startsWith("wave2:")) { // L: 127 + var8 = 2; // L: 128 + var1 = var1.substring("wave2:".length()); // L: 129 + } else if (var6.startsWith("shake:")) { // L: 131 + var8 = 3; // L: 132 + var1 = var1.substring("shake:".length()); // L: 133 + } else if (var6.startsWith("scroll:")) { // L: 135 + var8 = 4; // L: 136 + var1 = var1.substring("scroll:".length()); // L: 137 + } else if (var6.startsWith("slide:")) { // L: 139 + var8 = 5; // L: 140 + var1 = var1.substring("slide:".length()); // L: 141 + } else if (var2 != Language.Language_EN) { // L: 143 + if (var6.startsWith("wave:")) { // L: 144 + var8 = 1; // L: 145 + var1 = var1.substring("wave:".length()); // L: 146 + } else if (var6.startsWith("wave2:")) { // L: 148 + var8 = 2; // L: 149 + var1 = var1.substring("wave2:".length()); // L: 150 + } else if (var6.startsWith("shake:")) { // L: 152 + var8 = 3; // L: 153 + var1 = var1.substring("shake:".length()); // L: 154 + } else if (var6.startsWith("scroll:")) { // L: 156 + var8 = 4; // L: 157 + var1 = var1.substring("scroll:".length()); // L: 158 + } else if (var6.startsWith("slide:")) { // L: 160 + var8 = 5; // L: 161 + var1 = var1.substring("slide:".length()); // L: 162 + } + } + + var4.packetBuffer.writeByte(var7); // L: 165 + var4.packetBuffer.writeByte(var8); // L: 166 + User.method6525(var4.packetBuffer, var1); // L: 167 + if (var0 == class296.field3552.rsOrdinal()) { // L: 168 + var4.packetBuffer.writeByte(var3); // L: 169 + } + + var4.packetBuffer.method7740(var4.packetBuffer.offset - var5); // L: 171 + return var4; // L: 172 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(ILbb;ZI)I", + garbageValue = "2032747937" + ) + static int method5782(int var0, Script var1, boolean var2) { + int var3 = -1; // L: 561 + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; + var4 = class92.getWidget(var3); // L: 566 + } else { + var4 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; + } + + if (var0 == ScriptOpcodes.CC_SETPOSITION) { + class12.Interpreter_intStackSize -= 4; + var4.rawX = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; + var4.rawY = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; + var4.xAlignment = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; + var4.yAlignment = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 3]; + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var4); + class82.client.alignWidget(var4); // L: 576 + if (var3 != -1 && var4.type == 0) { + UserComparator8.revalidateWidgetScroll(NetSocket.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETSIZE) { + class12.Interpreter_intStackSize -= 4; + var4.rawWidth = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; + var4.rawHeight = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 583 + var4.widthAlignment = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 584 + var4.heightAlignment = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 3]; + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var4); + class82.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { + UserComparator8.revalidateWidgetScroll(NetSocket.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETHIDE) { + boolean var5 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; + if (var5 != var4.isHidden) { + var4.isHidden = var5; + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var4); // L: 595 + } + + return 1; // L: 597 + } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 599 + var4.noClickThrough = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { + var4.noScrollThrough = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Lpc;ILca;IB)V", + garbageValue = "98" + ) + static final void method5786(PacketBuffer var0, int var1, Player var2, int var3) { + byte var4 = class193.field2250.field2252; // L: 451 + int var5; + int var8; + int var9; + int var12; + if ((var3 & 1) != 0) { // L: 452 + var5 = var0.method7576(); // L: 453 + PlayerType var6 = (PlayerType)class291.findEnumerated(class118.PlayerType_values(), var0.readUnsignedByte()); // L: 454 + boolean var7 = var0.method7593() == 1; // L: 455 + var8 = var0.method7545(); // L: 456 + var9 = var0.offset; // L: 457 + if (var2.username != null && var2.appearance != null) { // L: 458 + boolean var10 = false; // L: 459 + if (var6.isUser && BufferedSource.friendSystem.isIgnored(var2.username)) { // L: 460 461 + var10 = true; + } + + if (!var10 && Client.field606 == 0 && !var2.isHidden) { // L: 463 + Players.field1306.offset = 0; // L: 464 + var0.method7569(Players.field1306.array, 0, var8); // L: 465 + Players.field1306.offset = 0; // L: 466 + String var11 = AbstractFont.escapeBrackets(WorldMapManager.method4679(LoginPacket.method5025(Players.field1306))); // L: 467 + var2.overheadText = var11.trim(); // L: 468 + var2.overheadTextColor = var5 >> 8; // L: 469 + var2.overheadTextEffect = var5 & 255; // L: 470 + var2.overheadTextCyclesRemaining = 150; // L: 471 + var2.isAutoChatting = var7; // L: 472 + var2.field1198 = var2 != ModelData0.localPlayer && var6.isUser && "" != Client.field549 && var11.toLowerCase().indexOf(Client.field549) == -1; // L: 473 + if (var6.isPrivileged) { // L: 475 + var12 = var7 ? 91 : 1; + } else { + var12 = var7 ? 90 : 2; // L: 476 + } + + if (var6.modIcon != -1) { // L: 477 + WorldMapEvent.addGameMessage(var12, StudioGame.method5590(var6.modIcon) + var2.username.getName(), var11); + } else { + WorldMapEvent.addGameMessage(var12, var2.username.getName(), var11); // L: 478 + } + } + } + + var0.offset = var9 + var8; // L: 481 + } + + if ((var3 & 4) != 0) { // L: 483 + var2.field1172 = var0.method7576(); // L: 484 + if (var2.pathLength == 0) { // L: 485 + var2.orientation = var2.field1172; // L: 486 + var2.field1172 = -1; // L: 487 + } + } + + if ((var3 & 16) != 0) { // L: 490 + var5 = var0.method7593(); // L: 491 + byte[] var17 = new byte[var5]; // L: 492 + Buffer var13 = new Buffer(var17); // L: 493 + var0.method7569(var17, 0, var5); // L: 494 + Players.field1307[var1] = var13; // L: 495 + var2.read(var13); // L: 496 + } + + if ((var3 & 4096) != 0) { // L: 498 + var2.spotAnimation = var0.method7576(); // L: 499 + var5 = var0.method7567(); // L: 500 + var2.spotAnimationHeight = var5 >> 16; // L: 501 + var2.field1185 = (var5 & 65535) + Client.cycle; // L: 502 + var2.spotAnimationFrame = 0; // L: 503 + var2.spotAnimationFrameCycle = 0; // L: 504 + if (var2.field1185 > Client.cycle) { // L: 505 + var2.spotAnimationFrame = -1; + } + + if (var2.spotAnimation == 65535) { // L: 506 + var2.spotAnimation = -1; + } + } + + if ((var3 & 2048) != 0) { // L: 508 + class193[] var14 = Players.field1302; // L: 509 + class193[] var21 = new class193[]{class193.field2248, class193.field2250, class193.field2249, class193.field2251}; // L: 513 + var14[var1] = (class193)class291.findEnumerated(var21, var0.method7549()); // L: 515 + } + + if ((var3 & 16384) != 0) { // L: 517 + var2.field1187 = var0.method7547(); // L: 518 + var2.field1189 = var0.method7548(); // L: 519 + var2.field1188 = var0.method7548(); // L: 520 + var2.field1190 = var0.method7549(); // L: 521 + var2.field1191 = var0.readUnsignedShort() + Client.cycle; // L: 522 + var2.field1192 = var0.method7554() + Client.cycle; // L: 523 + var2.field1139 = var0.readUnsignedShort(); // L: 524 + if (var2.field1095) { // L: 525 + var2.field1187 += var2.tileX; // L: 526 + var2.field1189 += var2.tileY; // L: 527 + var2.field1188 += var2.tileX; // L: 528 + var2.field1190 += var2.tileY; // L: 529 + var2.pathLength = 0; // L: 530 + } else { + var2.field1187 += var2.pathX[0]; // L: 533 + var2.field1189 += var2.pathY[0]; // L: 534 + var2.field1188 += var2.pathX[0]; // L: 535 + var2.field1190 += var2.pathY[0]; // L: 536 + var2.pathLength = 1; // L: 537 + } + + var2.field1200 = 0; // L: 539 + } + + if ((var3 & 1024) != 0) { // L: 541 + var2.field1196 = Client.cycle + var0.method7576(); // L: 542 + var2.field1197 = Client.cycle + var0.readUnsignedShort(); // L: 543 + var2.field1143 = var0.method7547(); // L: 544 + var2.field1199 = var0.method7549(); // L: 545 + var2.field1153 = var0.method7548(); // L: 546 + var2.field1140 = (byte)var0.readUnsignedByte(); // L: 547 + } + + int var15; + if ((var3 & 32) != 0) { // L: 549 + var5 = var0.method7554(); // L: 550 + if (var5 == 65535) { // L: 551 + var5 = -1; + } + + var15 = var0.method7593(); // L: 552 + JagexCache.performPlayerAnimation(var2, var5, var15); // L: 553 + } + + if ((var3 & 256) != 0) { // L: 555 + var4 = var0.method7549(); // L: 556 + } + + if ((var3 & 128) != 0) { // L: 558 + var2.targetIndex = var0.method7554(); // L: 559 + if (var2.targetIndex == 65535) { // L: 560 + var2.targetIndex = -1; + } + } + + if ((var3 & 64) != 0) { // L: 562 + var5 = var0.readUnsignedByte(); // L: 563 + int var16; + int var19; + int var20; + if (var5 > 0) { // L: 564 + for (var15 = 0; var15 < var5; ++var15) { // L: 565 + var8 = -1; // L: 567 + var9 = -1; // L: 568 + var20 = -1; // L: 569 + var19 = var0.readUShortSmart(); // L: 570 + if (var19 == 32767) { // L: 571 + var19 = var0.readUShortSmart(); // L: 572 + var9 = var0.readUShortSmart(); // L: 573 + var8 = var0.readUShortSmart(); // L: 574 + var20 = var0.readUShortSmart(); // L: 575 + } else if (var19 != 32766) { // L: 577 + var9 = var0.readUShortSmart(); // L: 578 + } else { + var19 = -1; // L: 580 + } + + var16 = var0.readUShortSmart(); // L: 581 + var2.addHitSplat(var19, var9, var8, var20, Client.cycle, var16); // L: 582 + } + } + + var15 = var0.method7546(); // L: 585 + if (var15 > 0) { // L: 586 + for (var19 = 0; var19 < var15; ++var19) { // L: 587 + var8 = var0.readUShortSmart(); // L: 588 + var9 = var0.readUShortSmart(); // L: 589 + if (var9 != 32767) { // L: 590 + var20 = var0.readUShortSmart(); // L: 591 + var16 = var0.readUnsignedByte(); // L: 592 + var12 = var9 > 0 ? var0.method7593() : var16; // L: 593 + var2.addHealthBar(var8, Client.cycle, var9, var20, var16, var12); // L: 594 + } else { + var2.removeHealthBar(var8); // L: 596 + } + } + } + } + + if ((var3 & 8192) != 0) { // L: 600 + for (var5 = 0; var5 < 3; ++var5) { // L: 601 + var2.actions[var5] = var0.readStringCp1252NullTerminated(); + } + } + + if ((var3 & 8) != 0) { // L: 603 + var2.overheadText = var0.readStringCp1252NullTerminated(); // L: 604 + if (var2.overheadText.charAt(0) == '~') { // L: 605 + var2.overheadText = var2.overheadText.substring(1); // L: 606 + WorldMapEvent.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 607 + } else if (var2 == ModelData0.localPlayer) { // L: 609 + WorldMapEvent.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 610 + } + + var2.isAutoChatting = false; // L: 612 + var2.overheadTextColor = 0; // L: 613 + var2.overheadTextEffect = 0; // L: 614 + var2.overheadTextCyclesRemaining = 150; // L: 615 + } + + if (var2.field1095) { // L: 617 + if (var4 == 127) { // L: 618 + var2.resetPath(var2.tileX, var2.tileY); + } else { + class193 var22; + if (var4 != class193.field2250.field2252) { // L: 621 + class193[] var18 = new class193[]{class193.field2248, class193.field2250, class193.field2249, class193.field2251}; // L: 624 + var22 = (class193)class291.findEnumerated(var18, var4); // L: 626 + } else { + var22 = Players.field1302[var1]; // L: 628 + } + + var2.method2117(var2.tileX, var2.tileY, var22); // L: 629 + } + } + + } // L: 633 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1233324510" + ) + public static int method5790(int var0) { + return class357.method6392(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 72 } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index 99fec4f967..c2c2eceb1f 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -4,132 +4,255 @@ 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("bs") @Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { - @ObfuscatedName("bg") + @ObfuscatedName("hz") @ObfuscatedGetter( - intValue = -1956561099 + intValue = -990800587 ) - static int field483; - @ObfuscatedName("hn") - @ObfuscatedGetter( - intValue = -525655717 - ) - @Export("baseX") - static int baseX; - @ObfuscatedName("nk") - @ObfuscatedSignature( - descriptor = "Lky;" - ) - static Widget field486; - @ObfuscatedName("v") + @Export("baseY") + static int baseY; + @ObfuscatedName("o") @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { - } // L: 12705 + } // L: 12755 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Llc;Llc;B)I", - garbageValue = "1" + descriptor = "(Lln;Lln;I)I", + garbageValue = "1102099344" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - if (var2.world == var1.world) { // L: 12708 + if (var2.world == var1.world) { // L: 12758 return 0; } else { - if (this.filterWorlds) { // L: 12709 - if (Client.worldId == var1.world) { // L: 12710 + if (this.filterWorlds) { // L: 12759 + if (Client.worldId == var1.world) { // L: 12760 return -1; } - if (var2.world == Client.worldId) { // L: 12711 + if (var2.world == Client.worldId) { // L: 12761 return 1; } } - return var1.world < var2.world ? -1 : 1; // L: 12713 + return var1.world < var2.world ? -1 : 1; // L: 12763 } } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 12717 + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 12767 } public boolean equals(Object var1) { - return super.equals(var1); // L: 12721 + return super.equals(var1); // L: 12771 } - @ObfuscatedName("b") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-2123450792" + descriptor = "(ILbb;ZB)I", + garbageValue = "106" ) - public static boolean method1130(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.field140[var0] : false; // L: 236 237 - } + static int method1120(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.OC_NAME) { // L: 3428 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3429 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = FileSystem.ItemDefinition_get(var3).name; // L: 3430 + return 1; // L: 3431 + } else { + int var4; + ItemComposition var5; + if (var0 == ScriptOpcodes.OC_OP) { // L: 3433 + class12.Interpreter_intStackSize -= 2; // L: 3434 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3435 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3436 + var5 = FileSystem.ItemDefinition_get(var3); // L: 3437 + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; // L: 3438 + } else { + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3439 + } - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-121" - ) - public static boolean method1138(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.field131[var0] : false; // L: 246 247 - } + return 1; // L: 3440 + } else if (var0 == ScriptOpcodes.OC_IOP) { // L: 3442 + class12.Interpreter_intStackSize -= 2; // L: 3443 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3444 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3445 + var5 = FileSystem.ItemDefinition_get(var3); // L: 3446 + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 3447 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3448 + } - @ObfuscatedName("gf") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1843908381" - ) - static final void method1128() { - int var0 = class286.field3274 * 128 + 64; // L: 3784 - int var1 = class54.field447 * 128 + 64; // L: 3785 - int var2 = WorldMapLabel.getTileHeight(var0, var1, class18.Client_plane) - BZip2State.field4662; // L: 3786 - class13.method163(var0, var2, var1); // L: 3787 - var0 = class154.field1691 * 128 + 64; // L: 3788 - var1 = class67.field881 * 128 + 64; // L: 3789 - var2 = WorldMapLabel.getTileHeight(var0, var1, class18.Client_plane) - DevicePcmPlayerProvider.field154; // L: 3790 - int var3 = var0 - WorldMapLabelSize.cameraX; // L: 3791 - int var4 = var2 - ItemContainer.cameraY; // L: 3792 - int var5 = var1 - class154.cameraZ; // L: 3793 - int var6 = (int)Math.sqrt((double)(var3 * var3 + var5 * var5)); // L: 3794 - int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.9490051269531D) & 2047; // L: 3795 - int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.9490051269531D) & 2047; // L: 3796 - WorldMapSectionType.method4308(var7, var8); // L: 3797 - } // L: 3798 + return 1; // L: 3449 + } else if (var0 == ScriptOpcodes.OC_COST) { // L: 3451 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3452 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FileSystem.ItemDefinition_get(var3).price; // L: 3453 + return 1; // L: 3454 + } else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 3456 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3457 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FileSystem.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; // L: 3458 + return 1; // L: 3459 + } else { + ItemComposition var7; + if (var0 == ScriptOpcodes.OC_CERT) { // L: 3461 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3462 + var7 = FileSystem.ItemDefinition_get(var3); // L: 3463 + if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 3464 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3; // L: 3465 + } - @ObfuscatedName("ge") - @ObfuscatedSignature( - descriptor = "(Lcz;III)V", - garbageValue = "1679635193" - ) - @Export("performPlayerAnimation") - static void performPlayerAnimation(Player var0, int var1, int var2) { - if (var0.sequence == var1 && var1 != -1) { // L: 4236 - int var3 = class163.SequenceDefinition_get(var1).field2161; // L: 4237 - if (var3 == 1) { // L: 4238 - var0.sequenceFrame = 0; // L: 4239 - var0.sequenceFrameCycle = 0; // L: 4240 - var0.sequenceDelay = var2; // L: 4241 - var0.field1152 = 0; // L: 4242 + return 1; // L: 3466 + } else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 3468 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3469 + var7 = FileSystem.ItemDefinition_get(var3); // L: 3470 + if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 3471 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3; // L: 3472 + } + + return 1; // L: 3473 + } else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 3475 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3476 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FileSystem.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; // L: 3477 + return 1; // L: 3478 + } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 3480 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3481 + var7 = FileSystem.ItemDefinition_get(var3); // L: 3482 + if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 3483 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3; // L: 3484 + } + + return 1; // L: 3485 + } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 3487 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3488 + var7 = FileSystem.ItemDefinition_get(var3); // L: 3489 + if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 3490 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3; // L: 3491 + } + + return 1; // L: 3492 + } else if (var0 == ScriptOpcodes.OC_FIND) { // L: 3494 + String var6 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3495 + var4 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3496 + class28.findItemDefinitions(var6, var4 == 1); // L: 3497 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = UserComparator9.foundItemIdCount; // L: 3498 + return 1; // L: 3499 + } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 3501 + if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 3506 + Coord.foundItemIndex = 0; // L: 3507 + return 1; // L: 3508 + } else if (var0 == 4213) { // L: 3510 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3511 + var4 = FileSystem.ItemDefinition_get(var3).getShiftClickIndex(); // L: 3512 + if (var4 == -1) { // L: 3513 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4; // L: 3514 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4 + 1; // L: 3517 + } + + return 1; // L: 3519 + } else { + return 2; // L: 3521 + } + } else { + if (class182.foundItemIds != null && Coord.foundItemIndex < UserComparator9.foundItemIdCount) { // L: 3502 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class182.foundItemIds[++Coord.foundItemIndex - 1] & '\uffff'; // L: 3503 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; + } + + return 1; // L: 3504 + } } + } + } - if (var3 == 2) { // L: 4244 - var0.field1152 = 0; // L: 4245 - } - } else if (var1 == -1 || var0.sequence == -1 || class163.SequenceDefinition_get(var1).field2155 >= class163.SequenceDefinition_get(var0.sequence).field2155) { // L: 4248 - var0.sequence = var1; // L: 4249 - var0.sequenceFrame = 0; // L: 4250 - var0.sequenceFrameCycle = 0; // L: 4251 - var0.sequenceDelay = var2; // L: 4252 - var0.field1152 = 0; // L: 4253 - var0.field1170 = var0.pathLength; // L: 4254 + @ObfuscatedName("gr") + @ObfuscatedSignature( + descriptor = "(IIIIZI)V", + garbageValue = "1542062611" + ) + @Export("setViewportShape") + static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { + if (var2 < 1) { // L: 4896 + var2 = 1; } - } // L: 4256 + if (var3 < 1) { // L: 4897 + var3 = 1; + } + + int var5 = var3 - 334; // L: 4898 + int var6; + if (var5 < 0) { // L: 4900 + var6 = Client.field748; + } else if (var5 >= 100) { // L: 4901 + var6 = Client.field749; + } else { + var6 = (Client.field749 - Client.field748) * var5 / 100 + Client.field748; // L: 4902 + } + + int var7 = var3 * var6 * 512 / (var2 * 334); // L: 4903 + int var8; + int var9; + short var10; + if (var7 < Client.field656) { // L: 4904 + var10 = Client.field656; // L: 4905 + var6 = var10 * var2 * 334 / (var3 * 512); // L: 4906 + if (var6 > Client.field753) { // L: 4907 + var6 = Client.field753; // L: 4908 + var8 = var3 * var6 * 512 / (var10 * 334); // L: 4909 + var9 = (var2 - var8) / 2; // L: 4910 + if (var4) { // L: 4911 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4912 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 4913 + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 4914 + } + + var0 += var9; // L: 4916 + var2 -= var9 * 2; // L: 4917 + } + } else if (var7 > Client.field755) { // L: 4920 + var10 = Client.field755; // L: 4921 + var6 = var10 * var2 * 334 / (var3 * 512); // L: 4922 + if (var6 < Client.field752) { // L: 4923 + var6 = Client.field752; // L: 4924 + var8 = var10 * var2 * 334 / (var6 * 512); // L: 4925 + var9 = (var3 - var8) / 2; // L: 4926 + if (var4) { // L: 4927 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4928 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 4929 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 4930 + } + + var1 += var9; // L: 4932 + var3 -= var9 * 2; // L: 4933 + } + } + + Client.viewportZoom = var3 * var6 / 334; // L: 4936 + if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 4937 + WorldMapArea.method4514(var2, var3); // L: 4938 + } + + Client.viewportOffsetX = var0; // L: 4940 + Client.viewportOffsetY = var1; // L: 4941 + Client.viewportWidth = var2; // L: 4942 + Client.viewportHeight = var3; // L: 4943 + } // L: 4944 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index ef32161268..da6c6dabf4 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -1,78 +1,47 @@ 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("lw") +@ObfuscatedName("ld") @Implements("GrandExchangeOfferTotalQuantityComparator") final class GrandExchangeOfferTotalQuantityComparator implements Comparator { - @ObfuscatedName("v") + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1165862303 + ) + static int field4069; + + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Llc;Llc;I)I", - garbageValue = "-1618602527" + descriptor = "(Lln;Lln;B)I", + garbageValue = "127" ) @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 int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); - } - public boolean equals(Object var1) { return super.equals(var1); // L: 77 } - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)[Ldk;", - garbageValue = "1223848574" - ) - static class119[] method5977() { - return new class119[]{class119.field1449, class119.field1439, class119.field1440, class119.field1441, class119.field1442, class119.field1446, class119.field1444, class119.field1443, class119.field1455, class119.field1447, class119.field1448, class119.field1451, class119.field1450, class119.field1445, class119.field1457, class119.field1452, class119.field1454}; // L: 73 + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 73 } - @ObfuscatedName("ie") + @ObfuscatedName("kf") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1983287311" + descriptor = "(Lki;I)V", + garbageValue = "-842316290" ) - @Export("incrementMenuEntries") - static final void incrementMenuEntries() { - boolean var0 = false; // L: 9793 - - while (!var0) { // L: 9794 - var0 = true; // L: 9795 - - for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 9796 - if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { // L: 9797 - String var2 = Client.menuTargets[var1]; // L: 9798 - Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 9799 - Client.menuTargets[var1 + 1] = var2; // L: 9800 - String var3 = Client.menuActions[var1]; // L: 9801 - Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 9802 - Client.menuActions[var1 + 1] = var3; // L: 9803 - int var4 = Client.menuOpcodes[var1]; // L: 9804 - Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 9805 - Client.menuOpcodes[var1 + 1] = var4; // L: 9806 - var4 = Client.menuArguments1[var1]; // L: 9807 - Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 9808 - Client.menuArguments1[var1 + 1] = var4; // L: 9809 - var4 = Client.menuArguments2[var1]; // L: 9810 - Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 9811 - Client.menuArguments2[var1 + 1] = var4; // L: 9812 - var4 = Client.menuIdentifiers[var1]; // L: 9813 - Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 9814 - Client.menuIdentifiers[var1 + 1] = var4; // L: 9815 - boolean var5 = Client.menuShiftClick[var1]; // L: 9816 - Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 9817 - Client.menuShiftClick[var1 + 1] = var5; // L: 9818 - var0 = false; // L: 9819 - } - } + @Export("invalidateWidget") + static void invalidateWidget(Widget var0) { + if (var0 != null && var0.cycle == Client.field694) { // L: 11919 + Client.field652[var0.rootIndex] = true; // L: 11920 } - } // L: 9823 + } // L: 11922 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index 38b416beeb..402b7f4796 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -4,185 +4,41 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("le") +@ObfuscatedName("lt") @Implements("GrandExchangeOfferUnitPriceComparator") final class GrandExchangeOfferUnitPriceComparator implements Comparator { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Llc;Llc;B)I", - garbageValue = "2" + descriptor = "(Lln;Lln;B)I", + garbageValue = "88" ) @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 } - public boolean equals(Object var1) { - return super.equals(var1); // L: 51 - } - public int compare(Object var1, Object var2) { return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 47 } - @ObfuscatedName("hc") + public boolean equals(Object var1) { + return super.equals(var1); // L: 51 + } + + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "-1285875699" + descriptor = "(III)I", + garbageValue = "-602449729" ) - @Export("drawObject") - static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = ArchiveLoader.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5844 - int var7; - int var8; - int var9; - int var10; - int var14; - int var26; - if (var5 != 0L) { // L: 5845 - var7 = ArchiveLoader.scene.getObjectFlags(var0, var1, var2, var5); // L: 5846 - var8 = var7 >> 6 & 3; // L: 5847 - var9 = var7 & 31; // L: 5848 - var10 = var3; // L: 5849 - boolean var12 = var5 != 0L; // L: 5852 - if (var12) { // L: 5853 - boolean var13 = (int)(var5 >>> 16 & 1L) == 1; // L: 5856 - var12 = !var13; // L: 5858 - } - - if (var12) { // L: 5862 - var10 = var4; - } - - int[] var19 = HealthBarUpdate.sceneMinimapSprite.pixels; // L: 5863 - var26 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5864 - var14 = FileSystem.Entity_unpackID(var5); // L: 5865 - ObjectComposition var15 = class146.getObjectDefinition(var14); // L: 5866 - if (var15.mapSceneId != -1) { // L: 5867 - IndexedSprite var16 = GraphicsDefaults.mapSceneSprites[var15.mapSceneId]; // L: 5868 - if (var16 != null) { // L: 5869 - int var17 = (var15.sizeX * 4 - var16.subWidth) / 2; // L: 5870 - int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; // L: 5871 - var16.drawAt(var1 * 4 + var17 + 48, var18 + (104 - var2 - var15.sizeY) * 4 + 48); // L: 5872 - } - } else { - if (var9 == 0 || var9 == 2) { // L: 5876 - if (var8 == 0) { // L: 5877 - var19[var26] = var10; // L: 5878 - var19[var26 + 512] = var10; // L: 5879 - var19[var26 + 1024] = var10; // L: 5880 - var19[var26 + 1536] = var10; // L: 5881 - } else if (var8 == 1) { // L: 5883 - var19[var26] = var10; // L: 5884 - var19[var26 + 1] = var10; // L: 5885 - var19[var26 + 2] = var10; // L: 5886 - var19[var26 + 3] = var10; // L: 5887 - } else if (var8 == 2) { // L: 5889 - var19[var26 + 3] = var10; // L: 5890 - var19[var26 + 512 + 3] = var10; // L: 5891 - var19[var26 + 1024 + 3] = var10; // L: 5892 - var19[var26 + 1536 + 3] = var10; // L: 5893 - } else if (var8 == 3) { // L: 5895 - var19[var26 + 1536] = var10; // L: 5896 - var19[var26 + 1536 + 1] = var10; // L: 5897 - var19[var26 + 1536 + 2] = var10; // L: 5898 - var19[var26 + 1536 + 3] = var10; // L: 5899 - } - } - - if (var9 == 3) { // L: 5902 - if (var8 == 0) { // L: 5903 - var19[var26] = var10; - } else if (var8 == 1) { // L: 5904 - var19[var26 + 3] = var10; - } else if (var8 == 2) { // L: 5905 - var19[var26 + 1536 + 3] = var10; - } else if (var8 == 3) { // L: 5906 - var19[var26 + 1536] = var10; - } - } - - if (var9 == 2) { // L: 5908 - if (var8 == 3) { // L: 5909 - var19[var26] = var10; // L: 5910 - var19[var26 + 512] = var10; // L: 5911 - var19[var26 + 1024] = var10; // L: 5912 - var19[var26 + 1536] = var10; // L: 5913 - } else if (var8 == 0) { // L: 5915 - var19[var26] = var10; // L: 5916 - var19[var26 + 1] = var10; // L: 5917 - var19[var26 + 2] = var10; // L: 5918 - var19[var26 + 3] = var10; // L: 5919 - } else if (var8 == 1) { // L: 5921 - var19[var26 + 3] = var10; // L: 5922 - var19[var26 + 512 + 3] = var10; // L: 5923 - var19[var26 + 1024 + 3] = var10; // L: 5924 - var19[var26 + 1536 + 3] = var10; // L: 5925 - } else if (var8 == 2) { // L: 5927 - var19[var26 + 1536] = var10; // L: 5928 - var19[var26 + 1536 + 1] = var10; // L: 5929 - var19[var26 + 1536 + 2] = var10; // L: 5930 - var19[var26 + 1536 + 3] = var10; // L: 5931 - } - } - } + static final int method5846(int var0, int var1) { + int var2 = InterfaceParent.method2070(45365 + var0, 91923 + var1, 4) - 128 + (InterfaceParent.method2070(10294 + var0, var1 + 37821, 2) - 128 >> 1) + (InterfaceParent.method2070(var0, var1, 1) - 128 >> 2); // L: 918 + var2 = (int)(0.3D * (double)var2) + 35; // L: 919 + if (var2 < 10) { // L: 920 + var2 = 10; + } else if (var2 > 60) { // L: 921 + var2 = 60; } - var5 = ArchiveLoader.scene.getGameObjectTag(var0, var1, var2); // L: 5936 - if (0L != var5) { // L: 5937 - var7 = ArchiveLoader.scene.getObjectFlags(var0, var1, var2, var5); // L: 5938 - var8 = var7 >> 6 & 3; // L: 5939 - var9 = var7 & 31; // L: 5940 - var10 = FileSystem.Entity_unpackID(var5); // L: 5941 - ObjectComposition var20 = class146.getObjectDefinition(var10); // L: 5942 - if (var20.mapSceneId != -1) { // L: 5943 - IndexedSprite var28 = GraphicsDefaults.mapSceneSprites[var20.mapSceneId]; // L: 5944 - if (var28 != null) { // L: 5945 - var26 = (var20.sizeX * 4 - var28.subWidth) / 2; // L: 5946 - var14 = (var20.sizeY * 4 - var28.subHeight) / 2; // L: 5947 - var28.drawAt(var1 * 4 + var26 + 48, (104 - var2 - var20.sizeY) * 4 + var14 + 48); // L: 5948 - } - } else if (var9 == 9) { // L: 5951 - int var25 = 15658734; // L: 5952 - boolean var27 = 0L != var5; // L: 5955 - if (var27) { // L: 5956 - boolean var21 = (int)(var5 >>> 16 & 1L) == 1; // L: 5959 - var27 = !var21; // L: 5961 - } - - if (var27) { // L: 5965 - var25 = 15597568; - } - - int[] var22 = HealthBarUpdate.sceneMinimapSprite.pixels; // L: 5966 - int var29 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5967 - if (var8 != 0 && var8 != 2) { // L: 5968 - var22[var29] = var25; // L: 5975 - var22[var29 + 1 + 512] = var25; // L: 5976 - var22[var29 + 1024 + 2] = var25; // L: 5977 - var22[var29 + 1536 + 3] = var25; // L: 5978 - } else { - var22[var29 + 1536] = var25; // L: 5969 - var22[var29 + 1 + 1024] = var25; // L: 5970 - var22[var29 + 512 + 2] = var25; // L: 5971 - var22[var29 + 3] = var25; // L: 5972 - } - } - } - - var5 = ArchiveLoader.scene.getFloorDecorationTag(var0, var1, var2); // L: 5982 - if (var5 != 0L) { // L: 5983 - var7 = FileSystem.Entity_unpackID(var5); // L: 5984 - ObjectComposition var23 = class146.getObjectDefinition(var7); // L: 5985 - if (var23.mapSceneId != -1) { // L: 5986 - IndexedSprite var24 = GraphicsDefaults.mapSceneSprites[var23.mapSceneId]; // L: 5987 - if (var24 != null) { // L: 5988 - var10 = (var23.sizeX * 4 - var24.subWidth) / 2; // L: 5989 - int var11 = (var23.sizeY * 4 - var24.subHeight) / 2; // L: 5990 - var24.drawAt(var10 + var1 * 4 + 48, var11 + (104 - var2 - var23.sizeY) * 4 + 48); // L: 5991 - } - } - } - - } // L: 5995 + return var2; // L: 922 + } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index 35f29fabdb..e4c78b6018 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -4,13 +4,20 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lp") +@ObfuscatedName("lj") @Implements("GrandExchangeOfferWorldComparator") final class GrandExchangeOfferWorldComparator implements Comparator { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Llc;Llc;I)I", - garbageValue = "-468460476" + descriptor = "Llp;" + ) + @Export("WorldMapElement_archive") + static AbstractArchive WorldMapElement_archive; + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lln;Lln;I)I", + garbageValue = "1939073970" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -25,176 +32,14 @@ final class GrandExchangeOfferWorldComparator implements Comparator { return super.equals(var1); // L: 36 } - @ObfuscatedName("go") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lcb;I)V", - garbageValue = "-1213322311" + descriptor = "(Llp;Llp;Ljava/lang/String;Ljava/lang/String;I)Lmx;", + garbageValue = "2088711199" ) - static final void method6006(Actor var0) { - var0.isWalking = false; // L: 4123 - SequenceDefinition var1; - int var2; - if (var0.movementSequence != -1) { // L: 4124 - var1 = class163.SequenceDefinition_get(var0.movementSequence); // L: 4125 - if (var1 != null) { // L: 4126 - if (!var1.isCachedModelIdSet() && var1.frameIds != null) { // L: 4127 - ++var0.movementFrameCycle; // L: 4128 - if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { // L: 4129 - var0.movementFrameCycle = 1; // L: 4130 - ++var0.movementFrame; // L: 4131 - Language.method6087(var1, var0.movementFrame, var0.x, var0.y); // L: 4132 - } - - if (var0.movementFrame >= var1.frameIds.length) { // L: 4134 - var0.movementFrameCycle = 0; // L: 4135 - var0.movementFrame = 0; // L: 4136 - Language.method6087(var1, var0.movementFrame, var0.x, var0.y); // L: 4137 - } - } else if (var1.isCachedModelIdSet()) { // L: 4140 - ++var0.movementFrame; // L: 4141 - var2 = var1.method3844(); // L: 4142 - if (var0.movementFrame < var2) { // L: 4143 - KeyHandler.method336(var1, var0.movementFrame, var0.x, var0.y); // L: 4144 - } else { - var0.movementFrameCycle = 0; // L: 4147 - var0.movementFrame = 0; // L: 4148 - KeyHandler.method336(var1, var0.movementFrame, var0.x, var0.y); // L: 4149 - } - } else { - var0.movementSequence = -1; // L: 4152 - } - } else { - var0.movementSequence = -1; // L: 4154 - } - } - - if (var0.spotAnimation != -1 && Client.cycle >= var0.field1134) { // L: 4156 - if (var0.spotAnimationFrame < 0) { // L: 4157 - var0.spotAnimationFrame = 0; - } - - int var4 = ClientPreferences.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 4158 - if (var4 != -1) { // L: 4159 - SequenceDefinition var5 = class163.SequenceDefinition_get(var4); // L: 4160 - if (var5 != null && var5.frameIds != null) { // L: 4161 - ++var0.spotAnimationFrameCycle; // L: 4162 - if (var0.spotAnimationFrame < var5.frameIds.length && var0.spotAnimationFrameCycle > var5.frameLengths[var0.spotAnimationFrame]) { // L: 4163 - var0.spotAnimationFrameCycle = 1; // L: 4164 - ++var0.spotAnimationFrame; // L: 4165 - Language.method6087(var5, var0.spotAnimationFrame, var0.x, var0.y); // L: 4166 - } - - if (var0.spotAnimationFrame >= var5.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var5.frameIds.length)) { // L: 4168 4169 - var0.spotAnimation = -1; - } - } else if (var5.isCachedModelIdSet()) { // L: 4172 - ++var0.spotAnimationFrame; // L: 4173 - int var3 = var5.method3844(); // L: 4174 - if (var0.spotAnimationFrame < var3) { // L: 4175 - KeyHandler.method336(var5, var0.spotAnimationFrame, var0.x, var0.y); // L: 4176 - } else if (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var3) { // L: 4179 - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; // L: 4182 - } - } else { - var0.spotAnimation = -1; // L: 4184 - } - } - - if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 4186 - var1 = class163.SequenceDefinition_get(var0.sequence); // L: 4187 - if (var1.field2159 == 1 && var0.field1170 > 0 && var0.field1143 <= Client.cycle && var0.field1163 < Client.cycle) { // L: 4188 4189 - var0.sequenceDelay = 1; // L: 4190 - return; // L: 4191 - } - } - - if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4195 - var1 = class163.SequenceDefinition_get(var0.sequence); // L: 4196 - if (var1 != null) { // L: 4197 - if (!var1.isCachedModelIdSet() && var1.frameIds != null) { // L: 4198 - ++var0.sequenceFrameCycle; // L: 4199 - if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { // L: 4200 - var0.sequenceFrameCycle = 1; // L: 4201 - ++var0.sequenceFrame; // L: 4202 - Language.method6087(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4203 - } - - if (var0.sequenceFrame >= var1.frameIds.length) { // L: 4205 - var0.sequenceFrame -= var1.frameCount; // L: 4206 - ++var0.field1152; // L: 4207 - if (var0.field1152 >= var1.field2138) { // L: 4208 - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { // L: 4209 - Language.method6087(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4210 - } else { - var0.sequence = -1; - } - } - - var0.isWalking = var1.field2154; // L: 4212 - } else if (var1.isCachedModelIdSet()) { // L: 4214 - ++var0.sequenceFrame; // L: 4215 - var2 = var1.method3801().method2762(); // L: 4216 - if (var0.sequenceFrame < var2) { // L: 4217 - KeyHandler.method336(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4218 - } else { - var0.sequenceFrame -= var1.frameCount; // L: 4221 - ++var0.field1152; // L: 4222 - if (var0.field1152 >= var1.field2138) { // L: 4223 - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var2) { // L: 4224 - KeyHandler.method336(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4225 - } else { - var0.sequence = -1; - } - } - } else { - var0.sequence = -1; // L: 4228 - } - } else { - var0.sequence = -1; // L: 4230 - } - } - - if (var0.sequenceDelay > 0) { // L: 4232 - --var0.sequenceDelay; - } - - } // L: 4233 - - @ObfuscatedName("hf") - @ObfuscatedSignature( - descriptor = "(IIIIIIIIII)V", - garbageValue = "1469705502" - ) - @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: 7693 - - for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7694 7695 7700 - if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 7696 - var9 = var10; // L: 7697 - break; - } - } - - if (var9 == null) { // L: 7702 - var9 = new PendingSpawn(); // L: 7703 - var9.plane = var0; // L: 7704 - var9.type = var3; // L: 7705 - var9.x = var1; // L: 7706 - var9.y = var2; // L: 7707 - class163.method3315(var9); // L: 7708 - Client.pendingSpawns.addFirst(var9); // L: 7709 - } - - var9.id = var4; // L: 7711 - var9.field1107 = var5; // L: 7712 - var9.orientation = var6; // L: 7713 - var9.delay = var7; // L: 7714 - var9.hitpoints = var8; // L: 7715 - } // L: 7716 + public static Font method5808(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { + int var4 = var0.getGroupId(var2); // L: 124 + int var5 = var0.getFileId(var4, var3); // L: 125 + return class387.method6781(var0, var1, var4, var5); // L: 126 + } } diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java index 4f211243ba..506d7c6c99 100644 --- a/runescape-client/src/main/java/GraphicsDefaults.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -4,96 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nc") +@ObfuscatedName("nu") @Implements("GraphicsDefaults") public class GraphicsDefaults { - @ObfuscatedName("ip") - @ObfuscatedSignature( - descriptor = "[Lqq;" - ) - @Export("mapSceneSprites") - static IndexedSprite[] mapSceneSprites; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1328751771 + intValue = 1168914555 ) @Export("compass") public int compass; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 741115861 + intValue = -153891603 ) - public int field4314; - @ObfuscatedName("i") + public int field4373; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -104742867 + intValue = 889630627 ) @Export("mapScenes") public int mapScenes; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1903880711 + intValue = -214563943 ) @Export("headIconsPk") public int headIconsPk; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1153445431 + intValue = 2847389 ) - public int field4322; - @ObfuscatedName("n") + public int field4376; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 693600925 + intValue = 1531771617 ) - public int field4318; + public int field4377; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 822510473 + ) + public int field4378; @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 2085695885 + intValue = -1018736855 ) - public int field4319; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1059199103 - ) - public int field4320; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 218263637 - ) - public int field4321; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1626482123 - ) - public int field4315; + public int field4374; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 922588741 + intValue = -1369265667 ) - public int field4323; + public int field4375; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -2053526401 + ) + public int field4381; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 1936619473 + ) + public int field4372; public GraphicsDefaults() { this.compass = -1; // L: 7 - this.field4314 = -1; // L: 8 + this.field4373 = -1; // L: 8 this.mapScenes = -1; // L: 9 this.headIconsPk = -1; // L: 10 - this.field4322 = -1; // L: 11 - this.field4318 = -1; // L: 12 - this.field4319 = -1; // L: 13 - this.field4320 = -1; // L: 14 - this.field4321 = -1; // L: 15 - this.field4315 = -1; // L: 16 - this.field4323 = -1; // L: 17 + this.field4376 = -1; // L: 11 + this.field4377 = -1; // L: 12 + this.field4378 = -1; // L: 13 + this.field4374 = -1; // L: 14 + this.field4375 = -1; // L: 15 + this.field4381 = -1; // L: 16 + this.field4372 = -1; // L: 17 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lln;I)V", - garbageValue = "-689748439" + descriptor = "(Llp;I)V", + garbageValue = "-901187341" ) @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field4311.group); // L: 20 + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field4370.group); // L: 20 Buffer var3 = new Buffer(var2); // L: 21 while (true) { @@ -104,483 +98,125 @@ public class GraphicsDefaults { switch(var4) { // L: 25 case 1: - var3.readMedium(); // L: 43 + var3.readMedium(); // L: 28 break; case 2: - this.compass = var3.method7692(); // L: 28 - this.field4314 = var3.method7692(); // L: 29 - this.mapScenes = var3.method7692(); // L: 30 - this.headIconsPk = var3.method7692(); // L: 31 - this.field4322 = var3.method7692(); // L: 32 - this.field4318 = var3.method7692(); // L: 33 - this.field4319 = var3.method7692(); // L: 34 - this.field4320 = var3.method7692(); // L: 35 - this.field4321 = var3.method7692(); // L: 36 - this.field4315 = var3.method7692(); // L: 37 - this.field4323 = var3.method7692(); // L: 38 + this.compass = var3.method7532(); // L: 33 + this.field4373 = var3.method7532(); // L: 34 + this.mapScenes = var3.method7532(); // L: 35 + this.headIconsPk = var3.method7532(); // L: 36 + this.field4376 = var3.method7532(); // L: 37 + this.field4377 = var3.method7532(); // L: 38 + this.field4378 = var3.method7532(); // L: 39 + this.field4374 = var3.method7532(); // L: 40 + this.field4375 = var3.method7532(); // L: 41 + this.field4381 = var3.method7532(); // L: 42 + this.field4372 = var3.method7532(); // L: 43 } } } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lhv;[Lgv;I)V", - garbageValue = "200441934" + descriptor = "(IZIZB)V", + garbageValue = "-62" ) - static final void method6939(Scene var0, CollisionMap[] var1) { - int var2; + @Export("sortWorldList") + static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { + if (World.World_worlds != null) { // L: 171 + VarcInt.doWorldSorting(0, World.World_worlds.length - 1, var0, var1, var2, var3); // L: 172 + } + + } // L: 174 + + @ObfuscatedName("hz") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-128" + ) + static final void method6732(int var0) { + int[] var1 = InterfaceParent.sceneMinimapSprite.pixels; // L: 5947 + int var2 = var1.length; // L: 5948 + int var3; + for (var3 = 0; var3 < var2; ++var3) { // L: 5949 + var1[var3] = 0; + } + int var4; int var5; - for (var2 = 0; var2 < 4; ++var2) { // L: 581 - for (var3 = 0; var3 < 104; ++var3) { // L: 582 - for (var4 = 0; var4 < 104; ++var4) { // L: 583 - if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { // L: 584 - var5 = var2; // L: 585 - if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 586 - var5 = var2 - 1; - } + for (var3 = 1; var3 < 103; ++var3) { // L: 5950 + var4 = (103 - var3) * 2048 + 24628; // L: 5951 - if (var5 >= 0) { // L: 587 - var1[var5].setBlockedByFloor(var3, var4); - } + for (var5 = 1; var5 < 103; ++var5) { // L: 5952 + if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { // L: 5953 + class175.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { // L: 5954 + class175.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); + } + + var4 += 4; // L: 5955 + } + } + + 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: 5958 + var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 5959 + InterfaceParent.sceneMinimapSprite.setRaster(); // L: 5960 + + int var6; + for (var5 = 1; var5 < 103; ++var5) { // L: 5961 + for (var6 = 1; var6 < 103; ++var6) { // L: 5962 + if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { // L: 5963 + WorldMapEvent.drawObject(var0, var6, var5, var3, var4); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { // L: 5964 + WorldMapEvent.drawObject(var0 + 1, var6, var5, var3, var4); + } + } + } + + Client.mapIconCount = 0; // L: 5967 + + for (var5 = 0; var5 < 104; ++var5) { // L: 5968 + for (var6 = 0; var6 < 104; ++var6) { // L: 5969 + long var7 = class175.scene.getFloorDecorationTag(class128.Client_plane, var5, var6); // L: 5970 + if (var7 != 0L) { // L: 5971 + int var9 = NetSocket.Entity_unpackID(var7); // L: 5972 + int var10 = class82.getObjectDefinition(var9).mapIconId; // L: 5973 + if (var10 >= 0 && class120.WorldMapElement_get(var10).field1874) { // L: 5974 5975 + Client.mapIcons[Client.mapIconCount] = class120.WorldMapElement_get(var10).getSpriteBool(false); // L: 5978 + Client.mapIconXs[Client.mapIconCount] = var5; // L: 5979 + Client.mapIconYs[Client.mapIconCount] = var6; // L: 5980 + ++Client.mapIconCount; // L: 5981 } } } } - Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; // L: 592 - if (Tiles.rndHue < -8) { // L: 593 - Tiles.rndHue = -8; - } + DevicePcmPlayerProvider.rasterProvider.apply(); // L: 5986 + } // L: 5987 - if (Tiles.rndHue > 8) { // L: 594 - Tiles.rndHue = 8; - } + @ObfuscatedName("kd") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1911416331" + ) + @Export("Widget_resetModelFrames") + static final void Widget_resetModelFrames(int var0) { + if (WorldMapDecoration.loadInterface(var0)) { // L: 11974 + Widget[] var1 = NetSocket.Widget_interfaceComponents[var0]; // L: 11975 - Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; // L: 595 - if (Tiles.rndLightness < -16) { // L: 596 - Tiles.rndLightness = -16; - } - - if (Tiles.rndLightness > 16) { // L: 597 - Tiles.rndLightness = 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: 598 - byte[][] var42 = class392.field4374[var2]; // L: 599 - var9 = (int)Math.sqrt(5100.0D); // L: 605 - var10 = var9 * 768 >> 8; // L: 606 - - int var19; - int var20; - for (var11 = 1; var11 < 103; ++var11) { // L: 607 - for (var12 = 1; var12 < 103; ++var12) { // L: 608 - var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; // L: 609 - var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; // L: 610 - var15 = (int)Math.sqrt((double)(var13 * var13 + var14 * var14 + 65536)); // L: 611 - var16 = (var13 << 8) / var15; // L: 612 - var17 = 65536 / var15; // L: 613 - var18 = (var14 << 8) / var15; // L: 614 - var19 = (var16 * -50 + var18 * -50 + var17 * -10) / var10 + 96; // L: 615 - var20 = (var42[var12][var11 + 1] >> 3) + (var42[var12 - 1][var11] >> 2) + (var42[var12][var11 - 1] >> 2) + (var42[var12 + 1][var11] >> 3) + (var42[var12][var11] >> 1); // L: 616 - Tiles.field998[var12][var11] = var19 - var20; // L: 617 + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11976 + Widget var3 = var1[var2]; // L: 11977 + if (var3 != null) { // L: 11978 + var3.modelFrame = 0; // L: 11979 + var3.modelFrameCycle = 0; // L: 11980 } } - for (var11 = 0; var11 < 104; ++var11) { // L: 620 - BufferedNetSocket.Tiles_hue[var11] = 0; // L: 621 - class116.Tiles_saturation[var11] = 0; // L: 622 - Tiles.Tiles_lightness[var11] = 0; // L: 623 - class357.Tiles_hueMultiplier[var11] = 0; // L: 624 - class361.field4213[var11] = 0; // L: 625 - } - - for (var11 = -5; var11 < 109; ++var11) { // L: 627 - for (var12 = 0; var12 < 104; ++var12) { // L: 628 - var13 = var11 + 5; // L: 629 - int var10002; - if (var13 >= 0 && var13 < 104) { // L: 630 - var14 = Tiles.Tiles_underlays[var2][var13][var12] & 255; // L: 631 - if (var14 > 0) { // L: 632 - FloorUnderlayDefinition var44 = class123.method2806(var14 - 1); // L: 633 - var10000 = BufferedNetSocket.Tiles_hue; // L: 634 - var10000[var12] += var44.hue; - var10000 = class116.Tiles_saturation; // L: 635 - var10000[var12] += var44.saturation; - var10000 = Tiles.Tiles_lightness; // L: 636 - var10000[var12] += var44.lightness; - var10000 = class357.Tiles_hueMultiplier; // L: 637 - var10000[var12] += var44.hueMultiplier; - var10002 = class361.field4213[var12]++; // L: 638 - } - } - - var14 = var11 - 5; // L: 641 - if (var14 >= 0 && var14 < 104) { // L: 642 - var15 = Tiles.Tiles_underlays[var2][var14][var12] & 255; // L: 643 - if (var15 > 0) { // L: 644 - FloorUnderlayDefinition var45 = class123.method2806(var15 - 1); // L: 645 - var10000 = BufferedNetSocket.Tiles_hue; // L: 646 - var10000[var12] -= var45.hue; - var10000 = class116.Tiles_saturation; // L: 647 - var10000[var12] -= var45.saturation; - var10000 = Tiles.Tiles_lightness; // L: 648 - var10000[var12] -= var45.lightness; - var10000 = class357.Tiles_hueMultiplier; // L: 649 - var10000[var12] -= var45.hueMultiplier; - var10002 = class361.field4213[var12]--; // L: 650 - } - } - } - - if (var11 >= 1 && var11 < 103) { // L: 654 - var12 = 0; // L: 655 - var13 = 0; // L: 656 - var14 = 0; // L: 657 - var15 = 0; // L: 658 - var16 = 0; // L: 659 - - for (var17 = -5; var17 < 109; ++var17) { // L: 660 - var18 = var17 + 5; // L: 661 - if (var18 >= 0 && var18 < 104) { // L: 662 - var12 += BufferedNetSocket.Tiles_hue[var18]; // L: 663 - var13 += class116.Tiles_saturation[var18]; // L: 664 - var14 += Tiles.Tiles_lightness[var18]; // L: 665 - var15 += class357.Tiles_hueMultiplier[var18]; // L: 666 - var16 += class361.field4213[var18]; // L: 667 - } - - var19 = var17 - 5; // L: 669 - if (var19 >= 0 && var19 < 104) { // L: 670 - var12 -= BufferedNetSocket.Tiles_hue[var19]; // L: 671 - var13 -= class116.Tiles_saturation[var19]; // L: 672 - var14 -= Tiles.Tiles_lightness[var19]; // L: 673 - var15 -= class357.Tiles_hueMultiplier[var19]; // L: 674 - var16 -= class361.field4213[var19]; // L: 675 - } - - if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { // L: 677 678 679 680 - if (var2 < Tiles.Tiles_minPlane) { // L: 683 - Tiles.Tiles_minPlane = var2; - } - - var20 = Tiles.Tiles_underlays[var2][var11][var17] & 255; // L: 684 - int var21 = class14.Tiles_overlays[var2][var11][var17] & 255; // L: 685 - if (var20 > 0 || var21 > 0) { // L: 686 - int var22 = Tiles.Tiles_heights[var2][var11][var17]; // L: 687 - int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; // L: 688 - int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; // L: 689 - int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; // L: 690 - int var26 = Tiles.field998[var11][var17]; // L: 691 - int var27 = Tiles.field998[var11 + 1][var17]; // L: 692 - int var28 = Tiles.field998[var11 + 1][var17 + 1]; // L: 693 - int var29 = Tiles.field998[var11][var17 + 1]; // L: 694 - int var30 = -1; // L: 695 - int var31 = -1; // L: 696 - int var32; - int var33; - if (var20 > 0) { // L: 697 - var32 = var12 * 256 / var15; // L: 698 - var33 = var13 / var16; // L: 699 - int var34 = var14 / var16; // L: 700 - var30 = class162.hslToRgb(var32, var33, var34); // L: 701 - var32 = var32 + Tiles.rndHue & 255; // L: 702 - var34 += Tiles.rndLightness; // L: 703 - if (var34 < 0) { // L: 704 - var34 = 0; - } else if (var34 > 255) { // L: 705 - var34 = 255; - } - - var31 = class162.hslToRgb(var32, var33, var34); // L: 706 - } - - if (var2 > 0) { // L: 708 - boolean var47 = true; // L: 709 - if (var20 == 0 && class147.Tiles_shapes[var2][var11][var17] != 0) { // L: 710 - var47 = false; - } - - if (var21 > 0 && !Clock.method3349(var21 - 1).hideUnderlay) { // L: 711 - var47 = false; - } - - if (var47 && var22 == var23 && var24 == var22 && var25 == var22) { // L: 712 713 - var10000 = class420.field4545[var2][var11]; - var10000[var17] |= 2340; - } - } - - var32 = 0; // L: 716 - if (var31 != -1) { // L: 717 - var32 = Rasterizer3D.Rasterizer3D_colorPalette[SoundCache.method772(var31, 96)]; - } - - if (var21 == 0) { // L: 718 - var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, SoundCache.method772(var30, var26), SoundCache.method772(var30, var27), SoundCache.method772(var30, var28), SoundCache.method772(var30, var29), 0, 0, 0, 0, var32, 0); // L: 719 - } else { - var33 = class147.Tiles_shapes[var2][var11][var17] + 1; // L: 722 - byte var48 = Tiles.field983[var2][var11][var17]; // L: 723 - FloorOverlayDefinition var35 = Clock.method3349(var21 - 1); // L: 724 - int var36 = var35.texture; // L: 725 - int var37; - int var38; - int var39; - int var40; - if (var36 >= 0) { // L: 728 - var38 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var36); // L: 729 - var37 = -1; // L: 730 - } else if (var35.primaryRgb == 16711935) { // L: 733 - var37 = -2; // L: 734 - var36 = -1; // L: 735 - var38 = -2; // L: 736 - } else { - var37 = class162.hslToRgb(var35.hue, var35.saturation, var35.lightness); // L: 739 - var39 = var35.hue + Tiles.rndHue & 255; // L: 740 - var40 = var35.lightness + Tiles.rndLightness; // L: 741 - if (var40 < 0) { // L: 742 - var40 = 0; - } else if (var40 > 255) { // L: 743 - var40 = 255; - } - - var38 = class162.hslToRgb(var39, var35.saturation, var40); // L: 744 - } - - var39 = 0; // L: 747 - if (var38 != -2) { // L: 748 - var39 = Rasterizer3D.Rasterizer3D_colorPalette[ClanSettings.method3028(var38, 96)]; - } - - if (var35.secondaryRgb != -1) { // L: 749 - var40 = var35.secondaryHue + Tiles.rndHue & 255; // L: 750 - int var41 = var35.secondaryLightness + Tiles.rndLightness; // L: 751 - if (var41 < 0) { // L: 752 - var41 = 0; - } else if (var41 > 255) { // L: 753 - var41 = 255; - } - - var38 = class162.hslToRgb(var40, var35.secondarySaturation, var41); // L: 754 - var39 = Rasterizer3D.Rasterizer3D_colorPalette[ClanSettings.method3028(var38, 96)]; // L: 755 - } - - var0.addTile(var2, var11, var17, var33, var48, var36, var22, var23, var24, var25, SoundCache.method772(var30, var26), SoundCache.method772(var30, var27), SoundCache.method772(var30, var28), SoundCache.method772(var30, var29), ClanSettings.method3028(var37, var26), ClanSettings.method3028(var37, var27), ClanSettings.method3028(var37, var28), ClanSettings.method3028(var37, var29), var32, var39); // L: 757 - } - } - } - } - } - } - - for (var11 = 1; var11 < 103; ++var11) { // L: 764 - for (var12 = 1; var12 < 103; ++var12) { // L: 765 - if ((Tiles.Tiles_renderFlags[var2][var12][var11] & 8) != 0) { // L: 772 - var17 = 0; // L: 773 - } else if (var2 > 0 && (Tiles.Tiles_renderFlags[1][var12][var11] & 2) != 0) { // L: 776 - var17 = var2 - 1; // L: 777 - } else { - var17 = var2; // L: 780 - } - - var0.setTileMinPlane(var2, var12, var11, var17); // L: 782 - } - } - - Tiles.Tiles_underlays[var2] = null; // L: 785 - class14.Tiles_overlays[var2] = null; // L: 786 - class147.Tiles_shapes[var2] = null; // L: 787 - Tiles.field983[var2] = null; // L: 788 - class392.field4374[var2] = null; // L: 789 } - - var0.method4762(-50, -10, -50); // L: 791 - - for (var2 = 0; var2 < 104; ++var2) { // L: 792 - for (var3 = 0; var3 < 104; ++var3) { // L: 793 - if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 794 - var0.setLinkBelow(var2, var3); - } - } - } - - var2 = 1; // L: 797 - var3 = 2; // L: 798 - var4 = 4; // L: 799 - - for (var5 = 0; var5 < 4; ++var5) { // L: 800 - if (var5 > 0) { // L: 801 - var2 <<= 3; // L: 802 - var3 <<= 3; // L: 803 - var4 <<= 3; // L: 804 - } - - for (int var6 = 0; var6 <= var5; ++var6) { // L: 806 - for (int var7 = 0; var7 <= 104; ++var7) { // L: 807 - for (int var8 = 0; var8 <= 104; ++var8) { // L: 808 - short var46; - if ((class420.field4545[var6][var8][var7] & var2) != 0) { // L: 809 - var9 = var7; // L: 810 - var10 = var7; // L: 811 - var11 = var6; // L: 812 - - for (var12 = var6; var9 > 0 && (class420.field4545[var6][var8][var9 - 1] & var2) != 0; --var9) { // L: 813 814 - } - - while (var10 < 104 && (class420.field4545[var6][var8][var10 + 1] & var2) != 0) { // L: 815 - ++var10; - } - - label432: - while (var11 > 0) { // L: 816 - for (var13 = var9; var13 <= var10; ++var13) { // L: 817 - if ((class420.field4545[var11 - 1][var8][var13] & var2) == 0) { - break label432; - } - } - - --var11; // L: 818 - } - - label421: - while (var12 < var5) { // L: 820 - for (var13 = var9; var13 <= var10; ++var13) { // L: 821 - if ((class420.field4545[var12 + 1][var8][var13] & var2) == 0) { - break label421; - } - } - - ++var12; // L: 822 - } - - var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 824 - if (var13 >= 8) { // L: 825 - var46 = 240; // L: 826 - var15 = Tiles.Tiles_heights[var12][var8][var9] - var46; // L: 827 - var16 = Tiles.Tiles_heights[var11][var8][var9]; // L: 828 - Scene.Scene_addOccluder(var5, 1, var8 * 128, var8 * 128, var9 * 128, var10 * 128 + 128, var15, var16); // L: 829 - - for (var17 = var11; var17 <= var12; ++var17) { // L: 830 - for (var18 = var9; var18 <= var10; ++var18) { // L: 831 - var10000 = class420.field4545[var17][var8]; - var10000[var18] &= ~var2; - } - } - } - } - - if ((class420.field4545[var6][var8][var7] & var3) != 0) { // L: 835 - var9 = var8; // L: 836 - var10 = var8; // L: 837 - var11 = var6; // L: 838 - - for (var12 = var6; var9 > 0 && (class420.field4545[var6][var9 - 1][var7] & var3) != 0; --var9) { // L: 839 840 - } - - while (var10 < 104 && (class420.field4545[var6][var10 + 1][var7] & var3) != 0) { // L: 841 - ++var10; - } - - label485: - while (var11 > 0) { // L: 842 - for (var13 = var9; var13 <= var10; ++var13) { // L: 843 - if ((class420.field4545[var11 - 1][var13][var7] & var3) == 0) { - break label485; - } - } - - --var11; // L: 844 - } - - label474: - while (var12 < var5) { // L: 846 - for (var13 = var9; var13 <= var10; ++var13) { // L: 847 - if ((class420.field4545[var12 + 1][var13][var7] & var3) == 0) { - break label474; - } - } - - ++var12; // L: 848 - } - - var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 850 - if (var13 >= 8) { // L: 851 - var46 = 240; // L: 852 - var15 = Tiles.Tiles_heights[var12][var9][var7] - var46; // L: 853 - var16 = Tiles.Tiles_heights[var11][var9][var7]; // L: 854 - Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var7 * 128, var7 * 128, var15, var16); // L: 855 - - for (var17 = var11; var17 <= var12; ++var17) { // L: 856 - for (var18 = var9; var18 <= var10; ++var18) { // L: 857 - var10000 = class420.field4545[var17][var18]; - var10000[var7] &= ~var3; - } - } - } - } - - if ((class420.field4545[var6][var8][var7] & var4) != 0) { // L: 861 - var9 = var8; // L: 862 - var10 = var8; // L: 863 - var11 = var7; // L: 864 - - for (var12 = var7; var11 > 0 && (class420.field4545[var6][var8][var11 - 1] & var4) != 0; --var11) { // L: 865 866 - } - - while (var12 < 104 && (class420.field4545[var6][var8][var12 + 1] & var4) != 0) { // L: 867 - ++var12; - } - - label538: - while (var9 > 0) { // L: 868 - for (var13 = var11; var13 <= var12; ++var13) { // L: 869 - if ((class420.field4545[var6][var9 - 1][var13] & var4) == 0) { - break label538; - } - } - - --var9; // L: 870 - } - - label527: - while (var10 < 104) { // L: 872 - for (var13 = var11; var13 <= var12; ++var13) { // L: 873 - if ((class420.field4545[var6][var10 + 1][var13] & var4) == 0) { - break label527; - } - } - - ++var10; // L: 874 - } - - if ((var10 - var9 + 1) * (var12 - var11 + 1) >= 4) { // L: 876 - var13 = Tiles.Tiles_heights[var6][var9][var11]; // L: 877 - Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); // L: 878 - - for (var14 = var9; var14 <= var10; ++var14) { // L: 879 - for (var15 = var11; var15 <= var12; ++var15) { // L: 880 - var10000 = class420.field4545[var6][var14]; - var10000[var15] &= ~var4; - } - } - } - } - } - } - } - } - - } // L: 888 + } // L: 11982 } diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index bc142a2069..8de9372fed 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -1,67 +1,75 @@ +import java.text.ParseException; +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("bn") +@ObfuscatedName("bf") @Implements("GraphicsObject") public class GraphicsObject extends Renderable { - @ObfuscatedName("v") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 633552685 + intValue = 772916355 + ) + @Export("canvasWidth") + public static int canvasWidth; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1248002899 ) @Export("id") int id; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1513105003 + intValue = -1478722299 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -809996185 + intValue = 118002909 ) @Export("plane") int plane; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1383105845 + intValue = 800105373 ) @Export("x") int x; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -2057789727 + intValue = -738623243 ) @Export("y") int y; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1487431233 + intValue = 1237979949 ) @Export("z") int z; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Lgq;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1421112585 + intValue = 657870691 ) @Export("frame") int frame; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1965539669 + intValue = 1465530257 ) @Export("frameCycle") int frameCycle; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("isFinished") boolean isFinished; @@ -75,20 +83,20 @@ public class GraphicsObject extends Renderable { this.y = var4; // L: 24 this.z = var5; // L: 25 this.cycleStart = var7 + var6; // L: 26 - int var8 = ClientPreferences.SpotAnimationDefinition_get(this.id).sequence; // L: 27 + int var8 = class136.SpotAnimationDefinition_get(this.id).sequence; // L: 27 if (var8 != -1) { // L: 28 this.isFinished = false; // L: 29 - this.sequenceDefinition = class163.SequenceDefinition_get(var8); // L: 30 + this.sequenceDefinition = class114.SequenceDefinition_get(var8); // L: 30 } else { this.isFinished = true; // L: 32 } } // L: 33 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "79" + garbageValue = "115" ) @Export("advance") final void advance(int var1) { @@ -105,7 +113,7 @@ public class GraphicsObject extends Renderable { } } else { this.frame += var1; // L: 49 - if (this.frame >= this.sequenceDefinition.method3844()) { // L: 50 + if (this.frame >= this.sequenceDefinition.method3729()) { // L: 50 this.isFinished = true; } } @@ -113,14 +121,14 @@ public class GraphicsObject extends Renderable { } } // L: 52 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)Liq;", - garbageValue = "103" + descriptor = "(I)Lhv;", + garbageValue = "-238822980" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = ClientPreferences.SpotAnimationDefinition_get(this.id); // L: 55 + SpotAnimationDefinition var1 = class136.SpotAnimationDefinition_get(this.id); // L: 55 Model var2; if (!this.isFinished) { // L: 57 var2 = var1.getModel(this.frame); @@ -131,6 +139,65 @@ public class GraphicsObject extends Renderable { return var2 == null ? null : var2; // L: 59 } + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljx;B)V", + garbageValue = "-3" + ) + public static void method1870(Huffman var0) { + class282.huffman = var0; // L: 14 + } // L: 15 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-2116498850" + ) + static boolean method1867() { + Date var0; + try { + var0 = class115.method2679(); // L: 955 + } catch (ParseException var7) { // L: 957 + class126.method2799(7); // L: 959 + class345.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 960 + return false; // L: 962 + } + + if (var0 == null) { // L: 964 + return false; // L: 965 + } else { + boolean var5 = class268.method5028(var0); // L: 967 + java.util.Calendar var4 = java.util.Calendar.getInstance(); // L: 972 + var4.set(2, 0); // L: 973 + var4.set(5, 1); // L: 974 + var4.set(1, 1900); // L: 975 + Date var3 = var4.getTime(); // L: 976 + boolean var2 = var0.after(var3); // L: 979 + if (!var2) { // L: 982 + class126.method2799(7); // L: 984 + class345.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 985 + return false; // L: 987 + } else { + if (!var5) { // L: 989 + class7.field26 = 8388607; // L: 990 + } else { + class7.field26 = (int)(var0.getTime() / 86400000L - 11745L); // L: 993 + } + + return true; // L: 995 + } + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "19136992" + ) + public static boolean method1868(int var0) { + return var0 == WorldMapDecorationType.field3578.id; // L: 51 + } + public GraphicsObject() { } } diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index dbd587defa..3c50e34845 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -3,37 +3,34 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ci") +@ObfuscatedName("ct") @Implements("HealthBar") public class HealthBar extends Node { - @ObfuscatedName("bc") - @Export("otp") - static String otp; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lfv;" + descriptor = "Lfr;" ) @Export("definition") HealthBarDefinition definition; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Llk;" + descriptor = "Llo;" ) @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - descriptor = "(Lfv;)V" + descriptor = "(Lfr;)V" ) HealthBar(HealthBarDefinition var1) { this.updates = new IterableNodeDeque(); // L: 12 this.definition = var1; // L: 15 } // L: 16 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-72" + descriptor = "(IIIII)V", + garbageValue = "-1281629783" ) @Export("put") void put(int var1, int var2, int var3, int var4) { @@ -44,11 +41,11 @@ public class HealthBar extends Node { ++var6; // L: 22 if (var7.cycle == var1) { // L: 23 var7.set(var1, var2, var3, var4); // L: 24 - return; // L: 25 + return; } - if (var7.cycle <= var1) { // L: 27 - var5 = var7; + if (var7.cycle <= var1) { + var5 = var7; // L: 27 } } @@ -66,10 +63,10 @@ public class HealthBar extends Node { } } // L: 31 35 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(II)Lcp;", - garbageValue = "675782761" + descriptor = "(IB)Lcn;", + garbageValue = "79" ) @Export("get") HealthBarUpdate get(int var1) { @@ -91,87 +88,60 @@ public class HealthBar extends Node { } } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "-107" + garbageValue = "127" ) @Export("isEmpty") boolean isEmpty() { - return this.updates.method6164(); // L: 55 + return this.updates.method5986(); // L: 55 } - @ObfuscatedName("c") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-31" + descriptor = "(I)[Ldl;", + garbageValue = "-95794784" ) - public static int method2344(int var0) { - return class400.field4389[var0 & 16383]; // L: 28 + static class118[] method2333() { + return new class118[]{class118.field1498, class118.field1491, class118.field1492, class118.field1499, class118.field1490, class118.field1495}; // L: 25 } - @ObfuscatedName("ai") + @ObfuscatedName("fv") @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "1491549945" + descriptor = "(Lle;Ljava/lang/String;I)V", + garbageValue = "757631192" ) - static int method2343(int var0, Script var1, boolean var2) { - if (var0 == 6800) { // L: 4511 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 4512 - return 1; // L: 4513 - } else if (var0 != 6801 && var0 != 6802) { // L: 4515 - if (var0 == 6850) { // L: 4519 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 4520 - return 1; // L: 4521 - } else if (var0 != 6851 && var0 != 6852) { // L: 4523 - if (var0 == 6853) { // L: 4527 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4528 - return 1; // L: 4529 - } else { - return 2; // L: 4531 - } - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4524 - return 1; // L: 4525 - } - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4516 - return 1; // L: 4517 - } - } + static void method2335(Archive var0, String var1) { + ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1475 + Client.archiveLoaders.add(var2); // L: 1476 + Client.field770 += var2.groupCount; // L: 1477 + } // L: 1478 - @ObfuscatedName("il") + @ObfuscatedName("gp") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1357746428" + descriptor = "(B)V", + garbageValue = "85" ) - static final void method2330(int var0, int var1, int var2, int var3) { - for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 8655 - 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: 8656 - Client.field715[var4] = true; + static final void method2334() { + if (Tiles.field997) { // L: 3842 + for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 3844 + Player var1 = Client.players[Players.Players_indices[var0]]; // L: 3845 + var1.method2114(); // L: 3846 } + + Tiles.field997 = false; // L: 3849 } - } // L: 8658 + } // L: 3851 - @ObfuscatedName("lq") + @ObfuscatedName("ig") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-66" + descriptor = "(I)V", + garbageValue = "2108689548" ) - static final void method2328(int var0, int var1) { - ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : class21.guestClanChannel; // L: 12409 - if (var2 != null && var1 >= 0 && var1 < var2.method3119()) { // L: 12410 - ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); // L: 12411 - if (var3.rank == -1) { - String var4 = var3.username.getName(); // L: 12413 - PacketBufferNode var5 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2900, Client.packetWriter.isaacCipher); // L: 12414 - var5.packetBuffer.writeByte(3 + class425.stringCp1252NullTerminatedByteSize(var4)); // L: 12415 - var5.packetBuffer.writeByte(var0); // L: 12416 - var5.packetBuffer.writeShort(var1); // L: 12417 - var5.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 12418 - Client.packetWriter.addNode(var5); // L: 12419 - } - } - } // L: 12412 12420 + static void method2336() { + Client.menuOptionsCount = 0; // L: 8697 + Client.isMenuOpen = false; // L: 8698 + } // L: 8699 } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index 6fe4819207..3ad0b5a2bf 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -4,123 +4,111 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fv") +@ObfuscatedName("fr") @Implements("HealthBarDefinition") public class HealthBarDefinition extends DualNode { - @ObfuscatedName("v") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) - @Export("HealthBarDefinition_archive") - static AbstractArchive HealthBarDefinition_archive; - @ObfuscatedName("c") + public static AbstractArchive field1911; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lln;" - ) - static AbstractArchive field1863; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("HealthBarDefinition_cached") public static EvictingDualNodeHashTable HealthBarDefinition_cached; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("HealthBarDefinition_cachedSprites") - public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; - @ObfuscatedName("j") + static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -325466885 + intValue = -1302897985 ) - @Export("loginBoxCenter") - static int loginBoxCenter; - @ObfuscatedName("b") + public int field1908; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 522457699 - ) - public int field1862; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 685524889 + intValue = 202730899 ) @Export("int1") public int int1; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1399118515 + intValue = 2090616095 ) @Export("int2") public int int2; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1978967279 + intValue = -952719889 ) @Export("int3") public int int3; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1746211851 + intValue = -1042912721 ) - public int field1866; - @ObfuscatedName("p") + public int field1915; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -660483005 + intValue = 1843319957 ) @Export("int5") public int int5; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1226121631 + intValue = 1895414675 ) @Export("frontSpriteID") int frontSpriteID; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1146936599 + intValue = -608989391 ) @Export("backSpriteID") int backSpriteID; - @ObfuscatedName("d") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1563343657 + intValue = 1407123339 ) @Export("width") public int width; - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1571067937 + intValue = 675668437 ) @Export("widthPadding") public int widthPadding; static { - HealthBarDefinition_cached = new EvictingDualNodeHashTable(64); // L: 14 - HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); // L: 15 + HealthBarDefinition_cached = new EvictingDualNodeHashTable(64); + HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); } - HealthBarDefinition() { - this.int1 = 255; // L: 19 - this.int2 = 255; // L: 20 + public HealthBarDefinition() { + this.int1 = 255; + this.int2 = 255; this.int3 = -1; // L: 21 - this.field1866 = 1; // L: 22 - this.int5 = 70; // L: 23 - this.frontSpriteID = -1; // L: 24 - this.backSpriteID = -1; // L: 25 + this.field1915 = 1; // L: 22 + this.int5 = 70; + this.frontSpriteID = -1; + this.backSpriteID = -1; this.width = 30; // L: 26 - this.widthPadding = 0; // L: 27 - } // L: 29 + this.widthPadding = 0; + } - @ObfuscatedName("i") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-1265984356" + descriptor = "(Lpx;I)V", + garbageValue = "-819365300" ) @Export("decode") - void decode(Buffer var1) { + public void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); + int var2 = var1.readUnsignedByte(); // L: 31 if (var2 == 0) { return; } @@ -129,115 +117,176 @@ public class HealthBarDefinition extends DualNode { } } - @ObfuscatedName("f") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lpi;IB)V", - garbageValue = "7" + descriptor = "(Lpx;IB)V", + garbageValue = "22" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 55 + if (var2 == 1) { var1.readUnsignedShort(); - } else if (var2 == 2) { // L: 58 + } else if (var2 == 2) { // L: 41 this.int1 = var1.readUnsignedByte(); - } else if (var2 == 3) { // L: 59 + } else if (var2 == 3) { // L: 42 this.int2 = var1.readUnsignedByte(); - } else if (var2 == 4) { // L: 60 + } else if (var2 == 4) { this.int3 = 0; - } else if (var2 == 5) { // L: 61 + } else if (var2 == 5) { this.int5 = var1.readUnsignedShort(); - } else if (var2 == 6) { // L: 62 - var1.readUnsignedByte(); // L: 63 - } else if (var2 == 7) { // L: 65 - this.frontSpriteID = var1.method7692(); - } else if (var2 == 8) { // L: 66 - this.backSpriteID = var1.method7692(); - } else if (var2 == 11) { // L: 67 + } else if (var2 == 6) { + var1.readUnsignedByte(); + } else if (var2 == 7) { // L: 48 + this.frontSpriteID = var1.method7532(); + } else if (var2 == 8) { + this.backSpriteID = var1.method7532(); + } else if (var2 == 11) { this.int3 = var1.readUnsignedShort(); - } else if (var2 == 14) { // L: 68 + } else if (var2 == 14) { this.width = var1.readUnsignedByte(); - } else if (var2 == 15) { // L: 69 + } else if (var2 == 15) { this.widthPadding = var1.readUnsignedByte(); } - } // L: 71 + } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Lqi;", - garbageValue = "1780689910" + descriptor = "(I)Lqr;", + garbageValue = "1767705109" ) @Export("getFrontSprite") public SpritePixels getFrontSprite() { - if (this.frontSpriteID < 0) { // L: 74 + if (this.frontSpriteID < 0) { // L: 57 return null; } else { - SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); // L: 75 + SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); if (var1 != null) { - return var1; // L: 76 + return var1; } else { - var1 = class6.SpriteBuffer_getSprite(field1863, this.frontSpriteID, 0); // L: 77 + var1 = StructComposition.SpriteBuffer_getSprite(field1911, this.frontSpriteID, 0); if (var1 != null) { - HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); // L: 78 + HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); } - return var1; // L: 80 + return var1; } } } - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)Lqi;", - garbageValue = "-1861454537" - ) - @Export("getBackSprite") - public SpritePixels getBackSprite() { - if (this.backSpriteID < 0) { // L: 84 - return null; - } else { - SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 85 - if (var1 != null) { - return var1; // L: 86 - } else { - var1 = class6.SpriteBuffer_getSprite(field1863, this.backSpriteID, 0); // L: 87 - if (var1 != null) { - HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); // L: 88 - } - - return var1; // L: 90 - } - } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1984956667" - ) - public static void method3473() { - synchronized(MouseHandler.MouseHandler_instance) { // L: 45 - MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 46 - MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 47 - MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 48 - MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 49 - MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 50 - MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 51 - MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 52 - MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 53 - MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 54 - } - } // L: 56 - @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "14" + descriptor = "(I)Lqr;", + garbageValue = "2134989657" ) - public static void method3466() { - ObjectComposition.ObjectDefinition_cached.clear(); // L: 437 - ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 438 - ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 439 - ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 440 - } // L: 441 + @Export("getBackSprite") + public SpritePixels getBackSprite() { + if (this.backSpriteID < 0) { // L: 67 + return null; + } else { + SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 68 + if (var1 != null) { + return var1; // L: 69 + } else { + var1 = StructComposition.SpriteBuffer_getSprite(field1911, this.backSpriteID, 0); // L: 70 + if (var1 != null) { + HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); // L: 71 + } + + return var1; // L: 73 + } + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Llq;I)I", + garbageValue = "-857969129" + ) + @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 + + 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 = 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 + } + + var7 = RouteStrategy.method3795(var9); // L: 33 + var8 = RouteStrategy.method3795(var10); // L: 34 + var9 = class343.standardizeChar(var9, var2); // L: 35 + var10 = class343.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 class282.lowercaseChar(var9, var2) - class282.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 (var11 != var12 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) { // L: 52 + var11 = Character.toLowerCase(var11); // L: 53 + var12 = Character.toLowerCase(var12); // L: 54 + if (var11 != var12) { + return class282.lowercaseChar(var11, var2) - class282.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 (var12 != var13) { // L: 63 + return class282.lowercaseChar(var12, var2) - class282.lowercaseChar(var13, var2); + } + } + + return 0; // L: 65 + } + } } diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index 201d500183..e7f2c49e15 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -3,196 +3,80 @@ 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("cp") +@ObfuscatedName("cn") @Implements("HealthBarUpdate") public class HealthBarUpdate extends Node { - @ObfuscatedName("rg") - @ObfuscatedSignature( - descriptor = "Lqi;" - ) - @Export("sceneMinimapSprite") - static SpritePixels sceneMinimapSprite; - @ObfuscatedName("b") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1067255387 - ) - public static int field1189; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1328246863 + intValue = 1515089 ) @Export("cycle") int cycle; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 399035073 + intValue = 58622393 ) @Export("health") int health; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 573948343 + intValue = 609346869 ) @Export("health2") int health2; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 2144773551 + intValue = -1802686675 ) @Export("cycleOffset") int cycleOffset; HealthBarUpdate(int var1, int var2, int var3, int var4) { - this.cycle = var1; - this.health = var2; - this.health2 = var3; - this.cycleOffset = var4; - } + this.cycle = var1; // L: 12 + this.health = var2; // L: 13 + this.health2 = var3; // L: 14 + this.cycleOffset = var4; // L: 15 + } // L: 16 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-1624379348" + garbageValue = "-115890137" ) @Export("set") void set(int var1, int var2, int var3, int var4) { - this.cycle = var1; + this.cycle = var1; // L: 19 this.health = var2; // L: 20 - this.health2 = var3; - this.cycleOffset = var4; + this.health2 = var3; // L: 21 + this.cycleOffset = var4; // L: 22 + } // L: 23 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lqy;" + ) + @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("v") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lln;Lln;IZB)Lim;", - garbageValue = "-50" + descriptor = "(ZZB)I", + garbageValue = "-11" ) - public static Frames method2185(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 - } - } + public static int method2181(boolean var0, boolean var1) { + byte var2 = 0; // L: 170 + int var3 = var2 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; // L: 171 + return var3; // L: 172 } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "-30" - ) - static int method2186(int var0, Script var1, boolean var2) { - Widget var7; - if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1269 - int var4; - if (var0 == ScriptOpcodes.CC_TRIGGEROP) { // L: 1286 - var7 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1287 - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1288 - if (var4 >= 1 && var4 <= 10) { // L: 1289 - class93 var8 = new class93(var4, var7.id, var7.childIndex, var7.itemId); // L: 1292 - Interpreter.field843.add(var8); // L: 1293 - return 1; // L: 1294 - } else { - throw new RuntimeException(); // L: 1290 - } - } else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { // L: 1296 - Interpreter.Interpreter_intStackSize -= 3; // L: 1297 - int var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1298 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1299 - int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 1300 - if (var5 >= 1 && var5 <= 10) { // L: 1301 - class93 var6 = new class93(var5, var3, var4, class127.getWidget(var3).itemId); // L: 1304 - Interpreter.field843.add(var6); // L: 1305 - return 1; // L: 1306 - } else { - throw new RuntimeException(); // L: 1302 - } - } else { - return 2; // L: 1308 - } - } else if (Interpreter.field844 >= 10) { // L: 1270 - throw new RuntimeException(); // L: 1271 - } else { - if (var0 >= 2000) { // L: 1274 - var7 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1275 - } else { - var7 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1277 - } - - if (var7.onResize == null) { // L: 1278 - return 0; - } else { - ScriptEvent var9 = new ScriptEvent(); // L: 1279 - var9.widget = var7; // L: 1280 - var9.args = var7.onResize; // L: 1281 - var9.field1031 = Interpreter.field844 + 1; // L: 1282 - Client.scriptEvents.addFirst(var9); // L: 1283 - return 1; // L: 1284 - } - } - } - - @ObfuscatedName("jy") - @ObfuscatedSignature( - descriptor = "(Lky;III)V", - garbageValue = "-1103204446" - ) - @Export("alignWidgetPosition") - static void alignWidgetPosition(Widget var0, int var1, int var2) { - if (var0.xAlignment == 0) { // L: 10840 - var0.x = var0.rawX; - } else if (var0.xAlignment == 1) { // L: 10841 - var0.x = var0.rawX + (var1 - var0.width) / 2; - } else if (var0.xAlignment == 2) { // L: 10842 - var0.x = var1 - var0.width - var0.rawX; - } else if (var0.xAlignment == 3) { // L: 10843 - var0.x = var0.rawX * var1 >> 14; - } else if (var0.xAlignment == 4) { // L: 10844 - var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14); - } else { - var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 10845 - } - - if (var0.yAlignment == 0) { // L: 10846 - var0.y = var0.rawY; - } else if (var0.yAlignment == 1) { // L: 10847 - var0.y = (var2 - var0.height) / 2 + var0.rawY; - } else if (var0.yAlignment == 2) { // L: 10848 - var0.y = var2 - var0.height - var0.rawY; - } else if (var0.yAlignment == 3) { - var0.y = var2 * var0.rawY >> 14; // L: 10849 - } else if (var0.yAlignment == 4) { // L: 10850 - var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2; - } else { - var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 10851 - } - - } // L: 10852 } diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 5672f76a29..e542cd3b51 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -4,109 +4,114 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gs") +@ObfuscatedName("gk") @Implements("HitSplatDefinition") public class HitSplatDefinition extends DualNode { - @ObfuscatedName("v") + @ObfuscatedName("tb") + @ObfuscatedGetter( + intValue = 2130203017 + ) + static int field2077; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("HitSplatDefinition_archive") static AbstractArchive HitSplatDefinition_archive; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("HitSplatDefinition_cached") - public static EvictingDualNodeHashTable HitSplatDefinition_cached; - @ObfuscatedName("b") + static EvictingDualNodeHashTable HitSplatDefinition_cached; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("HitSplatDefinition_cachedSprites") - public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; - @ObfuscatedName("n") + static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("HitSplatDefinition_cachedFonts") - public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; - @ObfuscatedName("p") + static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -78193355 + intValue = 1395317347 ) @Export("fontId") int fontId; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -867488021 + intValue = 1417482049 ) @Export("textColor") public int textColor; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 566909491 + intValue = 1131373797 ) - public int field1998; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 2072278043 - ) - int field1999; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -367586383 - ) - int field2000; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 530891065 - ) - int field2001; + public int field2071; @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1859926009 + intValue = 1501343813 ) - int field2002; + int field2062; @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 621557545 + intValue = -63093085 ) - public int field2003; + int field2067; @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1339697259 + intValue = -580949191 ) - public int field2004; - @ObfuscatedName("a") + int field2064; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 2090677099 + intValue = 269659311 ) - public int field2005; - @ObfuscatedName("y") - String field2010; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 859094637 - ) - public int field2007; + int field2054; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 494157579 + intValue = 254386385 ) - public int field2011; - @ObfuscatedName("z") - @Export("transforms") - public int[] transforms; + public int field2055; @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -608530201 + intValue = -825953789 + ) + public int field2074; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -801066855 + ) + public int field2072; + @ObfuscatedName("d") + String field2069; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 1961631307 + ) + public int field2070; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -474593523 + ) + public int field2068; + @ObfuscatedName("i") + @Export("transforms") + public int[] transforms; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -901285467 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1991065381 + intValue = -895793349 ) @Export("transformVarp") int transformVarp; @@ -120,25 +125,25 @@ public class HitSplatDefinition extends DualNode { HitSplatDefinition() { this.fontId = -1; // L: 26 this.textColor = 16777215; // L: 27 - this.field1998 = 70; // L: 28 - this.field1999 = -1; // L: 29 - this.field2000 = -1; // L: 30 - this.field2001 = -1; // L: 31 - this.field2002 = -1; // L: 32 - this.field2003 = 0; // L: 33 - this.field2004 = 0; // L: 34 - this.field2005 = -1; // L: 35 - this.field2010 = ""; // L: 36 - this.field2007 = -1; // L: 37 - this.field2011 = 0; // L: 38 + this.field2071 = 70; // L: 28 + this.field2062 = -1; // L: 29 + this.field2067 = -1; // L: 30 + this.field2064 = -1; // L: 31 + this.field2054 = -1; // L: 32 + this.field2055 = 0; // L: 33 + this.field2074 = 0; // L: 34 + this.field2072 = -1; // L: 35 + this.field2069 = ""; // L: 36 + this.field2070 = -1; // L: 37 + this.field2068 = 0; // L: 38 this.transformVarbit = -1; // L: 40 this.transformVarp = -1; // L: 41 } // L: 43 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "1833933416" + descriptor = "(Lpx;I)V", + garbageValue = "507933572" ) @Export("decode") void decode(Buffer var1) { @@ -152,41 +157,41 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "127877365" + descriptor = "(Lpx;II)V", + garbageValue = "1744488048" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { // L: 70 - this.fontId = var1.method7692(); + this.fontId = var1.method7532(); } else if (var2 == 2) { // L: 71 this.textColor = var1.readMedium(); } else if (var2 == 3) { // L: 72 - this.field1999 = var1.method7692(); + this.field2062 = var1.method7532(); } else if (var2 == 4) { // L: 73 - this.field2001 = var1.method7692(); + this.field2064 = var1.method7532(); } else if (var2 == 5) { // L: 74 - this.field2000 = var1.method7692(); + this.field2067 = var1.method7532(); } else if (var2 == 6) { // L: 75 - this.field2002 = var1.method7692(); + this.field2054 = var1.method7532(); } else if (var2 == 7) { // L: 76 - this.field2003 = var1.readShort(); + this.field2055 = var1.readShort(); } else if (var2 == 8) { // L: 77 - this.field2010 = var1.readStringCp1252NullCircumfixed(); + this.field2069 = var1.readStringCp1252NullCircumfixed(); } else if (var2 == 9) { // L: 78 - this.field1998 = var1.readUnsignedShort(); + this.field2071 = var1.readUnsignedShort(); } else if (var2 == 10) { // L: 79 - this.field2004 = var1.readShort(); + this.field2074 = var1.readShort(); } else if (var2 == 11) { // L: 80 - this.field2005 = 0; + this.field2072 = 0; } else if (var2 == 12) { // L: 81 - this.field2007 = var1.readUnsignedByte(); + this.field2070 = var1.readUnsignedByte(); } else if (var2 == 13) { // L: 82 - this.field2011 = var1.readShort(); + this.field2068 = var1.readShort(); } else if (var2 == 14) { - this.field2005 = var1.readUnsignedShort(); // L: 83 + this.field2072 = var1.readUnsignedShort(); // L: 83 } else if (var2 == 17 || var2 == 18) { // L: 84 this.transformVarbit = var1.readUnsignedShort(); // L: 85 if (this.transformVarbit == 65535) { // L: 86 @@ -221,16 +226,16 @@ public class HitSplatDefinition extends DualNode { } // L: 103 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)Lgs;", - garbageValue = "-505226354" + descriptor = "(I)Lgk;", + garbageValue = "1570100163" ) @Export("transform") public final HitSplatDefinition transform() { int var1 = -1; // L: 106 if (this.transformVarbit != -1) { // L: 107 - var1 = SecureRandomCallable.getVarbit(this.transformVarbit); + var1 = class18.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { // L: 108 var1 = Varps.Varps_main[this.transformVarp]; } @@ -242,17 +247,17 @@ public class HitSplatDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? UserComparator3.method2602(var2) : null; // L: 112 113 + return var2 != -1 ? UserComparator4.method2567(var2) : null; // L: 112 113 } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/String;", - garbageValue = "864399323" + garbageValue = "1649280427" ) @Export("getString") public String getString(int var1) { - String var2 = this.field2010; // L: 117 + String var2 = this.field2069; // L: 117 while (true) { int var3 = var2.indexOf("%1"); // L: 119 @@ -260,26 +265,26 @@ public class HitSplatDefinition extends DualNode { return var2; // L: 123 } - var2 = var2.substring(0, var3) + ItemLayer.intToString(var1, false) + var2.substring(var3 + 2); // L: 121 + var2 = var2.substring(0, var3) + Message.intToString(var1, false) + var2.substring(var3 + 2); // L: 121 } } - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)Lqi;", - garbageValue = "872036041" + descriptor = "(B)Lqr;", + garbageValue = "-97" ) - public SpritePixels method3625() { - if (this.field1999 < 0) { // L: 127 + public SpritePixels method3531() { + if (this.field2062 < 0) { // L: 127 return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1999); // L: 128 + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2062); // L: 128 if (var1 != null) { return var1; // L: 129 } else { - var1 = class6.SpriteBuffer_getSprite(class282.field3261, this.field1999, 0); // L: 130 - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1999); // L: 131 + var1 = StructComposition.SpriteBuffer_getSprite(ModelData0.field2654, this.field2062, 0); // L: 130 + if (var1 != null) { // L: 131 + HitSplatDefinition_cachedSprites.put(var1, (long)this.field2062); } return var1; // L: 133 @@ -287,22 +292,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Lqi;", - garbageValue = "-1662028806" + descriptor = "(I)Lqr;", + garbageValue = "-1422876623" ) - public SpritePixels method3640() { - if (this.field2000 < 0) { // L: 137 + public SpritePixels method3534() { + if (this.field2067 < 0) { // L: 137 return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2000); // L: 138 + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2067); // L: 138 if (var1 != null) { return var1; // L: 139 } else { - var1 = class6.SpriteBuffer_getSprite(class282.field3261, this.field2000, 0); // L: 140 + var1 = StructComposition.SpriteBuffer_getSprite(ModelData0.field2654, this.field2067, 0); // L: 140 if (var1 != null) { // L: 141 - HitSplatDefinition_cachedSprites.put(var1, (long)this.field2000); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field2067); } return var1; // L: 143 @@ -310,22 +315,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)Lqi;", - garbageValue = "927571164" + descriptor = "(B)Lqr;", + garbageValue = "23" ) - public SpritePixels method3626() { - if (this.field2001 < 0) { // L: 147 + public SpritePixels method3533() { + if (this.field2064 < 0) { // L: 147 return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2001); // L: 148 + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2064); // L: 148 if (var1 != null) { return var1; // L: 149 } else { - var1 = class6.SpriteBuffer_getSprite(class282.field3261, this.field2001, 0); // L: 150 - if (var1 != null) { // L: 151 - HitSplatDefinition_cachedSprites.put(var1, (long)this.field2001); + var1 = StructComposition.SpriteBuffer_getSprite(ModelData0.field2654, this.field2064, 0); // L: 150 + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field2064); // L: 151 } return var1; // L: 153 @@ -333,22 +338,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lqi;", - garbageValue = "-1943622040" + descriptor = "(I)Lqr;", + garbageValue = "-554047425" ) - public SpritePixels method3627() { - if (this.field2002 < 0) { // L: 157 + public SpritePixels method3559() { + if (this.field2054 < 0) { // L: 157 return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2002); // L: 158 - if (var1 != null) { // L: 159 - return var1; + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2054); // L: 158 + if (var1 != null) { + return var1; // L: 159 } else { - var1 = class6.SpriteBuffer_getSprite(class282.field3261, this.field2002, 0); // L: 160 - if (var1 != null) { // L: 161 - HitSplatDefinition_cachedSprites.put(var1, (long)this.field2002); + var1 = StructComposition.SpriteBuffer_getSprite(ModelData0.field2654, this.field2054, 0); // L: 160 + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field2054); // L: 161 } return var1; // L: 163 @@ -356,10 +361,10 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(I)Lmd;", - garbageValue = "-1180066279" + descriptor = "(I)Lmx;", + garbageValue = "287302031" ) @Export("getFont") public Font getFont() { @@ -370,7 +375,7 @@ public class HitSplatDefinition extends DualNode { if (var1 != null) { // L: 169 return var1; } else { - var1 = class163.method3322(class282.field3261, class349.HitSplatDefinition_fontsArchive, this.fontId, 0); // L: 170 + var1 = class387.method6781(ModelData0.field2654, class1.HitSplatDefinition_fontsArchive, this.fontId, 0); // L: 170 if (var1 != null) { HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); // L: 171 } @@ -379,15 +384,4 @@ public class HitSplatDefinition extends DualNode { } } } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "12" - ) - @Export("Messages_getHistorySize") - 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 - } } diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java index fbe5b0156e..1923c41284 100644 --- a/runescape-client/src/main/java/HorizontalAlignment.java +++ b/runescape-client/src/main/java/HorizontalAlignment.java @@ -3,44 +3,42 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -@ObfuscatedName("fw") +@ObfuscatedName("fj") @Implements("HorizontalAlignment") public enum HorizontalAlignment implements MouseWheel { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lfw;" + descriptor = "Lfj;" ) - field1889(2, 0), - @ObfuscatedName("c") + field1938(2, 0), + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lfw;" + descriptor = "Lfj;" ) @Export("HorizontalAlignment_centered") - HorizontalAlignment_centered(1, 1), - @ObfuscatedName("i") + HorizontalAlignment_centered(0, 1), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lfw;" + descriptor = "Lfj;" ) - field1890(0, 2); + field1937(1, 2); - @ObfuscatedName("px") - @ObfuscatedSignature( - descriptor = "Loa;" - ) - static class391 field1885; - @ObfuscatedName("f") + @ObfuscatedName("jt") @ObfuscatedGetter( - intValue = 544424349 + intValue = -88443571 + ) + @Export("oculusOrbFocalPointX") + static int oculusOrbFocalPointX; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -150444483 ) @Export("value") public final int value; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -801699883 + intValue = -47587237 ) @Export("id") final int id; @@ -50,56 +48,111 @@ public enum HorizontalAlignment implements MouseWheel { this.id = var4; // L: 15 } // L: 16 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 19 + return this.id; // L: 20 } - @ObfuscatedName("s") + @ObfuscatedName("hh") @ObfuscatedSignature( - descriptor = "(I)Lqq;", - garbageValue = "2022945893" + descriptor = "(ZLpc;B)V", + garbageValue = "-31" ) - public static IndexedSprite method3492() { - IndexedSprite var0 = new IndexedSprite(); // L: 155 - var0.width = class451.SpriteBuffer_spriteWidth; // L: 156 - var0.height = class451.SpriteBuffer_spriteHeight; // L: 157 - var0.xOffset = class451.SpriteBuffer_xOffsets[0]; // L: 158 - var0.yOffset = class271.SpriteBuffer_yOffsets[0]; // L: 159 - var0.subWidth = class451.SpriteBuffer_spriteWidths[0]; // L: 160 - var0.subHeight = class451.SpriteBuffer_spriteHeights[0]; // L: 161 - var0.palette = NetFileRequest.SpriteBuffer_spritePalette; // L: 162 - var0.pixels = FriendLoginUpdate.SpriteBuffer_pixels[0]; // L: 163 - ArchiveDiskActionHandler.method5813(); // L: 164 - return var0; // L: 165 - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONObject;Ljava/lang/String;B)[F", - garbageValue = "-127" - ) - static float[] method3495(JSONObject var0, String var1) throws JSONException { - float[] var2 = new float[4]; // L: 307 - - try { - JSONArray var3 = var0.getJSONArray(var1); // L: 309 - var2[0] = (float)var3.optDouble(0, 0.0D); // L: 310 - var2[1] = (float)var3.optDouble(1, 0.0D); // L: 311 - var2[2] = (float)var3.optDouble(2, 1.0D); // L: 312 - var2[3] = (float)var3.optDouble(3, 1.0D); // L: 313 - } catch (JSONException var4) { // L: 315 - var2[0] = 0.0F; // L: 316 - var2[1] = 0.0F; // L: 317 - var2[2] = 1.0F; // L: 318 - var2[3] = 1.0F; // L: 319 + @Export("updateNpcs") + static final void updateNpcs(boolean var0, PacketBuffer var1) { + Client.field621 = 0; // L: 8002 + Client.field565 = 0; // L: 8003 + PacketBuffer var2 = Client.packetWriter.packetBuffer; // L: 8005 + var2.importIndex(); // L: 8006 + int var3 = var2.readBits(8); // L: 8007 + int var4; + if (var3 < Client.npcCount) { // L: 8008 + for (var4 = var3; var4 < Client.npcCount; ++var4) { // L: 8009 + Client.field616[++Client.field621 - 1] = Client.npcIndices[var4]; + } } - return var2; // L: 321 - } + if (var3 > Client.npcCount) { // L: 8011 + throw new RuntimeException(""); + } else { + Client.npcCount = 0; // L: 8012 + + for (var4 = 0; var4 < var3; ++var4) { // L: 8013 + int var5 = Client.npcIndices[var4]; // L: 8014 + NPC var6 = Client.npcs[var5]; // L: 8015 + int var7 = var2.readBits(1); // L: 8016 + if (var7 == 0) { // L: 8017 + Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8018 + var6.npcCycle = Client.cycle; // L: 8019 + } else { + int var8 = var2.readBits(2); // L: 8022 + if (var8 == 0) { // L: 8023 + Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8024 + var6.npcCycle = Client.cycle; // L: 8025 + Client.field601[++Client.field565 - 1] = var5; // L: 8026 + } else { + int var9; + int var10; + if (var8 == 1) { // L: 8029 + Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8030 + var6.npcCycle = Client.cycle; // L: 8031 + var9 = var2.readBits(3); // L: 8032 + var6.method2340(var9, class193.field2251); // L: 8033 + var10 = var2.readBits(1); // L: 8034 + if (var10 == 1) { // L: 8035 + Client.field601[++Client.field565 - 1] = var5; + } + } else if (var8 == 2) { // L: 8038 + Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8039 + var6.npcCycle = Client.cycle; // L: 8040 + if (var2.readBits(1) == 1) { // L: 8041 + var9 = var2.readBits(3); // L: 8042 + var6.method2340(var9, class193.field2248); // L: 8043 + var10 = var2.readBits(3); // L: 8044 + var6.method2340(var10, class193.field2248); // L: 8045 + } else { + var9 = var2.readBits(3); // L: 8048 + var6.method2340(var9, class193.field2249); // L: 8049 + } + + var9 = var2.readBits(1); // L: 8051 + if (var9 == 1) { + Client.field601[++Client.field565 - 1] = var5; // L: 8052 + } + } else if (var8 == 3) { // L: 8055 + Client.field616[++Client.field621 - 1] = var5; // L: 8056 + } + } + } + } + + class82.method2098(var0, var1); // L: 8061 + JagexCache.method3158(var1); // L: 8062 + + int var11; + for (var11 = 0; var11 < Client.field621; ++var11) { // L: 8063 + var3 = Client.field616[var11]; // L: 8064 + if (Client.npcs[var3].npcCycle != Client.cycle) { // L: 8065 + Client.npcs[var3].definition = null; // L: 8066 + Client.npcs[var3] = null; // L: 8067 + } + } + + if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 8070 + throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); + } else { + for (var11 = 0; var11 < Client.npcCount; ++var11) { // L: 8071 + if (Client.npcs[Client.npcIndices[var11]] == null) { // L: 8072 + throw new RuntimeException(var11 + "," + Client.npcCount); // L: 8073 + } + } + + } + } + } // L: 8076 } diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index b0b7b67fd0..9e89164640 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -6,19 +6,13 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("jx") @Implements("Huffman") public class Huffman { - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lpi;" - ) - @Export("NetCache_reference") - public static Buffer NetCache_reference; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("masks") int[] masks; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("bits") byte[] bits; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("keys") int[] keys; @@ -47,7 +41,7 @@ public class Huffman { for (var10 = var6 - 1; var10 >= 1; --var10) { // L: 25 var11 = var3[var10]; // L: 26 - if (var8 != var11) { // L: 27 + if (var11 != var8) { // L: 27 break; } @@ -105,10 +99,10 @@ public class Huffman { } // L: 60 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "([BII[BII)I", - garbageValue = "1922986790" + garbageValue = "-1517056524" ) @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { @@ -156,10 +150,10 @@ public class Huffman { return (var7 + 7 >> 3) - var5; // L: 97 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "([BI[BIII)I", - garbageValue = "-1823769978" + garbageValue = "-1136816719" ) @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { @@ -278,8 +272,8 @@ public class Huffman { var6 = 0; // L: 155 } - if ((var8 & 1) != 0) { // L: 157 - var6 = this.keys[var6]; + if ((var8 & 1) != 0) { + var6 = this.keys[var6]; // L: 157 } else { ++var6; // L: 158 } diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index 403db018fb..f7cbdb1e24 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -3,88 +3,114 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mw") +@ObfuscatedName("nd") @Implements("IgnoreList") public class IgnoreList extends UserList { - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lpe;" + descriptor = "Lpj;" ) @Export("loginType") final LoginType loginType; @ObfuscatedSignature( - descriptor = "(Lpe;)V" + descriptor = "(Lpj;)V" ) public IgnoreList(LoginType var1) { super(400); // L: 13 this.loginType = var1; // L: 14 } // L: 15 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Lnn;", - garbageValue = "-2105397576" + descriptor = "(I)Lnb;", + garbageValue = "-1695844600" ) @Export("newInstance") User newInstance() { - return new Ignored(); // L: 18 + return new Ignored(); // L: 19 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(II)[Lnn;", - garbageValue = "1888809026" + descriptor = "(II)[Lnb;", + garbageValue = "1788836658" ) @Export("newTypedArray") User[] newTypedArray(int var1) { - return new Ignored[var1]; // L: 22 + return new Ignored[var1]; // L: 24 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;IS)V", - garbageValue = "-22904" + descriptor = "(Lpx;IB)V", + garbageValue = "0" ) @Export("read") public void read(Buffer var1, int var2) { while (true) { - if (var1.offset < var2) { // L: 26 - int var3 = var1.readUnsignedByte(); // L: 27 - boolean var4 = (var3 & 1) == 1; // L: 28 - Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 29 - Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 30 - var1.readStringCp1252NullTerminated(); // L: 31 - if (var5 != null && var5.hasCleanName()) { // L: 32 - Ignored var7 = (Ignored)this.getByCurrentUsername(var5); // L: 33 - if (var4) { // L: 34 - Ignored var8 = (Ignored)this.getByCurrentUsername(var6); // L: 35 - if (var8 != null && var8 != var7) { // L: 36 - if (var7 != null) { // L: 37 - this.remove(var8); // L: 38 + if (var1.offset < var2) { // L: 28 + int var3 = var1.readUnsignedByte(); // L: 29 + boolean var4 = (var3 & 1) == 1; // L: 30 + Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 31 + Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 32 + var1.readStringCp1252NullTerminated(); // L: 33 + if (var5 != null && var5.hasCleanName()) { // L: 34 + Ignored var7 = (Ignored)this.getByCurrentUsername(var5); // L: 35 + if (var4) { // L: 36 + Ignored var8 = (Ignored)this.getByCurrentUsername(var6); // L: 37 + if (var8 != null && var7 != var8) { // L: 38 + if (var7 != null) { // L: 39 + this.remove(var8); // L: 40 } else { - var7 = var8; // L: 41 + var7 = var8; // L: 43 } } } - if (var7 != null) { // L: 45 - this.changeName(var7, var5, var6); // L: 46 + if (var7 != null) { // L: 47 + this.changeName(var7, var5, var6); // L: 48 continue; } - if (this.getSize() < 400) { // L: 48 - int var9 = this.getSize(); // L: 49 - var7 = (Ignored)this.addLast(var5, var6); // L: 50 - var7.id = var9; // L: 51 + if (this.getSize() < 400) { // L: 50 + int var9 = this.getSize(); // L: 51 + var7 = (Ignored)this.addLast(var5, var6); // L: 52 + var7.id = var9; // L: 53 } continue; } - throw new IllegalStateException(); // L: 54 + throw new IllegalStateException(); // L: 56 } - return; // L: 55 + return; // L: 57 + } + } + + @ObfuscatedName("il") + @ObfuscatedSignature( + descriptor = "(III)Ljava/lang/String;", + garbageValue = "1540266419" + ) + static final String method6430(int var0, int var1) { + int var2 = var1 - var0; // L: 10187 + if (var2 < -9) { // L: 10188 + return class166.colorStartTag(16711680); + } else if (var2 < -6) { // L: 10189 + return class166.colorStartTag(16723968); + } else if (var2 < -3) { // L: 10190 + return class166.colorStartTag(16740352); + } else if (var2 < 0) { // L: 10191 + return class166.colorStartTag(16756736); + } else if (var2 > 9) { // L: 10192 + return class166.colorStartTag(65280); + } else if (var2 > 6) { // L: 10193 + return class166.colorStartTag(4259584); + } else if (var2 > 3) { // L: 10194 + return class166.colorStartTag(8453888); + } else { + return var2 > 0 ? class166.colorStartTag(12648192) : class166.colorStartTag(16776960); // L: 10195 10196 } } } diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index 92377a87bb..b5b7539b4e 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -4,12 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ng") +@ObfuscatedName("nz") @Implements("Ignored") public class Ignored extends User { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -60193045 + intValue = 157062685 ) @Export("id") int id; @@ -17,20 +17,20 @@ public class Ignored extends User { Ignored() { } // L: 6 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lng;B)I", - garbageValue = "-48" + descriptor = "(Lnz;B)I", + garbageValue = "0" ) @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { return this.id - var1.id; // L: 9 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lnn;I)I", - garbageValue = "842367957" + descriptor = "(Lnb;I)I", + garbageValue = "434999779" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -41,14 +41,18 @@ public class Ignored extends User { return this.compareTo_ignored((Ignored)var1); // L: 17 } - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "127" + descriptor = "([FIFI)F", + garbageValue = "-1881391939" ) - static void method6828(int var0) { - if (var0 != Login.loginIndex) { // L: 1852 - Login.loginIndex = var0; // L: 1853 + static float method6616(float[] var0, int var1, float var2) { + float var3 = var0[var1]; // L: 108 + + for (int var4 = var1 - 1; var4 >= 0; --var4) { // L: 109 + var3 = var2 * var3 + var0[var4]; // L: 110 } - } // L: 1854 + + return var3; // L: 112 + } } diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java index f67fa583bb..0bbe4c4d00 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -2,35 +2,38 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("qq") +@ObfuscatedName("qd") @Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("pixels") public byte[] pixels; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("palette") public int[] palette; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("subWidth") public int subWidth; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("subHeight") public int subHeight; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("xOffset") public int xOffset; - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("yOffset") public int yOffset; - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("width") public int width; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("height") public int height; - @ObfuscatedName("v") + IndexedSprite() { + } // L: 15 + + @ObfuscatedName("o") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { // L: 18 @@ -51,7 +54,7 @@ public final class IndexedSprite extends Rasterizer2D { } } // L: 31 - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.palette.length; ++var4) { // L: 34 @@ -84,7 +87,7 @@ public final class IndexedSprite extends Rasterizer2D { } // L: 49 - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; // L: 52 @@ -130,8 +133,8 @@ public final class IndexedSprite extends Rasterizer2D { } } // L: 85 - @ObfuscatedName("b") - public void method8054(int var1, int var2, int var3, int var4) { + @ObfuscatedName("a") + public void method7927(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 @@ -192,7 +195,7 @@ public final class IndexedSprite extends Rasterizer2D { IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); // L: 157 } // L: 158 - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("IndexedSprite_two") static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); // L: 88 @@ -246,7 +249,7 @@ public final class IndexedSprite extends Rasterizer2D { } // L: 113 - @ObfuscatedName("n") + @ObfuscatedName("m") @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 abb93c7043..5294b7693e 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -4,112 +4,112 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bj") +@ObfuscatedName("bk") @Implements("Instrument") public class Instrument { - @ObfuscatedName("t") + @ObfuscatedName("n") @Export("Instrument_samples") static int[] Instrument_samples; - @ObfuscatedName("g") + @ObfuscatedName("e") @Export("Instrument_noise") static int[] Instrument_noise; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("Instrument_sine") static int[] Instrument_sine; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("Instrument_phases") static int[] Instrument_phases; @ObfuscatedName("j") @Export("Instrument_delays") static int[] Instrument_delays; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; - @ObfuscatedName("z") + @ObfuscatedName("i") @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; - @ObfuscatedName("h") + @ObfuscatedName("u") @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lag;" + descriptor = "Laq;" ) @Export("pitch") SoundEnvelope pitch; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lag;" + descriptor = "Laq;" ) @Export("volume") SoundEnvelope volume; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lag;" + descriptor = "Laq;" ) @Export("pitchModifier") SoundEnvelope pitchModifier; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lag;" + descriptor = "Laq;" ) @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lag;" + descriptor = "Laq;" ) @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lag;" + descriptor = "Laq;" ) @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lag;" + descriptor = "Laq;" ) @Export("release") SoundEnvelope release; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lag;" + descriptor = "Laq;" ) @Export("attack") SoundEnvelope attack; - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("oscillatorVolume") int[] oscillatorVolume; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("oscillatorPitch") int[] oscillatorPitch; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("oscillatorDelays") int[] oscillatorDelays; - @ObfuscatedName("p") + @ObfuscatedName("c") @Export("delayTime") int delayTime; @ObfuscatedName("w") @Export("delayDecay") int delayDecay; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Laa;" + descriptor = "Lba;" ) @Export("filter") AudioFilter filter; - @ObfuscatedName("d") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lag;" + descriptor = "Laq;" ) @Export("filterEnvelope") SoundEnvelope filterEnvelope; - @ObfuscatedName("m") + @ObfuscatedName("g") @Export("duration") int duration; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("offset") int offset; @@ -146,10 +146,10 @@ public class Instrument { this.offset = 0; // L: 25 } // L: 50 - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("synthesize") final int[] synthesize(int var1, int var2) { - class350.clearIntArray(Instrument_samples, 0, var1); // L: 53 + class351.clearIntArray(Instrument_samples, 0, var1); // L: 53 if (var2 < 10) { // L: 54 return Instrument_samples; } else { @@ -289,6 +289,7 @@ public class Instrument { ++var14; // L: 139 } + boolean var21 = true; // L: 146 var15 = 128; // L: 147 while (true) { @@ -353,7 +354,7 @@ public class Instrument { } } - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { if (var3 == 1) { // L: 179 @@ -367,9 +368,9 @@ public class Instrument { } } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpx;)V" ) @Export("decode") final void decode(Buffer var1) { diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java index 4c53738775..1945f20dca 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -1,12 +1,13 @@ +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("qc") +@ObfuscatedName("qz") @Implements("IntHashTable") public class IntHashTable { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("array") int[] array; @@ -32,10 +33,10 @@ public class IntHashTable { } // L: 17 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "83" + descriptor = "(IS)I", + garbageValue = "-5470" ) @Export("get") public int get(int var1) { @@ -55,4 +56,36 @@ public class IntHashTable { var3 = var3 + 1 & var2; // L: 26 } } + + @ObfuscatedName("ly") + @ObfuscatedSignature( + descriptor = "(Lpx;B)V", + garbageValue = "20" + ) + static void method8124(Buffer var0) { + if (Client.randomDatData != null) { // L: 12625 + var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 12626 + } else { + byte[] var2 = new byte[24]; // L: 12631 + + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 12633 + JagexCache.JagexCache_randomDat.readFully(var2); // L: 12634 + + int var3; + for (var3 = 0; var3 < 24 && var2[var3] == 0; ++var3) { // L: 12635 12636 12637 + } + + if (var3 >= 24) { // L: 12639 + throw new IOException(); + } + } catch (Exception var6) { + for (int var4 = 0; var4 < 24; ++var4) { // L: 12642 + var2[var4] = -1; + } + } + + var0.writeBytes(var2, 0, var2.length); // L: 12647 + } + } // L: 12627 12648 } diff --git a/runescape-client/src/main/java/IntegerNode.java b/runescape-client/src/main/java/IntegerNode.java index c4cbcbb7b7..8a2fed9213 100644 --- a/runescape-client/src/main/java/IntegerNode.java +++ b/runescape-client/src/main/java/IntegerNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("og") +@ObfuscatedName("ok") @Implements("IntegerNode") public class IntegerNode extends Node { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("integer") public int integer; diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java index 51af637e3f..9355e28779 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -1,45 +1,173 @@ +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("cc") +@ObfuscatedName("ck") @Implements("InterfaceParent") public class InterfaceParent extends Node { - @ObfuscatedName("v") + @ObfuscatedName("sx") + @ObfuscatedSignature( + descriptor = "Lqr;" + ) + @Export("sceneMinimapSprite") + static SpritePixels sceneMinimapSprite; + @ObfuscatedName("s") + @Export("soundSystemExecutor") + static ScheduledExecutorService soundSystemExecutor; + @ObfuscatedName("ed") + @ObfuscatedSignature( + descriptor = "Lle;" + ) + @Export("archive7") + static Archive archive7; + @ObfuscatedName("ha") + @Export("regionLandArchives") + static byte[][] regionLandArchives; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -457481163 + intValue = -1909605869 ) @Export("group") int group; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 327822779 + intValue = -116763185 ) @Export("type") int type; - @ObfuscatedName("i") - boolean field1028; + @ObfuscatedName("l") + boolean field1034; InterfaceParent() { - this.field1028 = false; + this.field1034 = false; // L: 8 + } // L: 10 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[IIII)V", + garbageValue = "1544258939" + ) + static void method2072(String[] var0, int[] var1, int var2, int var3) { + if (var2 < var3) { // L: 43 + int var4 = (var3 + var2) / 2; // L: 44 + int var5 = var2; // L: 45 + String var6 = var0[var4]; // L: 46 + var0[var4] = var0[var3]; // L: 47 + var0[var3] = var6; // L: 48 + int var7 = var1[var4]; // L: 49 + var1[var4] = var1[var3]; // L: 50 + var1[var3] = var7; // L: 51 + + for (int var8 = var2; var8 < var3; ++var8) { // L: 52 + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 53 + String var9 = var0[var8]; // L: 54 + var0[var8] = var0[var5]; // L: 55 + var0[var5] = var9; // L: 56 + int var10 = var1[var8]; // L: 57 + var1[var8] = var1[var5]; // L: 58 + var1[var5++] = var10; // L: 59 + } + } + + var0[var3] = var0[var5]; // L: 63 + var0[var5] = var6; // L: 64 + var1[var3] = var1[var5]; // L: 65 + var1[var5] = var7; // L: 66 + method2072(var0, var1, var2, var5 - 1); // L: 67 + method2072(var0, var1, var5 + 1, var3); // L: 68 + } + + } // L: 70 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "1735508491" + ) + public static int[] method2071() { + int[] var0 = new int[KeyHandler.field139]; // L: 242 + + for (int var1 = 0; var1 < KeyHandler.field139; ++var1) { // L: 243 + var0[var1] = KeyHandler.field138[var1]; // L: 244 + } + + return var0; // L: 246 } - @ObfuscatedName("v") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "([BZI)Ljava/lang/Object;", - garbageValue = "-886747176" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "46" ) - public static Object method2084(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: 16 - } + static final void method2067(String var0) { + WorldMapEvent.addGameMessage(30, "", var0); // L: 126 + } // L: 127 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "104" + ) + static final int method2070(int var0, int var1, int var2) { + int var3 = var0 / var2; // L: 926 + int var4 = var0 & var2 - 1; // L: 927 + int var5 = var1 / var2; // L: 928 + int var6 = var1 & var2 - 1; // L: 929 + int var7 = method2068(var3, var5); // L: 930 + int var8 = method2068(var3 + 1, var5); // L: 931 + int var9 = method2068(var3, var5 + 1); // L: 932 + int var10 = method2068(var3 + 1, var5 + 1); // L: 933 + int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 936 + int var11 = ((65536 - var12) * var7 >> 16) + (var8 * var12 >> 16); // L: 937 + int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 942 + int var13 = ((65536 - var14) * var9 >> 16) + (var14 * var10 >> 16); // L: 943 + int var16 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; // L: 948 + int var15 = ((65536 - var16) * var11 >> 16) + (var16 * var13 >> 16); // L: 949 + return var15; // L: 951 } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IIS)I", + garbageValue = "28815" + ) + static final int method2068(int var0, int var1) { + int var2 = class327.method5869(var0 - 1, var1 - 1) + class327.method5869(1 + var0, var1 - 1) + class327.method5869(var0 - 1, var1 + 1) + class327.method5869(1 + var0, 1 + var1); // L: 955 + int var3 = class327.method5869(var0 - 1, var1) + class327.method5869(1 + var0, var1) + class327.method5869(var0, var1 - 1) + class327.method5869(var0, var1 + 1); // L: 956 + int var4 = class327.method5869(var0, var1); // L: 957 + return var2 / 16 + var3 / 8 + var4 / 4; // L: 958 + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "55" + ) + static int method2066(int var0) { + return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); // L: 3837 + } + + @ObfuscatedName("le") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1929019996" + ) + static final void method2069(int var0, int var1) { + ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : UserComparator10.guestClanChannel; // L: 12463 + if (var2 != null && var1 >= 0 && var1 < var2.method3005()) { // L: 12464 + ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); // L: 12465 + if (var3.rank == -1) { + String var4 = var3.username.getName(); // L: 12467 + PacketBufferNode var5 = WallDecoration.getPacketBufferNode(ClientPacket.field3040, Client.packetWriter.isaacCipher); // L: 12468 + var5.packetBuffer.writeByte(3 + class392.stringCp1252NullTerminatedByteSize(var4)); // L: 12469 + var5.packetBuffer.writeByte(var0); // L: 12470 + var5.packetBuffer.writeShort(var1); // L: 12471 + var5.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 12472 + Client.packetWriter.addNode(var5); // L: 12473 + } + } + } // L: 12466 12474 } diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index eab0d19ca5..f6ebcf9645 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -1,9 +1,5 @@ -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.ByteArrayInputStream; -import java.io.IOException; import java.util.ArrayList; -import javax.imageio.ImageIO; +import java.util.Collections; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -11,76 +7,65 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bg") +@ObfuscatedName("be") @Implements("Interpreter") public class Interpreter { - @ObfuscatedName("rm") - @Export("ClanChat_inClanChat") - static boolean ClanChat_inClanChat; - @ObfuscatedName("b") - @Export("Interpreter_stringLocals") - static String[] Interpreter_stringLocals; - @ObfuscatedName("n") + @ObfuscatedName("to") + @ObfuscatedGetter( + intValue = -1644525113 + ) + static int field838; + @ObfuscatedName("m") @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("Interpreter_arrays") static int[][] Interpreter_arrays; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("Interpreter_intStack") static int[] Interpreter_intStack; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -264358279 - ) - @Export("Interpreter_intStackSize") - static int Interpreter_intStackSize; - @ObfuscatedName("o") + @ObfuscatedName("r") + static int[][] field839; + @ObfuscatedName("v") @Export("Interpreter_stringStack") static String[] Interpreter_stringStack; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -552565383 + intValue = -2003285519 ) @Export("Interpreter_frameDepth") static int Interpreter_frameDepth; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lbl;" + descriptor = "[Lbc;" ) @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Lki;" ) - @Export("scriptActiveWidget") - static Widget scriptActiveWidget; - @ObfuscatedName("g") + @Export("scriptDotWidget") + static Widget scriptDotWidget; + @ObfuscatedName("e") @Export("Interpreter_calendar") static java.util.Calendar Interpreter_calendar; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("Interpreter_MONTHS") static final String[] Interpreter_MONTHS; - @ObfuscatedName("y") - static boolean field841; + @ObfuscatedName("d") + static boolean field835; @ObfuscatedName("j") - static boolean field842; - @ObfuscatedName("e") - static ArrayList field843; + static boolean field833; @ObfuscatedName("z") + static ArrayList field821; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1021880361 + intValue = -628954657 ) - static int field844; - @ObfuscatedName("aw") - static final double field845; - @ObfuscatedName("nh") - @ObfuscatedSignature( - descriptor = "Lba;" - ) - @Export("tempMenuAction") - static MenuAction tempMenuAction; + static int field823; + @ObfuscatedName("am") + static final double field837; static { Interpreter_arrayLengths = new int[5]; // L: 75 @@ -91,450 +76,93 @@ public class Interpreter { Interpreter_frames = new ScriptFrame[50]; // L: 82 Interpreter_calendar = java.util.Calendar.getInstance(); // L: 88 Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; // L: 91 - field841 = false; // L: 94 - field842 = false; // L: 95 - field843 = new ArrayList(); // L: 96 - field844 = 0; // L: 97 - field845 = Math.log(2.0D); // L: 101 + field835 = false; // L: 94 + field833 = false; // L: 95 + field821 = new ArrayList(); // L: 96 + field823 = 0; // L: 97 + field837 = Math.log(2.0D); // L: 101 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([BB)Lqi;", - garbageValue = "-84" + descriptor = "([I[II)V", + garbageValue = "-1325635329" ) - public static final SpritePixels method1889(byte[] var0) { - BufferedImage var1 = null; + public static void method1866(int[] var0, int[] var1) { + if (var0 != null && var1 != null) { // L: 43 + FileSystem.ByteArrayPool_alternativeSizes = var0; // L: 50 + GrandExchangeEvents.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; // L: 51 + class131.ByteArrayPool_arrays = new byte[var0.length][][]; // L: 52 - 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 SpritePixels(var4, var2, var3); // L: 28 - } catch (IOException var7) { // L: 30 - } catch (InterruptedException var8) { // L: 31 - } + for (int var2 = 0; var2 < FileSystem.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 53 + class131.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; // L: 54 + ByteArrayPool.field4212.add(var0[var2]); // L: 55 + } - return new SpritePixels(0, 0); // L: 32 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "([BI)Lhn;", - garbageValue = "-1771552883" - ) - static WorldMapSprite method1798(byte[] var0) { - return var0 == null ? new WorldMapSprite() : new WorldMapSprite(method1889(var0).pixels); // L: 19 20 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lch;III)V", - garbageValue = "-1891697067" - ) - @Export("runScript") - static void runScript(ScriptEvent var0, int var1, int var2) { - Object[] var3 = var0.args; // L: 112 - Script var4; - int var20; - if (class17.isWorldMapEvent(var0.type)) { // L: 114 - SpotAnimationDefinition.worldMapEvent = (WorldMapEvent)var3[0]; // L: 115 - WorldMapElement var5 = UserComparator7.WorldMapElement_get(SpotAnimationDefinition.worldMapEvent.mapElement); // L: 116 - var4 = GameObject.getWorldMapScript(var0.type, var5.objectId, var5.category); // L: 117 + Collections.sort(ByteArrayPool.field4212); // L: 57 } else { - var20 = (Integer)var3[0]; // L: 120 - var4 = ClanChannel.getScript(var20); // L: 121 + FileSystem.ByteArrayPool_alternativeSizes = null; // L: 44 + GrandExchangeEvents.ByteArrayPool_altSizeArrayCounts = null; // L: 45 + class131.ByteArrayPool_arrays = null; // L: 46 + LoginScreenAnimation.method2217(); // L: 47 + } + } // L: 48 58 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(ILbb;ZI)I", + garbageValue = "1050592537" + ) + static int method1793(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 818 + var0 -= 1000; // L: 819 + var3 = class92.getWidget(Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 820 + } else { + var3 = var2 ? scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 822 } - if (var4 != null) { // L: 123 - Interpreter_intStackSize = 0; // L: 126 - class122.Interpreter_stringStackSize = 0; // L: 127 - var20 = -1; // L: 128 - int[] var6 = var4.opcodes; // L: 129 - int[] var7 = var4.intOperands; // L: 130 - byte var8 = -1; // L: 131 - Interpreter_frameDepth = 0; // L: 132 - field841 = false; // L: 133 - boolean var9 = false; // L: 134 - int var10 = 0; // L: 135 - boolean var30 = false; - - label950: { - label951: { - try { - int var13; - try { - var30 = true; // L: 137 - GrandExchangeOfferNameComparator.Interpreter_intLocals = new int[var4.localIntCount]; // L: 138 - int var11 = 0; // L: 139 - Interpreter_stringLocals = new String[var4.localStringCount]; // L: 140 - int var12 = 0; - - int var14; - String var21; - for (var13 = 1; var13 < var3.length; ++var13) { // L: 141 - if (var3[var13] instanceof Integer) { // L: 142 - var14 = (Integer)var3[var13]; // L: 143 - if (var14 == -2147483647) { // L: 144 - var14 = var0.mouseX; - } - - if (var14 == -2147483646) { // L: 145 - var14 = var0.mouseY; - } - - if (var14 == -2147483645) { // L: 146 - var14 = var0.widget != null ? var0.widget.id * 1389111653 * 785571949 : -1; - } - - if (var14 == -2147483644) { // L: 147 - var14 = var0.opIndex; - } - - if (var14 == -2147483643) { // L: 148 - var14 = var0.widget != null ? var0.widget.childIndex * -1989091849 * -1317080121 : -1; - } - - if (var14 == -2147483642) { // L: 149 - var14 = var0.dragTarget != null ? var0.dragTarget.id * 1389111653 * 785571949 : -1; - } - - if (var14 == -2147483641) { // L: 150 - var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * -1989091849 * -1317080121 : -1; - } - - if (var14 == -2147483640) { // L: 151 - var14 = var0.keyTyped; - } - - if (var14 == -2147483639) { // L: 152 - var14 = var0.keyPressed; - } - - GrandExchangeOfferNameComparator.Interpreter_intLocals[var11++] = var14; // L: 153 - } else if (var3[var13] instanceof String) { // L: 155 - var21 = (String)var3[var13]; // L: 156 - if (var21.equals("event_opbase")) { // L: 157 - var21 = var0.targetName; - } - - Interpreter_stringLocals[var12++] = var21; // L: 158 - } - } - - field844 = var0.field1031; // L: 162 - - while (true) { - ++var10; // L: 164 - if (var10 > var1) { // L: 165 - throw new RuntimeException(); - } - - ++var20; // L: 166 - int var33 = var6[var20]; - if (var33 >= 100) { // L: 167 - boolean var35; - if (var4.intOperands[var20] == 1) { // L: 385 - var35 = true; - } else { - var35 = false; // L: 386 - } - - var14 = MouseHandler.method613(var33, var4, var35); // L: 387 - switch(var14) { // L: 388 - case 0: - var30 = false; - break label951; - case 1: - default: - break; - case 2: - throw new IllegalStateException(); // L: 395 - } - } else if (var33 == 0) { // L: 168 - Interpreter_intStack[++Interpreter_intStackSize - 1] = var7[var20]; // L: 169 - } else if (var33 == ScriptOpcodes.GET_VARP) { // L: 172 - var13 = var7[var20]; // L: 173 - Interpreter_intStack[++Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; // L: 174 - } else if (var33 == ScriptOpcodes.SET_VARP) { // L: 177 - var13 = var7[var20]; // L: 178 - Varps.Varps_main[var13] = Interpreter_intStack[--Interpreter_intStackSize]; // L: 179 - WorldMapLabel.changeGameOptions(var13); // L: 180 - } else if (var33 == ScriptOpcodes.SCONST) { // L: 183 - Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.stringOperands[var20]; // L: 184 - } else if (var33 == ScriptOpcodes.JUMP) { // L: 187 - var20 += var7[var20]; // L: 188 - } else if (var33 == ScriptOpcodes.IF_ICMPNE) { // L: 191 - Interpreter_intStackSize -= 2; // L: 192 - if (Interpreter_intStack[Interpreter_intStackSize] != Interpreter_intStack[Interpreter_intStackSize + 1]) { // L: 193 - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.IF_ICMPEQ) { // L: 196 - Interpreter_intStackSize -= 2; // L: 197 - if (Interpreter_intStack[Interpreter_intStackSize] == Interpreter_intStack[Interpreter_intStackSize + 1]) { // L: 198 - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.IF_ICMPLT) { // L: 201 - Interpreter_intStackSize -= 2; // L: 202 - if (Interpreter_intStack[Interpreter_intStackSize] < Interpreter_intStack[Interpreter_intStackSize + 1]) { // L: 203 - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.IF_ICMPGT) { // L: 206 - Interpreter_intStackSize -= 2; // L: 207 - if (Interpreter_intStack[Interpreter_intStackSize] > Interpreter_intStack[Interpreter_intStackSize + 1]) { // L: 208 - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.RETURN) { // L: 211 - if (Interpreter_frameDepth == 0) { // L: 212 - var30 = false; - break label950; - } - - ScriptFrame var40 = Interpreter_frames[--Interpreter_frameDepth]; // L: 213 - var4 = var40.script; // L: 214 - var6 = var4.opcodes; // L: 215 - var7 = var4.intOperands; // L: 216 - var20 = var40.pc; // L: 217 - GrandExchangeOfferNameComparator.Interpreter_intLocals = var40.intLocals; // L: 218 - Interpreter_stringLocals = var40.stringLocals; // L: 219 - } else if (var33 == ScriptOpcodes.GET_VARBIT) { // L: 222 - var13 = var7[var20]; // L: 223 - Interpreter_intStack[++Interpreter_intStackSize - 1] = SecureRandomCallable.getVarbit(var13); // L: 224 - } else if (var33 == ScriptOpcodes.SET_VARBIT) { // L: 227 - var13 = var7[var20]; // L: 228 - Renderable.method4926(var13, Interpreter_intStack[--Interpreter_intStackSize]); // L: 229 - } else if (var33 == ScriptOpcodes.IF_ICMPLE) { // L: 232 - Interpreter_intStackSize -= 2; // L: 233 - if (Interpreter_intStack[Interpreter_intStackSize] <= Interpreter_intStack[Interpreter_intStackSize + 1]) { // L: 234 - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.IF_ICMPGE) { // L: 237 - Interpreter_intStackSize -= 2; // L: 238 - if (Interpreter_intStack[Interpreter_intStackSize] >= Interpreter_intStack[Interpreter_intStackSize + 1]) { // L: 239 - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.ILOAD) { // L: 242 - Interpreter_intStack[++Interpreter_intStackSize - 1] = GrandExchangeOfferNameComparator.Interpreter_intLocals[var7[var20]]; // L: 243 - } else if (var33 == ScriptOpcodes.ISTORE) { // L: 246 - GrandExchangeOfferNameComparator.Interpreter_intLocals[var7[var20]] = Interpreter_intStack[--Interpreter_intStackSize]; // L: 247 - } else if (var33 == ScriptOpcodes.SLOAD) { // L: 250 - Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = Interpreter_stringLocals[var7[var20]]; // L: 251 - } else if (var33 == ScriptOpcodes.SSTORE) { // L: 254 - Interpreter_stringLocals[var7[var20]] = Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 255 - } else if (var33 == ScriptOpcodes.JOIN_STRING) { // L: 258 - var13 = var7[var20]; // L: 259 - class122.Interpreter_stringStackSize -= var13; // L: 260 - var21 = StudioGame.method5780(Interpreter_stringStack, class122.Interpreter_stringStackSize, var13); // L: 261 - Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var21; // L: 262 - } else if (var33 == ScriptOpcodes.POP_INT) { // L: 265 - --Interpreter_intStackSize; // L: 266 - } else if (var33 == ScriptOpcodes.POP_STRING) { // L: 269 - --class122.Interpreter_stringStackSize; // L: 270 - } else { - int var17; - if (var33 != ScriptOpcodes.INVOKE) { // L: 273 - if (var33 == ScriptOpcodes.GET_VARC_INT) { // L: 296 - Interpreter_intStack[++Interpreter_intStackSize - 1] = class160.varcs.getInt(var7[var20]); // L: 297 - } else if (var33 == ScriptOpcodes.SET_VARC_INT) { // L: 300 - class160.varcs.setInt(var7[var20], Interpreter_intStack[--Interpreter_intStackSize]); // L: 301 - } else if (var33 == ScriptOpcodes.DEFINE_ARRAY) { // L: 304 - var13 = var7[var20] >> 16; // L: 305 - var14 = var7[var20] & 65535; // L: 306 - int var24 = Interpreter_intStack[--Interpreter_intStackSize]; // L: 307 - if (var24 < 0 || var24 > 5000) { // L: 308 - throw new RuntimeException(); // L: 309 - } - - Interpreter_arrayLengths[var13] = var24; // L: 311 - byte var25 = -1; // L: 312 - if (var14 == 105) { // L: 313 - var25 = 0; - } - - for (var17 = 0; var17 < var24; ++var17) { // L: 314 - Interpreter_arrays[var13][var17] = var25; - } - } else if (var33 == ScriptOpcodes.GET_ARRAY_INT) { // L: 317 - var13 = var7[var20]; // L: 318 - var14 = Interpreter_intStack[--Interpreter_intStackSize]; // L: 319 - if (var14 < 0 || var14 >= Interpreter_arrayLengths[var13]) { // L: 320 - throw new RuntimeException(); // L: 321 - } - - Interpreter_intStack[++Interpreter_intStackSize - 1] = Interpreter_arrays[var13][var14]; // L: 323 - } else if (var33 == ScriptOpcodes.SET_ARRAY_INT) { // L: 326 - var13 = var7[var20]; // L: 327 - Interpreter_intStackSize -= 2; // L: 328 - var14 = Interpreter_intStack[Interpreter_intStackSize]; // L: 329 - if (var14 < 0 || var14 >= Interpreter_arrayLengths[var13]) { // L: 330 - throw new RuntimeException(); // L: 331 - } - - Interpreter_arrays[var13][var14] = Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 333 - } else { - String var22; - if (var33 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 336 - var22 = class160.varcs.getStringOld(var7[var20]); // L: 337 - if (var22 == null) { // L: 338 - var22 = "null"; - } - - Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var22; // L: 339 - } else if (var33 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 342 - class160.varcs.setStringOld(var7[var20], Interpreter_stringStack[--class122.Interpreter_stringStackSize]); // L: 343 - } else if (var33 == ScriptOpcodes.GET_VARC_STRING) { // L: 346 - var22 = class160.varcs.getString(var7[var20]); // L: 347 - Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var22; // L: 348 - } else if (var33 == ScriptOpcodes.SET_VARC_STRING) { // L: 351 - class160.varcs.setString(var7[var20], Interpreter_stringStack[--class122.Interpreter_stringStackSize]); // L: 352 - } else if (var33 == ScriptOpcodes.SWITCH) { // L: 355 - IterableNodeHashTable var38 = var4.switches[var7[var20]]; // L: 356 - IntegerNode var37 = (IntegerNode)var38.get((long)Interpreter_intStack[--Interpreter_intStackSize]); // L: 357 - if (var37 != null) { // L: 358 - var20 += var37.integer; - } - } else { - Integer var39; - if (var33 == ScriptOpcodes.GET_VARCLANSETTING) { // L: 361 - var39 = Calendar.field3269.getTitleGroupValue(var7[var20]); // L: 362 - if (var39 == null) { // L: 363 - Interpreter_intStack[++Interpreter_intStackSize - 1] = -1; // L: 364 - } else { - Interpreter_intStack[++Interpreter_intStackSize - 1] = var39; // L: 367 - } - } else { - if (var33 != ScriptOpcodes.GET_VARCLAN) { // L: 371 - throw new IllegalStateException(); // L: 381 - } - - var39 = HorizontalAlignment.field1885.method7105(var7[var20]); // L: 372 - if (var39 == null) { // L: 373 - Interpreter_intStack[++Interpreter_intStackSize - 1] = -1; // L: 374 - } else { - Interpreter_intStack[++Interpreter_intStackSize - 1] = var39; // L: 377 - } - } - } - } - } else { - var13 = var7[var20]; // L: 274 - Script var36 = ClanChannel.getScript(var13); // L: 275 - int[] var15 = new int[var36.localIntCount]; // L: 276 - String[] var16 = new String[var36.localStringCount]; // L: 277 - - for (var17 = 0; var17 < var36.intArgumentCount; ++var17) { // L: 278 - var15[var17] = Interpreter_intStack[var17 + (Interpreter_intStackSize - var36.intArgumentCount)]; - } - - for (var17 = 0; var17 < var36.stringArgumentCount; ++var17) { // L: 279 - var16[var17] = Interpreter_stringStack[var17 + (class122.Interpreter_stringStackSize - var36.stringArgumentCount)]; - } - - Interpreter_intStackSize -= var36.intArgumentCount; // L: 280 - class122.Interpreter_stringStackSize -= var36.stringArgumentCount; // L: 281 - ScriptFrame var23 = new ScriptFrame(); // L: 282 - var23.script = var4; // L: 283 - var23.pc = var20; // L: 284 - var23.intLocals = GrandExchangeOfferNameComparator.Interpreter_intLocals; // L: 285 - var23.stringLocals = Interpreter_stringLocals; // L: 286 - Interpreter_frames[++Interpreter_frameDepth - 1] = var23; // L: 287 - var4 = var36; // L: 288 - var6 = var36.opcodes; // L: 289 - var7 = var36.intOperands; // L: 290 - var20 = -1; // L: 291 - GrandExchangeOfferNameComparator.Interpreter_intLocals = var15; // L: 292 - Interpreter_stringLocals = var16; // L: 293 - } - } - } - } catch (Exception var31) { // L: 401 - var9 = true; // L: 402 - StringBuilder var27 = new StringBuilder(30); // L: 404 - var27.append("").append(var4.key).append(" "); // L: 405 - var13 = Interpreter_frameDepth - 1; // L: 406 - - while (true) { - if (var13 < 0) { - var27.append("").append(var8); // L: 407 - Widget.RunException_sendStackTrace(var27.toString(), var31); // L: 408 - var30 = false; - break; - } - - var27.append("").append(Interpreter_frames[var13].script.key).append(" "); - --var13; - } - } - } finally { - if (var30) { - while (field843.size() > 0) { - class93 var19 = (class93)field843.remove(0); // L: 413 - WorldMapLabelSize.widgetDefaultMenuAction(var19.method2370(), var19.method2380(), var19.method2372(), var19.method2373(), ""); - } - - if (field841) { // L: 416 - field841 = false; // L: 417 - class20.method294(); // L: 418 - } - - if (!var9 && var2 > 0 && var10 >= var2) { - Widget.RunException_sendStackTrace("Warning: Script " + var4.field954 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); - } - - } - } - - while (field843.size() > 0) { // L: 412 - class93 var26 = (class93)field843.remove(0); - WorldMapLabelSize.widgetDefaultMenuAction(var26.method2370(), var26.method2380(), var26.method2372(), var26.method2373(), ""); - } - - if (field841) { - field841 = false; - class20.method294(); - } - - if (!var9 && var2 > 0 && var10 >= var2) { - Widget.RunException_sendStackTrace("Warning: Script " + var4.field954 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); - } - - return; // L: 424 - } - - while (field843.size() > 0) { - class93 var34 = (class93)field843.remove(0); - WorldMapLabelSize.widgetDefaultMenuAction(var34.method2370(), var34.method2380(), var34.method2372(), var34.method2373(), ""); // L: 414 - } - - if (field841) { - field841 = false; - class20.method294(); - } - - if (!var9 && var2 > 0 && var10 >= var2) { // L: 420 - Widget.RunException_sendStackTrace("Warning: Script " + var4.field954 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); // L: 421 - } - - return; + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 823 + if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 824 + if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 844 + var3.modelType = 2; // L: 845 + var3.modelId = Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 846 + return 1; // L: 847 + } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 849 + var3.modelType = 3; // L: 850 + var3.modelId = ModelData0.localPlayer.appearance.getChatHeadId(); // L: 851 + return 1; // L: 852 + } else { + return 2; // L: 854 + } + } else { + class12.Interpreter_intStackSize -= 2; // L: 825 + int var4 = Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 826 + int var5 = Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 827 + var3.itemId = var4; // L: 828 + var3.itemQuantity = var5; // L: 829 + ItemComposition var6 = FileSystem.ItemDefinition_get(var4); // L: 830 + var3.modelAngleX = var6.xan2d; // L: 831 + var3.modelAngleY = var6.yan2d; // L: 832 + var3.modelAngleZ = var6.zan2d; // L: 833 + var3.modelOffsetX = var6.offsetX2d; // L: 834 + var3.modelOffsetY = var6.offsetY2d; // L: 835 + var3.modelZoom = var6.zoom2d; // L: 836 + if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { + var3.itemQuantityMode = 0; // L: 837 + } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | var6.isStackable == 1) { // L: 838 + var3.itemQuantityMode = 1; + } else { + var3.itemQuantityMode = 2; // L: 839 } - while (field843.size() > 0) { - class93 var41 = (class93)field843.remove(0); - WorldMapLabelSize.widgetDefaultMenuAction(var41.method2370(), var41.method2380(), var41.method2372(), var41.method2373(), ""); - } - - if (field841) { - field841 = false; - class20.method294(); - } - - if (!var9 && var2 > 0 && var10 >= var2) { - Widget.RunException_sendStackTrace("Warning: Script " + var4.field954 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + if (var3.field3406 > 0) { // L: 840 + var3.modelZoom = var3.modelZoom * 32 / var3.field3406; + } else if (var3.rawWidth > 0) { // L: 841 + var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; } + return 1; // L: 842 } - } // L: 124 + } } diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index d8ac0a147e..abd26ca169 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -1,39 +1,36 @@ +import java.awt.Component; +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("fl") +@ObfuscatedName("ft") @Implements("InvDefinition") public class InvDefinition extends DualNode { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("InvDefinition_archive") - static AbstractArchive InvDefinition_archive; - @ObfuscatedName("c") + public static AbstractArchive InvDefinition_archive; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; - @ObfuscatedName("e") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -93299941 + intValue = -1275234055 ) - @Export("canvasWidth") - public static int canvasWidth; - @ObfuscatedName("in") - @ObfuscatedSignature( - descriptor = "[Lqi;" - ) - @Export("headIconHintSprites") - static SpritePixels[] headIconHintSprites; - @ObfuscatedName("i") + static int field1853; + @ObfuscatedName("ct") + public static char field1850; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 852719865 + intValue = 1439045239 ) @Export("size") public int size; @@ -46,33 +43,140 @@ public class InvDefinition extends DualNode { this.size = 0; // L: 12 } // L: 14 - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "1907022215" + descriptor = "(Lpx;B)V", + garbageValue = "-22" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 32 - if (var2 == 0) { // L: 33 - return; // L: 36 + int var2 = var1.readUnsignedByte(); // L: 28 + if (var2 == 0) { // L: 29 + return; // L: 32 } - this.decodeNext(var1, var2); // L: 34 + this.decodeNext(var1, var2); // L: 30 } } - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "83857260" + descriptor = "(Lpx;II)V", + garbageValue = "39742539" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 2) { // L: 39 + if (var2 == 2) { // L: 35 this.size = var1.readUnsignedShort(); } - } // L: 41 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "497001629" + ) + static void method3264(Component var0) { + var0.addMouseListener(MouseHandler.MouseHandler_instance); // L: 37 + var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 38 + var0.addFocusListener(MouseHandler.MouseHandler_instance); + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-1661883390" + ) + @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 + + 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 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Lbx;I)V", + garbageValue = "-420431954" + ) + @Export("changeWorld") + static void changeWorld(World var0) { + if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1910 + Client.isMembersWorld = var0.isMembersOnly(); // L: 1911 + boolean var1 = var0.isMembersOnly(); // L: 1912 + if (var1 != class82.ItemDefinition_inMembersWorld) { // L: 1914 + class92.method2370(); // L: 1915 + class82.ItemDefinition_inMembersWorld = var1; // L: 1916 + } + } + + if (var0.properties != Client.worldProperties) { // L: 1920 + Archive var3 = class305.archive8; // L: 1921 + int var2 = var0.properties; // L: 1922 + if ((var2 & 536870912) != 0) { // L: 1924 + Clock.logoSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var3, "logo_deadman_mode", ""); // L: 1925 + } else if ((var2 & 1073741824) != 0) { // L: 1927 + Clock.logoSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var3, "logo_seasonal_mode", ""); // L: 1928 + } else { + Clock.logoSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var3, "logo", ""); // L: 1931 + } + } + + Timer.worldHost = var0.host; // L: 1935 + Client.worldId = var0.id; // L: 1936 + Client.worldProperties = var0.properties; // L: 1937 + Tiles.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1938 + GrandExchangeEvent.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1939 + WorldMapRegion.currentPort = Tiles.worldPort; // L: 1940 + } // L: 1941 + + @ObfuscatedName("hf") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "4" + ) + static final void method3268(boolean var0) { + ArchiveLoader.playPcmPlayers(); // L: 5734 + ++Client.packetWriter.pendingWrites; // L: 5735 + if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 5736 + Client.packetWriter.pendingWrites = 0; // L: 5737 + if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { // L: 5738 + PacketBufferNode var1 = WallDecoration.getPacketBufferNode(ClientPacket.field2982, Client.packetWriter.isaacCipher); // L: 5740 + Client.packetWriter.addNode(var1); // L: 5741 + + try { + Client.packetWriter.flush(); // L: 5743 + } catch (IOException var3) { // L: 5745 + Client.hadNetworkError = true; // L: 5746 + } + } + + } + } // L: 5749 } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index 728e3da149..ac2ac7d398 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -4,36 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qv") +@ObfuscatedName("qh") @Implements("IsaacCipher") public final class IsaacCipher { - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1838109149 + intValue = -1057139383 ) @Export("valuesRemaining") int valuesRemaining; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("results") int[] results; - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("mm") int[] mm; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 2051010735 + intValue = 557530107 ) @Export("aa") int aa; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1769663053 + intValue = 996236501 ) @Export("bb") int bb; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 742763113 + intValue = -371692805 ) @Export("cc") int cc; @@ -46,13 +46,13 @@ public final class IsaacCipher { this.results[var2] = var1[var2]; // L: 18 } - this.method8226(); // L: 20 + this.method8109(); // L: 20 } // L: 21 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2059570032" + garbageValue = "992826753" ) @Export("nextInt") public final int nextInt() { @@ -64,12 +64,12 @@ public final class IsaacCipher { return this.results[--this.valuesRemaining]; // L: 28 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-271911971" + garbageValue = "-1526419551" ) - public final int method8224() { + public final int method8108() { if (this.valuesRemaining == 0) { // L: 32 this.generateMoreResults(); // L: 33 this.valuesRemaining = 256; // L: 34 @@ -78,10 +78,10 @@ public final class IsaacCipher { return this.results[this.valuesRemaining - 1]; // L: 36 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-994226167" + garbageValue = "1357126023" ) @Export("generateMoreResults") final void generateMoreResults() { @@ -103,18 +103,18 @@ public final class IsaacCipher { this.aa += this.mm[var1 + 128 & 255]; // L: 54 int var3; - this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.aa + this.bb; // L: 55 + this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.bb + this.aa; // L: 55 this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2; // L: 56 } } // L: 58 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "10" + descriptor = "(I)V", + garbageValue = "1249714849" ) - final void method8226() { + final void method8109() { int var9 = -1640531527; // L: 70 int var8 = -1640531527; // L: 71 int var7 = -1640531527; // L: 72 diff --git a/runescape-client/src/main/java/ItemComposition.java b/runescape-client/src/main/java/ItemComposition.java index 0c1b8a76ca..354fc21c76 100644 --- a/runescape-client/src/main/java/ItemComposition.java +++ b/runescape-client/src/main/java/ItemComposition.java @@ -4,286 +4,285 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gf") +@ObfuscatedName("gl") @Implements("ItemComposition") public class ItemComposition extends DualNode { - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1304511159 - ) - static int field2076; - @ObfuscatedName("o") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Llp;" ) - @Export("ItemDefinition_cached") - public static EvictingDualNodeHashTable ItemDefinition_cached; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("ItemDefinition_cachedModels") - public static EvictingDualNodeHashTable ItemDefinition_cachedModels; + @Export("ItemDefinition_archive") + public static AbstractArchive ItemDefinition_archive; @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Llp;" + ) + @Export("ItemDefinition_modelArchive") + public static AbstractArchive ItemDefinition_modelArchive; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lir;" + ) + @Export("ItemDefinition_cached") + static EvictingDualNodeHashTable ItemDefinition_cached; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lir;" + ) + @Export("ItemDefinition_cachedModels") + static EvictingDualNodeHashTable ItemDefinition_cachedModels; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lir;" ) @Export("ItemDefinition_cachedSprites") - public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; - @ObfuscatedName("ci") - public static char field2121; - @ObfuscatedName("mo") + static EvictingDualNodeHashTable ItemDefinition_cachedSprites; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 879723765 - ) - @Export("menuWidth") - static int menuWidth; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1358562449 + intValue = 1188742133 ) @Export("id") public int id; - @ObfuscatedName("d") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1795914843 + intValue = 1954098135 ) @Export("model") int model; - @ObfuscatedName("m") + @ObfuscatedName("g") @Export("name") public String name; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("recolorFrom") public short[] recolorFrom; - @ObfuscatedName("t") + @ObfuscatedName("n") @Export("recolorTo") public short[] recolorTo; - @ObfuscatedName("g") + @ObfuscatedName("e") @Export("retextureFrom") public short[] retextureFrom; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("retextureTo") public short[] retextureTo; - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 196878577 + intValue = 368611487 ) @Export("zoom2d") public int zoom2d; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -665001803 + intValue = 1716239229 ) @Export("xan2d") public int xan2d; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -2086760217 + intValue = 491486855 ) @Export("yan2d") public int yan2d; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 273423951 + intValue = 487766987 ) @Export("zan2d") public int zan2d; - @ObfuscatedName("z") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 371108815 + intValue = -1027973527 ) @Export("offsetX2d") public int offsetX2d; - @ObfuscatedName("h") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1462314207 + intValue = -1363843995 ) @Export("offsetY2d") public int offsetY2d; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 1832984021 + intValue = -1771117007 ) @Export("isStackable") public int isStackable; - @ObfuscatedName("aq") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -152346525 + intValue = 472358963 ) @Export("price") public int price; - @ObfuscatedName("aw") + @ObfuscatedName("am") @Export("isMembersOnly") public boolean isMembersOnly; - @ObfuscatedName("am") + @ObfuscatedName("ac") @Export("groundActions") public String[] groundActions; - @ObfuscatedName("ak") + @ObfuscatedName("ab") @Export("inventoryActions") public String[] inventoryActions; - @ObfuscatedName("aj") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -822939591 + intValue = -240268281 ) @Export("shiftClickIndex") int shiftClickIndex; - @ObfuscatedName("al") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 378265163 + intValue = 1720153193 ) @Export("maleModel") int maleModel; - @ObfuscatedName("av") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -1588045303 + intValue = 314982159 ) @Export("maleModel1") int maleModel1; - @ObfuscatedName("at") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 570767097 + intValue = -1129787177 ) @Export("maleOffset") int maleOffset; - @ObfuscatedName("an") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -950675371 + intValue = 1717071033 ) @Export("femaleModel") int femaleModel; - @ObfuscatedName("ay") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 1339664031 + intValue = -5500123 ) @Export("femaleModel1") int femaleModel1; - @ObfuscatedName("ag") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -1567941563 + intValue = -942281181 ) @Export("femaleOffset") int femaleOffset; - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 707810015 + intValue = 1391389777 ) @Export("maleModel2") int maleModel2; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 1223715049 + intValue = 915648219 ) @Export("femaleModel2") int femaleModel2; - @ObfuscatedName("ab") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1614579943 + intValue = -1950888251 ) @Export("maleHeadModel") int maleHeadModel; - @ObfuscatedName("au") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -880790519 + intValue = 1053389309 ) @Export("maleHeadModel2") int maleHeadModel2; - @ObfuscatedName("af") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 1611595155 + intValue = 528440307 ) @Export("femaleHeadModel") int femaleHeadModel; - @ObfuscatedName("ad") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -112485395 + intValue = 737797573 ) @Export("femaleHeadModel2") int femaleHeadModel2; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @Export("countobj") int[] countobj; - @ObfuscatedName("ax") + @ObfuscatedName("av") @Export("countco") int[] countco; - @ObfuscatedName("ar") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 1339927085 + intValue = -266010117 ) @Export("note") public int note; - @ObfuscatedName("ap") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1457384295 + intValue = 1832426705 ) @Export("noteTemplate") public int noteTemplate; - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 533172981 + intValue = 1030665223 ) @Export("resizeX") int resizeX; - @ObfuscatedName("as") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -696696217 + intValue = 1511070871 ) @Export("resizeY") int resizeY; - @ObfuscatedName("aa") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -2002126289 + intValue = 1052019651 ) @Export("resizeZ") int resizeZ; - @ObfuscatedName("bj") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = -999686443 + intValue = 85687709 ) @Export("ambient") public int ambient; - @ObfuscatedName("bm") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = -606259097 + intValue = -708607869 ) @Export("contrast") public int contrast; - @ObfuscatedName("br") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 1632999251 + intValue = -68016555 ) @Export("team") public int team; - @ObfuscatedName("bo") + @ObfuscatedName("bi") @ObfuscatedSignature( descriptor = "Lpt;" ) @Export("params") IterableNodeHashTable params; - @ObfuscatedName("bl") + @ObfuscatedName("bc") @Export("isTradable") public boolean isTradable; - @ObfuscatedName("be") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = 815357649 + intValue = 242888211 ) @Export("unnotedId") int unnotedId; - @ObfuscatedName("bh") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 715906289 + intValue = 1348681369 ) @Export("notedId") int notedId; - @ObfuscatedName("bf") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = -1861125713 + intValue = -438305337 ) @Export("placeholder") public int placeholder; - @ObfuscatedName("bb") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = 1550899901 + intValue = 502078061 ) @Export("placeholderTemplate") public int placeholderTemplate; @@ -335,694 +334,595 @@ public class ItemComposition extends DualNode { this.placeholderTemplate = -1; // L: 79 } // L: 81 - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1176456710" + garbageValue = "264401627" ) @Export("post") void post() { - } // L: 129 + } // L: 121 - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "1" + descriptor = "(Lpx;I)V", + garbageValue = "-1278602927" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 133 - if (var2 == 0) { // L: 134 - return; // L: 137 + int var2 = var1.readUnsignedByte(); // L: 125 + if (var2 == 0) { // L: 126 + return; // L: 129 } - this.decodeNext(var1, var2); // L: 135 - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-46032280" - ) - @Export("decodeNext") - void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 140 - this.model = var1.readUnsignedShort(); - } else if (var2 == 2) { // L: 141 - this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { // L: 142 - this.zoom2d = var1.readUnsignedShort(); - } else if (var2 == 5) { // L: 143 - this.xan2d = var1.readUnsignedShort(); - } else if (var2 == 6) { // L: 144 - this.yan2d = var1.readUnsignedShort(); - } else if (var2 == 7) { // L: 145 - this.offsetX2d = var1.readUnsignedShort(); // L: 146 - if (this.offsetX2d > 32767) { // L: 147 - this.offsetX2d -= 65536; - } - } else if (var2 == 8) { // L: 149 - this.offsetY2d = var1.readUnsignedShort(); // L: 150 - if (this.offsetY2d > 32767) { // L: 151 - this.offsetY2d -= 65536; - } - } else if (var2 == 9) { // L: 153 - var1.readStringCp1252NullTerminated(); // L: 154 - } else if (var2 == 11) { // L: 156 - this.isStackable = 1; - } else if (var2 == 12) { // L: 157 - this.price = var1.readInt(); - } else if (var2 == 16) { // L: 158 - this.isMembersOnly = true; - } else if (var2 == 23) { // L: 159 - this.maleModel = var1.readUnsignedShort(); // L: 160 - this.maleOffset = var1.readUnsignedByte(); // L: 161 - } else if (var2 == 24) { // L: 163 - this.maleModel1 = var1.readUnsignedShort(); - } else if (var2 == 25) { // L: 164 - this.femaleModel = var1.readUnsignedShort(); // L: 165 - this.femaleOffset = var1.readUnsignedByte(); // L: 166 - } else if (var2 == 26) { // L: 168 - this.femaleModel1 = var1.readUnsignedShort(); - } else if (var2 >= 30 && var2 < 35) { // L: 169 - this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 170 - if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 171 - this.groundActions[var2 - 30] = null; - } - } else if (var2 >= 35 && var2 < 40) { // L: 173 - this.inventoryActions[var2 - 35] = var1.readStringCp1252NullTerminated(); - } else { - int var3; - int var4; - if (var2 == 40) { // L: 174 - var3 = var1.readUnsignedByte(); // L: 175 - this.recolorFrom = new short[var3]; // L: 176 - this.recolorTo = new short[var3]; // L: 177 - - for (var4 = 0; var4 < var3; ++var4) { // L: 178 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 179 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 180 - } - } else if (var2 == 41) { // L: 183 - var3 = var1.readUnsignedByte(); // L: 184 - this.retextureFrom = new short[var3]; // L: 185 - this.retextureTo = new short[var3]; // L: 186 - - for (var4 = 0; var4 < var3; ++var4) { // L: 187 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 188 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 189 - } - } else if (var2 == 42) { // L: 192 - this.shiftClickIndex = var1.readByte(); // L: 193 - } else if (var2 == 65) { // L: 195 - this.isTradable = true; - } else if (var2 == 78) { // L: 196 - this.maleModel2 = var1.readUnsignedShort(); - } else if (var2 == 79) { // L: 197 - this.femaleModel2 = var1.readUnsignedShort(); - } else if (var2 == 90) { // L: 198 - this.maleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 91) { // L: 199 - this.femaleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 92) { // L: 200 - this.maleHeadModel2 = var1.readUnsignedShort(); - } else if (var2 == 93) { // L: 201 - this.femaleHeadModel2 = var1.readUnsignedShort(); - } else if (var2 == 94) { // L: 202 - var1.readUnsignedShort(); // L: 203 - } else if (var2 == 95) { - this.zan2d = var1.readUnsignedShort(); // L: 205 - } else if (var2 == 97) { // L: 206 - this.note = var1.readUnsignedShort(); - } else if (var2 == 98) { // L: 207 - this.noteTemplate = var1.readUnsignedShort(); - } else if (var2 >= 100 && var2 < 110) { // L: 208 - if (this.countobj == null) { // L: 209 - this.countobj = new int[10]; // L: 210 - this.countco = new int[10]; // L: 211 - } - - this.countobj[var2 - 100] = var1.readUnsignedShort(); // L: 213 - this.countco[var2 - 100] = var1.readUnsignedShort(); // L: 214 - } else if (var2 == 110) { // L: 216 - this.resizeX = var1.readUnsignedShort(); - } else if (var2 == 111) { // L: 217 - this.resizeY = var1.readUnsignedShort(); - } else if (var2 == 112) { // L: 218 - this.resizeZ = var1.readUnsignedShort(); - } else if (var2 == 113) { // L: 219 - this.ambient = var1.readByte(); - } else if (var2 == 114) { // L: 220 - this.contrast = var1.readByte() * 5; - } else if (var2 == 115) { // L: 221 - this.team = var1.readUnsignedByte(); - } else if (var2 == 139) { // L: 222 - this.unnotedId = var1.readUnsignedShort(); - } else if (var2 == 140) { // L: 223 - this.notedId = var1.readUnsignedShort(); - } else if (var2 == 148) { // L: 224 - this.placeholder = var1.readUnsignedShort(); - } else if (var2 == 149) { // L: 225 - this.placeholderTemplate = var1.readUnsignedShort(); - } else if (var2 == 249) { - this.params = class214.readStringIntParameters(var1, this.params); - } - } - - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lgf;Lgf;B)V", - garbageValue = "8" - ) - @Export("genCert") - void genCert(ItemComposition var1, ItemComposition var2) { - this.model = var1.model; - this.zoom2d = var1.zoom2d; - this.xan2d = var1.xan2d; - this.yan2d = var1.yan2d; - this.zan2d = var1.zan2d; // L: 235 - this.offsetX2d = var1.offsetX2d; - this.offsetY2d = var1.offsetY2d; - this.recolorFrom = var1.recolorFrom; - this.recolorTo = var1.recolorTo; - this.retextureFrom = var1.retextureFrom; - this.retextureTo = var1.retextureTo; - this.name = var2.name; - this.isMembersOnly = var2.isMembersOnly; - this.price = var2.price; - this.isStackable = 1; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lgf;Lgf;I)V", - garbageValue = "-1718664847" - ) - @Export("genBought") - void genBought(ItemComposition var1, ItemComposition var2) { - this.model = var1.model; - this.zoom2d = var1.zoom2d; - this.xan2d = var1.xan2d; - this.yan2d = var1.yan2d; - this.zan2d = var1.zan2d; - this.offsetX2d = var1.offsetX2d; - this.offsetY2d = var1.offsetY2d; - this.recolorFrom = var2.recolorFrom; // L: 256 - this.recolorTo = var2.recolorTo; - this.retextureFrom = var2.retextureFrom; // L: 258 - this.retextureTo = var2.retextureTo; // L: 259 - this.name = var2.name; // L: 260 - this.isMembersOnly = var2.isMembersOnly; // L: 261 - this.isStackable = var2.isStackable; - this.maleModel = var2.maleModel; // L: 263 - this.maleModel1 = var2.maleModel1; // L: 264 - this.maleModel2 = var2.maleModel2; // L: 265 - this.femaleModel = var2.femaleModel; // L: 266 - this.femaleModel1 = var2.femaleModel1; // L: 267 - this.femaleModel2 = var2.femaleModel2; // L: 268 - this.maleHeadModel = var2.maleHeadModel; // L: 269 - this.maleHeadModel2 = var2.maleHeadModel2; // L: 270 - this.femaleHeadModel = var2.femaleHeadModel; // L: 271 - this.femaleHeadModel2 = var2.femaleHeadModel2; // L: 272 - this.team = var2.team; // L: 273 - this.groundActions = var2.groundActions; // L: 274 - this.inventoryActions = new String[5]; // L: 275 - if (var2.inventoryActions != null) { // L: 276 - for (int var3 = 0; var3 < 4; ++var3) { - this.inventoryActions[var3] = var2.inventoryActions[var3]; - } - } - - this.inventoryActions[4] = "Discard"; // L: 277 - this.price = 0; // L: 278 - } // L: 279 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lgf;Lgf;B)V", - garbageValue = "72" - ) - @Export("genPlaceholder") - void genPlaceholder(ItemComposition var1, ItemComposition var2) { - this.model = var1.model; // L: 282 - this.zoom2d = var1.zoom2d; // L: 283 - this.xan2d = var1.xan2d; // L: 284 - this.yan2d = var1.yan2d; // L: 285 - this.zan2d = var1.zan2d; // L: 286 - this.offsetX2d = var1.offsetX2d; // L: 287 - this.offsetY2d = var1.offsetY2d; // L: 288 - this.recolorFrom = var1.recolorFrom; // L: 289 - this.recolorTo = var1.recolorTo; // L: 290 - this.retextureFrom = var1.retextureFrom; // L: 291 - this.retextureTo = var1.retextureTo; // L: 292 - this.isStackable = var1.isStackable; // L: 293 - this.name = var2.name; // L: 294 - this.price = 0; // L: 295 - this.isMembersOnly = false; // L: 296 - this.isTradable = false; // L: 297 - } // L: 298 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(IB)Lhc;", - garbageValue = "-88" - ) - @Export("getModelData") - public final ModelData getModelData(int var1) { - int var3; - if (this.countobj != null && var1 > 1) { // L: 301 - int var2 = -1; // L: 302 - - for (var3 = 0; var3 < 10; ++var3) { // L: 303 - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 304 - var2 = this.countobj[var3]; - } - } - - if (var2 != -1) { // L: 306 - return class19.ItemDefinition_get(var2).getModelData(1); - } - } - - ModelData var4 = ModelData.ModelData_get(AttackOption.ItemDefinition_modelArchive, this.model, 0); // L: 308 - if (var4 == null) { // L: 309 - return null; - } else { - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 310 - var4.resize(this.resizeX, this.resizeY, this.resizeZ); - } - - if (this.recolorFrom != null) { // L: 311 - for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 312 - var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 313 - } - } - - if (this.retextureFrom != null) { // L: 316 - for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 317 - var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 318 - } - } - - return var4; // L: 321 - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)Liq;", - garbageValue = "973895006" - ) - @Export("getModel") - public final Model getModel(int var1) { - if (this.countobj != null && var1 > 1) { // L: 325 - int var2 = -1; // L: 326 - - for (int var3 = 0; var3 < 10; ++var3) { // L: 327 - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 328 - var2 = this.countobj[var3]; - } - } - - if (var2 != -1) { // L: 330 - return class19.ItemDefinition_get(var2).getModel(1); - } - } - - Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); // L: 332 - if (var5 != null) { // L: 333 - return var5; - } else { - ModelData var6 = ModelData.ModelData_get(AttackOption.ItemDefinition_modelArchive, this.model, 0); // L: 334 - if (var6 == null) { // L: 335 - return null; - } else { - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 336 - var6.resize(this.resizeX, this.resizeY, this.resizeZ); - } - - int var4; - if (this.recolorFrom != null) { // L: 337 - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 338 - var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 339 - } - } - - if (this.retextureFrom != null) { // L: 342 - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 343 - var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 344 - } - } - - var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 347 - var5.isSingleTile = true; // L: 348 - ItemDefinition_cachedModels.put(var5, (long)this.id); // L: 349 - return var5; // L: 350 - } - } - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(II)Lgf;", - garbageValue = "215636085" - ) - @Export("getCountObj") - public ItemComposition getCountObj(int var1) { - if (this.countobj != null && var1 > 1) { // L: 354 - int var2 = -1; // L: 355 - - for (int var3 = 0; var3 < 10; ++var3) { // L: 356 - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 357 - var2 = this.countobj[var3]; - } - } - - if (var2 != -1) { // L: 359 - return class19.ItemDefinition_get(var2); - } - } - - return this; // L: 361 - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(ZI)Z", - garbageValue = "-480177998" - ) - @Export("hasNoValidModel") - public final boolean hasNoValidModel(boolean var1) { - int var2 = this.maleModel; // L: 446 - int var3 = this.maleModel1; // L: 447 - int var4 = this.maleModel2; // L: 448 - if (var1) { // L: 449 - var2 = this.femaleModel; // L: 450 - var3 = this.femaleModel1; // L: 451 - var4 = this.femaleModel2; // L: 452 - } - - if (var2 == -1) { // L: 454 - return true; - } else { - boolean var5 = true; // L: 455 - if (!AttackOption.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 456 - var5 = false; - } - - if (var3 != -1 && !AttackOption.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 457 - var5 = false; - } - - if (var4 != -1 && !AttackOption.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 458 - var5 = false; - } - - return var5; // L: 459 + this.decodeNext(var1, var2); // L: 127 } } @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(ZI)Lhc;", - garbageValue = "1919870676" + descriptor = "(Lpx;II)V", + garbageValue = "-849258207" ) - public final ModelData method3719(boolean var1) { - int var2 = this.maleModel; // L: 463 - int var3 = this.maleModel1; // L: 464 - int var4 = this.maleModel2; // L: 465 - if (var1) { // L: 466 - var2 = this.femaleModel; // L: 467 - var3 = this.femaleModel1; // L: 468 - var4 = this.femaleModel2; // L: 469 + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { + if (var2 == 1) { // L: 132 + this.model = var1.readUnsignedShort(); + } else if (var2 == 2) { // L: 133 + this.name = var1.readStringCp1252NullTerminated(); + } else if (var2 == 4) { // L: 134 + this.zoom2d = var1.readUnsignedShort(); + } else if (var2 == 5) { // L: 135 + this.xan2d = var1.readUnsignedShort(); + } else if (var2 == 6) { // L: 136 + this.yan2d = var1.readUnsignedShort(); + } else if (var2 == 7) { // L: 137 + this.offsetX2d = var1.readUnsignedShort(); // L: 138 + if (this.offsetX2d > 32767) { // L: 139 + this.offsetX2d -= 65536; + } + } else if (var2 == 8) { // L: 141 + this.offsetY2d = var1.readUnsignedShort(); // L: 142 + if (this.offsetY2d > 32767) { // L: 143 + this.offsetY2d -= 65536; + } + } else if (var2 == 9) { // L: 145 + var1.readStringCp1252NullTerminated(); // L: 146 + } else if (var2 == 11) { // L: 148 + this.isStackable = 1; + } else if (var2 == 12) { // L: 149 + this.price = var1.readInt(); + } else if (var2 == 16) { // L: 150 + this.isMembersOnly = true; + } else if (var2 == 23) { // L: 151 + this.maleModel = var1.readUnsignedShort(); // L: 152 + this.maleOffset = var1.readUnsignedByte(); // L: 153 + } else if (var2 == 24) { // L: 155 + this.maleModel1 = var1.readUnsignedShort(); + } else if (var2 == 25) { // L: 156 + this.femaleModel = var1.readUnsignedShort(); // L: 157 + this.femaleOffset = var1.readUnsignedByte(); // L: 158 + } else if (var2 == 26) { // L: 160 + this.femaleModel1 = var1.readUnsignedShort(); + } else if (var2 >= 30 && var2 < 35) { // L: 161 + this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 162 + if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 163 + this.groundActions[var2 - 30] = null; + } + } else if (var2 >= 35 && var2 < 40) { // L: 165 + this.inventoryActions[var2 - 35] = var1.readStringCp1252NullTerminated(); + } else { + int var3; + int var4; + if (var2 == 40) { // L: 166 + var3 = var1.readUnsignedByte(); // L: 167 + this.recolorFrom = new short[var3]; // L: 168 + this.recolorTo = new short[var3]; // L: 169 + + for (var4 = 0; var4 < var3; ++var4) { // L: 170 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 171 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 172 + } + } else if (var2 == 41) { // L: 175 + var3 = var1.readUnsignedByte(); // L: 176 + this.retextureFrom = new short[var3]; // L: 177 + this.retextureTo = new short[var3]; // L: 178 + + for (var4 = 0; var4 < var3; ++var4) { // L: 179 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 180 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 181 + } + } else if (var2 == 42) { // L: 184 + this.shiftClickIndex = var1.readByte(); // L: 185 + } else if (var2 == 65) { // L: 187 + this.isTradable = true; + } else if (var2 == 78) { // L: 188 + this.maleModel2 = var1.readUnsignedShort(); + } else if (var2 == 79) { // L: 189 + this.femaleModel2 = var1.readUnsignedShort(); + } else if (var2 == 90) { // L: 190 + this.maleHeadModel = var1.readUnsignedShort(); + } else if (var2 == 91) { // L: 191 + this.femaleHeadModel = var1.readUnsignedShort(); + } else if (var2 == 92) { // L: 192 + this.maleHeadModel2 = var1.readUnsignedShort(); + } else if (var2 == 93) { // L: 193 + this.femaleHeadModel2 = var1.readUnsignedShort(); + } else if (var2 == 94) { // L: 194 + var1.readUnsignedShort(); // L: 195 + } else if (var2 == 95) { // L: 197 + this.zan2d = var1.readUnsignedShort(); + } else if (var2 == 97) { // L: 198 + this.note = var1.readUnsignedShort(); + } else if (var2 == 98) { // L: 199 + this.noteTemplate = var1.readUnsignedShort(); + } else if (var2 >= 100 && var2 < 110) { // L: 200 + if (this.countobj == null) { // L: 201 + this.countobj = new int[10]; // L: 202 + this.countco = new int[10]; // L: 203 + } + + this.countobj[var2 - 100] = var1.readUnsignedShort(); // L: 205 + this.countco[var2 - 100] = var1.readUnsignedShort(); // L: 206 + } else if (var2 == 110) { // L: 208 + this.resizeX = var1.readUnsignedShort(); + } else if (var2 == 111) { // L: 209 + this.resizeY = var1.readUnsignedShort(); + } else if (var2 == 112) { // L: 210 + this.resizeZ = var1.readUnsignedShort(); + } else if (var2 == 113) { // L: 211 + this.ambient = var1.readByte(); + } else if (var2 == 114) { // L: 212 + this.contrast = var1.readByte() * 5; + } else if (var2 == 115) { // L: 213 + this.team = var1.readUnsignedByte(); + } else if (var2 == 139) { // L: 214 + this.unnotedId = var1.readUnsignedShort(); + } else if (var2 == 140) { // L: 215 + this.notedId = var1.readUnsignedShort(); + } else if (var2 == 148) { // L: 216 + this.placeholder = var1.readUnsignedShort(); + } else if (var2 == 149) { // L: 217 + this.placeholderTemplate = var1.readUnsignedShort(); + } else if (var2 == 249) { // L: 218 + this.params = JagexCache.readStringIntParameters(var1, this.params); + } } - if (var2 == -1) { // L: 471 - return null; - } else { - ModelData var5 = ModelData.ModelData_get(AttackOption.ItemDefinition_modelArchive, var2, 0); // L: 472 - if (var3 != -1) { // L: 473 - ModelData var6 = ModelData.ModelData_get(AttackOption.ItemDefinition_modelArchive, var3, 0); // L: 474 - if (var4 != -1) { // L: 475 - ModelData var7 = ModelData.ModelData_get(AttackOption.ItemDefinition_modelArchive, var4, 0); // L: 476 - ModelData[] var8 = new ModelData[]{var5, var6, var7}; // L: 477 - var5 = new ModelData(var8, 3); // L: 478 - } else { - ModelData[] var10 = new ModelData[]{var5, var6}; // L: 481 - var5 = new ModelData(var10, 2); // L: 482 + } // L: 220 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Lgl;Lgl;I)V", + garbageValue = "-279950936" + ) + @Export("genCert") + void genCert(ItemComposition var1, ItemComposition var2) { + this.model = var1.model; // L: 223 + this.zoom2d = var1.zoom2d; // L: 224 + this.xan2d = var1.xan2d; // L: 225 + this.yan2d = var1.yan2d; // L: 226 + this.zan2d = var1.zan2d; // L: 227 + this.offsetX2d = var1.offsetX2d; // L: 228 + this.offsetY2d = var1.offsetY2d; // L: 229 + this.recolorFrom = var1.recolorFrom; // L: 230 + this.recolorTo = var1.recolorTo; // L: 231 + this.retextureFrom = var1.retextureFrom; // L: 232 + this.retextureTo = var1.retextureTo; // L: 233 + this.name = var2.name; // L: 234 + this.isMembersOnly = var2.isMembersOnly; // L: 235 + this.price = var2.price; // L: 236 + this.isStackable = 1; // L: 237 + } // L: 238 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Lgl;Lgl;I)V", + garbageValue = "1099731661" + ) + @Export("genBought") + void genBought(ItemComposition var1, ItemComposition var2) { + this.model = var1.model; // L: 241 + this.zoom2d = var1.zoom2d; // L: 242 + this.xan2d = var1.xan2d; // L: 243 + this.yan2d = var1.yan2d; // L: 244 + this.zan2d = var1.zan2d; // L: 245 + this.offsetX2d = var1.offsetX2d; // L: 246 + this.offsetY2d = var1.offsetY2d; // L: 247 + this.recolorFrom = var2.recolorFrom; // L: 248 + this.recolorTo = var2.recolorTo; // L: 249 + this.retextureFrom = var2.retextureFrom; // L: 250 + this.retextureTo = var2.retextureTo; // L: 251 + this.name = var2.name; // L: 252 + this.isMembersOnly = var2.isMembersOnly; // L: 253 + this.isStackable = var2.isStackable; // L: 254 + this.maleModel = var2.maleModel; // L: 255 + this.maleModel1 = var2.maleModel1; // L: 256 + this.maleModel2 = var2.maleModel2; // L: 257 + this.femaleModel = var2.femaleModel; // L: 258 + this.femaleModel1 = var2.femaleModel1; // L: 259 + this.femaleModel2 = var2.femaleModel2; // L: 260 + this.maleHeadModel = var2.maleHeadModel; // L: 261 + this.maleHeadModel2 = var2.maleHeadModel2; // L: 262 + this.femaleHeadModel = var2.femaleHeadModel; // L: 263 + this.femaleHeadModel2 = var2.femaleHeadModel2; // L: 264 + this.team = var2.team; // L: 265 + this.groundActions = var2.groundActions; // L: 266 + this.inventoryActions = new String[5]; // L: 267 + if (var2.inventoryActions != null) { // L: 268 + for (int var3 = 0; var3 < 4; ++var3) { + this.inventoryActions[var3] = var2.inventoryActions[var3]; + } + } + + this.inventoryActions[4] = "Discard"; // L: 269 + this.price = 0; // L: 270 + } // L: 271 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Lgl;Lgl;I)V", + garbageValue = "-1484534743" + ) + @Export("genPlaceholder") + void genPlaceholder(ItemComposition var1, ItemComposition var2) { + this.model = var1.model; // L: 274 + this.zoom2d = var1.zoom2d; // L: 275 + this.xan2d = var1.xan2d; // L: 276 + this.yan2d = var1.yan2d; // L: 277 + this.zan2d = var1.zan2d; // L: 278 + this.offsetX2d = var1.offsetX2d; // L: 279 + this.offsetY2d = var1.offsetY2d; // L: 280 + this.recolorFrom = var1.recolorFrom; // L: 281 + this.recolorTo = var1.recolorTo; // L: 282 + this.retextureFrom = var1.retextureFrom; // L: 283 + this.retextureTo = var1.retextureTo; // L: 284 + this.isStackable = var1.isStackable; // L: 285 + this.name = var2.name; // L: 286 + this.price = 0; // L: 287 + this.isMembersOnly = false; // L: 288 + this.isTradable = false; // L: 289 + } // L: 290 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)Lgs;", + garbageValue = "101445561" + ) + @Export("getModelData") + public final ModelData getModelData(int var1) { + int var3; + if (this.countobj != null && var1 > 1) { // L: 293 + int var2 = -1; // L: 294 + + for (var3 = 0; var3 < 10; ++var3) { // L: 295 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 296 + var2 = this.countobj[var3]; } } - if (!var1 && this.maleOffset != 0) { // L: 485 + if (var2 != -1) { // L: 298 + return FileSystem.ItemDefinition_get(var2).getModelData(1); + } + } + + ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); // L: 300 + if (var4 == null) { // L: 301 + return null; + } else { + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 302 + var4.resize(this.resizeX, this.resizeY, this.resizeZ); + } + + if (this.recolorFrom != null) { // L: 303 + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 304 + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 305 + } + } + + if (this.retextureFrom != null) { // L: 308 + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 309 + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 310 + } + } + + return var4; // L: 313 + } + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(II)Lhv;", + garbageValue = "-1179762647" + ) + @Export("getModel") + public final Model getModel(int var1) { + if (this.countobj != null && var1 > 1) { // L: 317 + int var2 = -1; // L: 318 + + for (int var3 = 0; var3 < 10; ++var3) { // L: 319 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 320 + var2 = this.countobj[var3]; + } + } + + if (var2 != -1) { // L: 322 + return FileSystem.ItemDefinition_get(var2).getModel(1); + } + } + + Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); // L: 324 + if (var5 != null) { // L: 325 + return var5; + } else { + ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); // L: 326 + if (var6 == null) { // L: 327 + return null; + } else { + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 328 + var6.resize(this.resizeX, this.resizeY, this.resizeZ); + } + + int var4; + if (this.recolorFrom != null) { // L: 329 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 330 + var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 331 + } + } + + if (this.retextureFrom != null) { // L: 334 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 335 + var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 336 + } + } + + var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 339 + var5.isSingleTile = true; // L: 340 + ItemDefinition_cachedModels.put(var5, (long)this.id); // L: 341 + return var5; // L: 342 + } + } + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(II)Lgl;", + garbageValue = "-1139182160" + ) + @Export("getCountObj") + public ItemComposition getCountObj(int var1) { + if (this.countobj != null && var1 > 1) { // L: 346 + int var2 = -1; // L: 347 + + for (int var3 = 0; var3 < 10; ++var3) { // L: 348 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { + var2 = this.countobj[var3]; // L: 349 + } + } + + if (var2 != -1) { // L: 351 + return FileSystem.ItemDefinition_get(var2); + } + } + + return this; // L: 353 + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(ZI)Z", + garbageValue = "1443965547" + ) + @Export("hasNoValidModel") + public final boolean hasNoValidModel(boolean var1) { + int var2 = this.maleModel; // L: 431 + int var3 = this.maleModel1; // L: 432 + int var4 = this.maleModel2; // L: 433 + if (var1) { // L: 434 + var2 = this.femaleModel; // L: 435 + var3 = this.femaleModel1; // L: 436 + var4 = this.femaleModel2; // L: 437 + } + + if (var2 == -1) { // L: 439 + return true; + } else { + boolean var5 = true; // L: 440 + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 441 + var5 = false; + } + + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 442 + var5 = false; + } + + if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 443 + var5 = false; + } + + return var5; // L: 444 + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(ZI)Lgs;", + garbageValue = "-1175782227" + ) + public final ModelData method3630(boolean var1) { + int var2 = this.maleModel; // L: 448 + int var3 = this.maleModel1; // L: 449 + int var4 = this.maleModel2; // L: 450 + if (var1) { // L: 451 + var2 = this.femaleModel; // L: 452 + var3 = this.femaleModel1; // L: 453 + var4 = this.femaleModel2; // L: 454 + } + + if (var2 == -1) { // L: 456 + return null; + } else { + ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); // L: 457 + if (var3 != -1) { // L: 458 + ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); // L: 459 + if (var4 != -1) { // L: 460 + ModelData var7 = ModelData.ModelData_get(ItemDefinition_modelArchive, var4, 0); // L: 461 + ModelData[] var8 = new ModelData[]{var5, var6, var7}; // L: 462 + var5 = new ModelData(var8, 3); // L: 463 + } else { + ModelData[] var10 = new ModelData[]{var5, var6}; // L: 466 + var5 = new ModelData(var10, 2); // L: 467 + } + } + + if (!var1 && this.maleOffset != 0) { // L: 470 var5.changeOffset(0, this.maleOffset, 0); } - if (var1 && this.femaleOffset != 0) { // L: 486 + if (var1 && this.femaleOffset != 0) { // L: 471 var5.changeOffset(0, this.femaleOffset, 0); } int var9; - if (this.recolorFrom != null) { // L: 487 - for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 488 - var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 489 + if (this.recolorFrom != null) { // L: 472 + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 473 + var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 474 } } - if (this.retextureFrom != null) { // L: 492 - for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 493 - var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 494 + if (this.retextureFrom != null) { // L: 477 + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 478 + var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 479 } } - return var5; // L: 497 + return var5; // L: 482 } } - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(ZI)Z", - garbageValue = "1863743835" - ) - public final boolean method3723(boolean var1) { - int var2 = this.maleHeadModel; // L: 501 - int var3 = this.maleHeadModel2; // L: 502 - if (var1) { // L: 503 - var2 = this.femaleHeadModel; // L: 504 - var3 = this.femaleHeadModel2; // L: 505 - } - - if (var2 == -1) { // L: 507 - return true; - } else { - boolean var4 = true; // L: 508 - if (!AttackOption.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 509 - var4 = false; - } - - if (var3 != -1 && !AttackOption.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 510 - var4 = false; - } - - return var4; // L: 511 - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(ZI)Lhc;", - garbageValue = "-1677053945" - ) - public final ModelData method3718(boolean var1) { - int var2 = this.maleHeadModel; // L: 515 - int var3 = this.maleHeadModel2; // L: 516 - if (var1) { // L: 517 - var2 = this.femaleHeadModel; // L: 518 - var3 = this.femaleHeadModel2; // L: 519 - } - - if (var2 == -1) { // L: 521 - return null; - } else { - ModelData var4 = ModelData.ModelData_get(AttackOption.ItemDefinition_modelArchive, var2, 0); // L: 522 - if (var3 != -1) { // L: 523 - ModelData var5 = ModelData.ModelData_get(AttackOption.ItemDefinition_modelArchive, var3, 0); // L: 524 - ModelData[] var6 = new ModelData[]{var4, var5}; // L: 525 - var4 = new ModelData(var6, 2); // L: 526 - } - - int var7; - if (this.recolorFrom != null) { // L: 528 - for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 529 - var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 530 - } - } - - if (this.retextureFrom != null) { // L: 533 - for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 534 - var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 535 - } - } - - return var4; // L: 538 - } - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1076899733" - ) - @Export("getIntParam") - public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; // L: 543 - int var3; - if (var4 == null) { // L: 545 - var3 = var2; // L: 546 - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 549 - if (var5 == null) { // L: 550 - var3 = var2; // L: 551 - } else { - var3 = var5.integer; // L: 554 - } - } - - return var3; // L: 556 - } - @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "20" + descriptor = "(ZI)Z", + garbageValue = "1892090883" ) - @Export("getStringParam") - public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; // L: 561 - String var3; - if (var4 == null) { // L: 563 - var3 = var2; // L: 564 - } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 567 - if (var5 == null) { // L: 568 - var3 = var2; // L: 569 - } else { - var3 = (String)var5.obj; // L: 572 - } + public final boolean method3631(boolean var1) { + int var2 = this.maleHeadModel; // L: 486 + int var3 = this.maleHeadModel2; // L: 487 + if (var1) { // L: 488 + var2 = this.femaleHeadModel; // L: 489 + var3 = this.femaleHeadModel2; // L: 490 } - return var3; // L: 574 + if (var2 == -1) { // L: 492 + return true; + } else { + boolean var4 = true; // L: 493 + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 494 + var4 = false; + } + + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 495 + var4 = false; + } + + return var4; // L: 496 + } } @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(ZI)Lgs;", + garbageValue = "104327416" + ) + public final ModelData method3632(boolean var1) { + int var2 = this.maleHeadModel; // L: 500 + int var3 = this.maleHeadModel2; // L: 501 + if (var1) { // L: 502 + var2 = this.femaleHeadModel; // L: 503 + var3 = this.femaleHeadModel2; // L: 504 + } + + if (var2 == -1) { // L: 506 + return null; + } else { + ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); // L: 507 + if (var3 != -1) { // L: 508 + ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); // L: 509 + ModelData[] var6 = new ModelData[]{var4, var5}; // L: 510 + var4 = new ModelData(var6, 2); // L: 511 + } + + int var7; + if (this.recolorFrom != null) { // L: 513 + for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 514 + var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 515 + } + } + + if (this.retextureFrom != null) { // L: 518 + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 519 + var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 520 + } + } + + return var4; // L: 523 + } + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "919318771" + ) + @Export("getIntParam") + public int getIntParam(int var1, int var2) { + return class154.method3061(this.params, var1, var2); // L: 527 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1359471103" + ) + @Export("getStringParam") + public String getStringParam(int var1, String var2) { + return AttackOption.method2393(this.params, var1, var2); // L: 531 + } + + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1009297979" + garbageValue = "-1911161314" ) @Export("getShiftClickIndex") public int getShiftClickIndex() { - if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 578 - if (this.shiftClickIndex >= 0) { // L: 579 - return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * -301597175 * -822939591 : -1; + if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 535 + if (this.shiftClickIndex >= 0) { // L: 536 + return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * -240268281 * 1170727351 : -1; } else { - return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 580 + return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 537 } } else { return -1; } } - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-340446903" + garbageValue = "-195951590" ) - boolean method3722() { - return this.recolorTo != null; // L: 595 + boolean method3636() { + return this.recolorTo != null; // L: 551 } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1275094150" + descriptor = "(B)Z", + garbageValue = "27" ) - boolean method3708() { - return this.retextureTo != null; // L: 599 - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(III)Lky;", - garbageValue = "1784601570" - ) - @Export("getWidgetChild") - public static Widget getWidgetChild(int var0, int var1) { - Widget var2 = class127.getWidget(var0); - if (var1 == -1) { // L: 240 - return var2; - } else { - return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 241 - } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "([BIII)Z", - garbageValue = "796340469" - ) - static final boolean method3771(byte[] var0, int var1, int var2) { - boolean var3 = true; // L: 226 - Buffer var4 = new Buffer(var0); // L: 227 - int var5 = -1; // L: 228 - - label70: - while (true) { - int var6 = var4.method7743(); // L: 230 - if (var6 == 0) { // L: 231 - return var3; // L: 262 - } - - var5 += var6; // L: 232 - int var7 = 0; // L: 233 - boolean var8 = false; // L: 234 - - while (true) { - int var9; - while (!var8) { // L: 236 - var9 = var4.readUShortSmart(); // L: 242 - if (var9 == 0) { // L: 243 - continue label70; - } - - var7 += var9 - 1; // L: 244 - int var10 = var7 & 63; // L: 245 - int var11 = var7 >> 6 & 63; // L: 246 - int var12 = var4.readUnsignedByte() >> 2; // L: 247 - int var13 = var11 + var1; // L: 248 - int var14 = var10 + var2; // L: 249 - if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { // L: 250 - ObjectComposition var15 = class146.getObjectDefinition(var5); // L: 251 - if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { // L: 252 - if (!var15.needsModelFiles()) { // L: 253 - ++Client.field558; // L: 254 - var3 = false; // L: 255 - } - - var8 = true; // L: 257 - } - } - } - - var9 = var4.readUShortSmart(); // L: 237 - if (var9 == 0) { // L: 238 - break; - } - - var4.readUnsignedByte(); // L: 239 - } - } + boolean method3637() { + return this.retextureTo != null; // L: 555 } } diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index e7ae6c2218..238555ff22 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -4,33 +4,31 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bv") +@ObfuscatedName("bw") @Implements("ItemContainer") public class ItemContainer extends Node { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lpo;" + descriptor = "Lpv;" ) @Export("itemContainers") static NodeHashTable itemContainers; - @ObfuscatedName("u") - @Export("cacheParentPaths") - static String[] cacheParentPaths; - @ObfuscatedName("ig") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -372452529 + intValue = 1933505575 ) - @Export("cameraY") - static int cameraY; - @ObfuscatedName("oo") - @ObfuscatedGetter( - intValue = -922467493 + @Export("ItemDefinition_fileCount") + public static int ItemDefinition_fileCount; + @ObfuscatedName("ey") + @ObfuscatedSignature( + descriptor = "Lle;" ) - static int field1013; - @ObfuscatedName("c") + @Export("archive20") + static Archive archive20; + @ObfuscatedName("q") @Export("ids") int[] ids; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("quantities") int[] quantities; @@ -42,4 +40,68 @@ public class ItemContainer extends Node { this.ids = new int[]{-1}; // L: 8 this.quantities = new int[]{0}; // L: 9 } // L: 11 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Llp;IIB)[Lqd;", + garbageValue = "123" + ) + public static IndexedSprite[] method2062(AbstractArchive var0, int var1, int var2) { + if (!User.method6514(var0, var1, var2)) { // L: 23 + return null; + } else { + IndexedSprite[] var4 = new IndexedSprite[class453.SpriteBuffer_spriteCount]; // L: 26 + + for (int var5 = 0; var5 < class453.SpriteBuffer_spriteCount; ++var5) { // L: 27 + IndexedSprite var6 = var4[var5] = new IndexedSprite(); // L: 28 + var6.width = class453.SpriteBuffer_spriteWidth; // L: 29 + var6.height = class453.SpriteBuffer_spriteHeight; // L: 30 + var6.xOffset = class453.SpriteBuffer_xOffsets[var5]; // L: 31 + var6.yOffset = class453.SpriteBuffer_yOffsets[var5]; // L: 32 + var6.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[var5]; // L: 33 + var6.subHeight = class453.SpriteBuffer_spriteHeights[var5]; // L: 34 + var6.palette = Decimator.SpriteBuffer_spritePalette; // L: 35 + var6.pixels = class127.SpriteBuffer_pixels[var5]; // L: 36 + } + + VarcInt.method3325(); // L: 38 + return var4; // L: 41 + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)[Lda;", + garbageValue = "-726850383" + ) + static class119[] method2060() { + return new class119[]{class119.field1508, class119.field1512, class119.field1502, class119.field1516, class119.field1518, class119.field1521, class119.field1506, class119.field1507, class119.field1500, class119.field1509, class119.field1510, class119.field1511, class119.field1503, class119.field1513, class119.field1514, class119.field1515, class119.field1504}; // L: 74 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1192606922" + ) + public static int method2059(int var0) { + if (var0 > 0) { // L: 194 + return 1; + } else { + return var0 < 0 ? -1 : 0; // L: 195 196 + } + } + + @ObfuscatedName("iz") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "358850975" + ) + static final void method2061(int var0, int var1, int var2, int var3) { + for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 8721 + if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetYs[var4] + Client.rootWidgetHeights[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { // L: 8722 + Client.field704[var4] = true; + } + } + + } // L: 8724 } diff --git a/runescape-client/src/main/java/ItemLayer.java b/runescape-client/src/main/java/ItemLayer.java index 0ded3e3033..f49c9ac3dd 100644 --- a/runescape-client/src/main/java/ItemLayer.java +++ b/runescape-client/src/main/java/ItemLayer.java @@ -4,135 +4,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hy") +@ObfuscatedName("gz") @Implements("ItemLayer") public final class ItemLayer { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1955718833 + intValue = 2143367533 ) @Export("z") int z; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 616317407 + intValue = -832066785 ) @Export("x") int x; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1784777855 + intValue = -677632279 ) @Export("y") int y; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Lgx;" ) @Export("first") Renderable first; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Lgx;" ) @Export("second") Renderable second; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Lgx;" ) @Export("third") Renderable third; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - longValue = -3789512817442359409L + longValue = 2913572583481576221L ) @Export("tag") long tag; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1666880433 + intValue = 30907343 ) @Export("height") int height; ItemLayer() { } // L: 13 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(IZS)Ljava/lang/String;", - garbageValue = "13756" - ) - @Export("intToString") - public static String intToString(int var0, boolean var1) { - return var1 && var0 >= 0 ? class145.method3085(var0, 10, var1) : Integer.toString(var0); // L: 105 106 - } - - @ObfuscatedName("fl") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "17826065" - ) - @Export("logOut") - static final void logOut() { - Client.packetWriter.close(); // L: 2854 - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 2857 - MouseRecorder.method2098(); // L: 2859 - class193.method3884(); // L: 2860 - HealthBarDefinition.method3466(); // L: 2861 - NPCComposition.NpcDefinition_cached.clear(); // L: 2863 - NPCComposition.NpcDefinition_cachedModels.clear(); // L: 2864 - ItemComposition.ItemDefinition_cached.clear(); // L: 2867 - ItemComposition.ItemDefinition_cachedModels.clear(); // L: 2868 - ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 2869 - SequenceDefinition.SequenceDefinition_cached.clear(); // L: 2872 - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 2873 - SequenceDefinition.SequenceDefinition_cachedModel.clear(); // L: 2874 - SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 2877 - SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 2878 - VarbitComposition.VarbitDefinition_cached.clear(); // L: 2881 - VarpDefinition.VarpDefinition_cached.clear(); // L: 2884 - ReflectionCheck.HitSplatDefinition_cachedSprites.method7541(); // L: 2886 - DirectByteArrayCopier.HitSplatDefinition_cached.method7541(); // L: 2887 - HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 2889 - HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 2890 - HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 2891 - HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 2894 - HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 2895 - StructComposition.StructDefinition_cached.clear(); // L: 2898 - ParamComposition.ParamDefinition_cached.clear(); // L: 2901 - WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 2904 - PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 2907 - Widget.Widget_cachedSprites.clear(); // L: 2910 - Widget.Widget_cachedModels.clear(); // L: 2911 - Widget.Widget_cachedFonts.clear(); // L: 2912 - Widget.Widget_cachedSpriteMasks.clear(); // L: 2913 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 2915 - Script.Script_cached.clear(); // L: 2916 - KeyHandler.archive0.clearFiles(); // L: 2917 - UserComparator8.archive1.clearFiles(); // L: 2918 - BufferedNetSocket.archive3.clearFiles(); // L: 2919 - class182.archive4.clearFiles(); // L: 2920 - Players.archive5.clearFiles(); // L: 2921 - class16.archive6.clearFiles(); // L: 2922 - LoginScreenAnimation.archive7.clearFiles(); // L: 2923 - class145.archive8.clearFiles(); // L: 2924 - WorldMapDecorationType.archive9.clearFiles(); // L: 2925 - JagexCache.archive10.clearFiles(); // L: 2926 - Message.archive11.clearFiles(); // L: 2927 - class152.archive12.clearFiles(); // L: 2928 - ArchiveLoader.scene.clear(); // L: 2930 - - for (int var0 = 0; var0 < 4; ++var0) { // L: 2931 - Client.collisionMaps[var0].clear(); - } - - System.gc(); // L: 2932 - Actor.method2183(2); // L: 2933 - Client.currentTrackGroupId = -1; // L: 2934 - Client.playingJingle = false; // L: 2935 - ClientPreferences.method2259(); // L: 2936 - Decimator.updateGameState(10); // L: 2937 - } // L: 2938 } diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index 400e31b854..ed6d43c73b 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueue.java +++ b/runescape-client/src/main/java/IterableDualNodeQueue.java @@ -4,18 +4,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mr") +@ObfuscatedName("ma") @Implements("IterableDualNodeQueue") public class IterableDualNodeQueue implements Iterable { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) @Export("sentinel") public DualNode sentinel; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) @Export("head") DualNode head; @@ -26,7 +26,7 @@ public class IterableDualNodeQueue implements Iterable { this.sentinel.nextDual = this.sentinel; // L: 12 } // L: 13 - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("clear") public void clear() { while (this.sentinel.previousDual != this.sentinel) { // L: 16 @@ -35,9 +35,9 @@ public class IterableDualNodeQueue implements Iterable { } // L: 19 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Loz;)V" + descriptor = "(Loq;)V" ) @Export("add") public void add(DualNode var1) { @@ -51,75 +51,75 @@ public class IterableDualNodeQueue implements Iterable { var1.previousDual.nextDual = var1; // L: 26 } // L: 27 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Loz;" + descriptor = "()Loq;" ) @Export("removeLast") public DualNode removeLast() { - DualNode var1 = this.sentinel.previousDual; // L: 38 + DualNode var1 = this.sentinel.previousDual; // L: 39 if (var1 == this.sentinel) { - return null; // L: 39 + return null; // L: 40 } else { - var1.removeDual(); // L: 40 - return var1; // L: 41 + var1.removeDual(); // L: 41 + return var1; // L: 42 } } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "()Loz;" + descriptor = "()Loq;" ) @Export("last") public DualNode last() { - return this.previousOrLast((DualNode)null); // L: 45 + return this.previousOrLast((DualNode)null); // L: 46 } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Loz;)Loz;" + descriptor = "(Loq;)Loq;" ) @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { DualNode var2; - if (var1 == null) { // L: 50 + if (var1 == null) { // L: 52 var2 = this.sentinel.previousDual; } else { - var2 = var1; // L: 51 + var2 = var1; // L: 53 } - if (var2 == this.sentinel) { // L: 52 - this.head = null; // L: 53 - return null; // L: 54 + if (var2 == this.sentinel) { // L: 54 + this.head = null; // L: 55 + return null; // L: 56 } else { - this.head = var2.previousDual; // L: 56 - return var2; // L: 57 + this.head = var2.previousDual; // L: 58 + return var2; // L: 59 } } - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "()Loz;" + descriptor = "()Loq;" ) @Export("previous") public DualNode previous() { - DualNode var1 = this.head; // L: 61 - if (var1 == this.sentinel) { // L: 62 - this.head = null; // L: 63 - return null; // L: 64 + DualNode var1 = this.head; // L: 64 + if (var1 == this.sentinel) { // L: 65 + this.head = null; // L: 66 + return null; // L: 67 } else { - this.head = var1.previousDual; // L: 66 - return var1; // L: 67 + this.head = var1.previousDual; // L: 69 + return var1; // L: 70 } } public Iterator iterator() { - return new IterableDualNodeQueueIterator(this); // L: 71 + return new IterableDualNodeQueueIterator(this); // L: 74 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Loz;Loz;)V" + descriptor = "(Loq;Loq;)V" ) @Export("DualNodeDeque_addBefore") public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) { diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java index ee42bb5519..9800bda6bb 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java +++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java @@ -4,30 +4,30 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ms") +@ObfuscatedName("mj") @Implements("IterableDualNodeQueueIterator") public class IterableDualNodeQueueIterator implements Iterator { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lmr;" + descriptor = "Lma;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) @Export("head") DualNode head; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Loq;" ) @Export("last") DualNode last; @ObfuscatedSignature( - descriptor = "(Lmr;)V" + descriptor = "(Lma;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { this.last = null; // L: 9 @@ -37,28 +37,28 @@ public class IterableDualNodeQueueIterator implements Iterator { } // L: 15 public void remove() { - if (this.last == null) { // L: 33 + if (this.last == null) { // L: 34 throw new IllegalStateException(); } else { - this.last.removeDual(); // L: 34 - this.last = null; // L: 35 + this.last.removeDual(); // L: 35 + this.last = null; // L: 36 } - } // L: 36 - - public Object next() { - DualNode var1 = this.head; // L: 18 - if (var1 == this.queue.sentinel) { // L: 19 - var1 = null; // L: 20 - this.head = null; // L: 21 - } else { - this.head = var1.previousDual; // L: 23 - } - - this.last = var1; // L: 24 - return var1; // L: 25 - } + } // L: 37 public boolean hasNext() { - return this.queue.sentinel != this.head; // L: 29 + return this.queue.sentinel != this.head; // L: 30 + } + + public Object next() { + DualNode var1 = this.head; // L: 19 + if (var1 == this.queue.sentinel) { // L: 20 + var1 = null; // L: 21 + this.head = null; // L: 22 + } else { + this.head = var1.previousDual; // L: 24 + } + + this.last = var1; // L: 25 + return var1; // L: 26 } } diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index 44b158ac6b..b166bcddb3 100644 --- a/runescape-client/src/main/java/IterableNodeDeque.java +++ b/runescape-client/src/main/java/IterableNodeDeque.java @@ -5,20 +5,20 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lk") +@ObfuscatedName("lo") @Implements("IterableNodeDeque") public class IterableNodeDeque implements Iterable, Collection { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Loq;" + descriptor = "Los;" ) @Export("sentinel") Node sentinel; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Loq;" + descriptor = "Los;" ) - Node field4086; + Node field4146; public IterableNodeDeque() { this.sentinel = new Node(); // L: 7 @@ -26,7 +26,7 @@ public class IterableNodeDeque implements Iterable, Collection { this.sentinel.next = this.sentinel; // L: 12 } // L: 13 - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("rsClear") public void rsClear() { while (this.sentinel.previous != this.sentinel) { // L: 16 @@ -35,9 +35,9 @@ public class IterableNodeDeque implements Iterable, Collection { } // L: 19 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Loq;)V" + descriptor = "(Los;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -51,9 +51,9 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; // L: 26 } // L: 27 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Loq;)V" + descriptor = "(Los;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -67,161 +67,161 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; // L: 34 } // L: 35 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "()Loq;" + descriptor = "()Los;" ) @Export("last") public Node last() { - return this.method6161((Node)null); // L: 46 + return this.method5989((Node)null); // L: 46 } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Loq;)Loq;" + descriptor = "(Los;)Los;" ) - Node method6161(Node var1) { + Node method5989(Node var1) { Node var2; - if (var1 == null) { // L: 51 + if (var1 == null) { // L: 52 var2 = this.sentinel.previous; } else { - var2 = var1; // L: 52 + var2 = var1; // L: 53 } - if (var2 == this.sentinel) { // L: 53 - this.field4086 = null; // L: 54 - return null; // L: 55 + if (var2 == this.sentinel) { // L: 54 + this.field4146 = null; // L: 55 + return null; // L: 56 } else { - this.field4086 = var2.previous; // L: 57 - return var2; // L: 58 + this.field4146 = var2.previous; // L: 58 + return var2; // L: 59 + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "()Los;" + ) + @Export("previous") + public Node previous() { + Node var1 = this.field4146; // L: 64 + if (var1 == this.sentinel) { // L: 65 + this.field4146 = null; // L: 66 + return null; // L: 67 + } else { + this.field4146 = var1.previous; // L: 69 + return var1; // L: 70 } } @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "()Loq;" - ) - @Export("previous") - public Node previous() { - Node var1 = this.field4086; // L: 62 - if (var1 == this.sentinel) { // L: 63 - this.field4086 = null; // L: 64 - return null; // L: 65 - } else { - this.field4086 = var1.previous; // L: 67 - return var1; // L: 68 - } - } + int method5967() { + int var1 = 0; // L: 74 - @ObfuscatedName("l") - int method6163() { - int var1 = 0; // L: 72 - - for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { // L: 73 74 76 - ++var1; // L: 75 + for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { // L: 75 76 78 + ++var1; // L: 77 } - return var1; // L: 78 - } - - @ObfuscatedName("q") - public boolean method6164() { - return this.sentinel.previous == this.sentinel; // L: 82 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "()[Loq;" - ) - Node[] method6212() { - Node[] var1 = new Node[this.method6163()]; // L: 86 - int var2 = 0; // L: 87 - - for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 88 89 91 - var1[var2++] = var3; // L: 90 - } - - return var1; // L: 93 + return var1; // L: 80 } @ObfuscatedName("r") + public boolean method5986() { + return this.sentinel.previous == this.sentinel; // L: 84 + } + + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Loq;)Z" + descriptor = "()[Los;" ) - boolean method6206(Node var1) { - this.addFirst(var1); // L: 127 - return true; // L: 128 + Node[] method5997() { + Node[] var1 = new Node[this.method5967()]; // L: 88 + int var2 = 0; // L: 89 + + for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 90 91 93 + var1[var2++] = var3; // L: 92 + } + + return var1; // L: 95 } - public boolean addAll(Collection var1) { - throw new RuntimeException(); // L: 140 - } - - public Iterator iterator() { - return new IterableNodeDequeDescendingIterator(this); // L: 97 + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(Los;)Z" + ) + boolean method5973(Node var1) { + this.addFirst(var1); // L: 135 + return true; // L: 136 } public int size() { - return this.method6163(); // L: 101 - } - - public boolean contains(Object var1) { - throw new RuntimeException(); // L: 109 - } - - public Object[] toArray(Object[] var1) { - int var2 = 0; // L: 117 - - for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 118 119 121 - var1[var2++] = var3; // L: 120 - } - - return var1; // L: 123 - } - - public Object[] toArray() { - return this.method6212(); // L: 113 - } - - 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 int hashCode() { - return super.hashCode(); // L: 164 - } - - public boolean containsAll(Collection var1) { - throw new RuntimeException(); // L: 136 + return this.method5967(); // L: 104 } public boolean isEmpty() { - return this.method6164(); // L: 105 + return this.method5986(); // L: 109 + } + + public boolean contains(Object var1) { + throw new RuntimeException(); // L: 114 + } + + public boolean containsAll(Collection var1) { + throw new RuntimeException(); // L: 146 + } + + public boolean addAll(Collection var1) { + throw new RuntimeException(); // L: 151 + } + + public boolean retainAll(Collection var1) { + throw new RuntimeException(); // L: 161 + } + + public Object[] toArray() { + return this.method5997(); // L: 119 } public boolean add(Object var1) { - return this.method6206((Node)var1); // L: 156 + return this.method5973((Node)var1); // L: 170 } - public boolean remove(Object var1) { - throw new RuntimeException(); // L: 132 + public Iterator iterator() { + return new IterableNodeDequeDescendingIterator(this); // L: 99 + } + + public boolean removeAll(Collection var1) { + throw new RuntimeException(); // L: 156 + } + + public void clear() { + this.rsClear(); // L: 166 + } // L: 167 + + public int hashCode() { + return super.hashCode(); // L: 178 + } + + public Object[] toArray(Object[] var1) { + int var2 = 0; // L: 125 + + for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 126 127 129 + var1[var2++] = var3; // L: 128 + } + + return var1; // L: 131 } public boolean equals(Object var1) { - return super.equals(var1); // L: 160 + return super.equals(var1); // L: 174 } - @ObfuscatedName("f") + public boolean remove(Object var1) { + throw new RuntimeException(); // L: 141 + } + + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Loq;Loq;)V" + descriptor = "(Los;Los;)V" ) @Export("IterableNodeDeque_addBefore") public static void IterableNodeDeque_addBefore(Node var0, Node var1) { diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java index 8277566c52..5571710999 100644 --- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java @@ -4,38 +4,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lt") +@ObfuscatedName("ll") @Implements("IterableNodeDequeDescendingIterator") public class IterableNodeDequeDescendingIterator implements Iterator { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Llk;" + descriptor = "Llo;" ) @Export("deque") IterableNodeDeque deque; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Loq;" + descriptor = "Los;" ) - Node field4083; - @ObfuscatedName("i") + Node field4144; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Loq;" + descriptor = "Los;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Llk;)V" + descriptor = "(Llo;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { this.last = null; // L: 9 this.setDeque(var1); // L: 12 } // L: 13 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Llk;)V" + descriptor = "(Llo;)V" ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { @@ -43,36 +43,36 @@ public class IterableNodeDequeDescendingIterator implements Iterator { this.start(); // L: 17 } // L: 18 - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("start") void start() { - this.field4083 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21 + this.field4144 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21 this.last = null; // L: 22 } // L: 23 + public boolean hasNext() { + return this.deque.sentinel != this.field4144 && this.field4144 != null; // L: 38 + } + public void remove() { - if (this.last == null) { // L: 41 + if (this.last == null) { // L: 42 throw new IllegalStateException(); } else { - this.last.remove(); // L: 42 - this.last = null; // L: 43 + this.last.remove(); // L: 43 + this.last = null; // L: 44 } - } // L: 44 + } // L: 45 public Object next() { - Node var1 = this.field4083; // L: 26 - if (var1 == this.deque.sentinel) { // L: 27 - var1 = null; // L: 28 - this.field4083 = null; // L: 29 + Node var1 = this.field4144; // L: 27 + if (var1 == this.deque.sentinel) { // L: 28 + var1 = null; // L: 29 + this.field4144 = null; // L: 30 } else { - this.field4083 = var1.previous; // L: 31 + this.field4144 = var1.previous; // L: 32 } - this.last = var1; // L: 32 - return var1; // L: 33 - } - - public boolean hasNext() { - return this.deque.sentinel != this.field4083 && this.field4083 != null; // L: 37 + this.last = var1; // L: 33 + return var1; // L: 34 } } diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index c45fcbb46f..8fb4b9c209 100644 --- a/runescape-client/src/main/java/IterableNodeHashTable.java +++ b/runescape-client/src/main/java/IterableNodeHashTable.java @@ -7,28 +7,28 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("pt") @Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("size") int size; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "[Loq;" + descriptor = "[Los;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Loq;" + descriptor = "Los;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Loq;" + descriptor = "Los;" ) @Export("current") Node current; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("index") int index; @@ -45,100 +45,100 @@ public final class IterableNodeHashTable implements Iterable { } // L: 21 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(J)Loq;" + descriptor = "(J)Los;" ) @Export("get") public Node get(long var1) { - Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; // L: 24 + Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; // L: 25 - for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { // L: 25 26 32 - if (this.currentGet.key == var1) { // L: 27 - Node var4 = this.currentGet; // L: 28 - this.currentGet = this.currentGet.previous; // L: 29 - return var4; // L: 30 + for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { // L: 26 27 33 + if (this.currentGet.key == var1) { // L: 28 + Node var4 = this.currentGet; // L: 29 + this.currentGet = this.currentGet.previous; // L: 30 + return var4; // L: 31 } } - this.currentGet = null; // L: 34 - return null; // L: 35 + this.currentGet = null; // L: 35 + return null; // L: 36 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Loq;J)V" + descriptor = "(Los;J)V" ) @Export("put") public void put(Node var1, long var2) { - if (var1.next != null) { // L: 39 + if (var1.next != null) { // L: 40 var1.remove(); } - Node var4 = this.buckets[(int)(var2 & (long)(this.size - 1))]; // L: 40 - var1.next = var4.next; // L: 41 - var1.previous = var4; // L: 42 - var1.next.previous = var1; // L: 43 - var1.previous.next = var1; // L: 44 - var1.key = var2; // L: 45 - } // L: 46 + Node var4 = this.buckets[(int)(var2 & (long)(this.size - 1))]; // L: 41 + var1.next = var4.next; // L: 42 + var1.previous = var4; // L: 43 + var1.next.previous = var1; // L: 44 + var1.previous.next = var1; // L: 45 + var1.key = var2; // L: 46 + } // L: 47 - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("clear") public void clear() { - for (int var1 = 0; var1 < this.size; ++var1) { // L: 49 - Node var2 = this.buckets[var1]; // L: 50 + for (int var1 = 0; var1 < this.size; ++var1) { // L: 50 + Node var2 = this.buckets[var1]; // L: 51 while (true) { - Node var3 = var2.previous; // L: 52 - if (var3 == var2) { // L: 53 + Node var3 = var2.previous; // L: 53 + if (var3 == var2) { // L: 54 break; } - var3.remove(); // L: 54 + var3.remove(); // L: 55 } } - this.currentGet = null; // L: 57 - this.current = null; // L: 58 - } // L: 59 + this.currentGet = null; // L: 58 + this.current = null; // L: 59 + } // L: 60 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Loq;" + descriptor = "()Los;" ) @Export("first") public Node first() { - this.index = 0; // L: 62 - return this.next(); // L: 63 + this.index = 0; // L: 63 + return this.next(); // L: 64 } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "()Loq;" + descriptor = "()Los;" ) @Export("next") public Node next() { Node var1; - if (this.index > 0 && this.buckets[this.index - 1] != this.current) { // L: 67 - var1 = this.current; // L: 68 - this.current = var1.previous; // L: 69 - return var1; // L: 70 + if (this.index > 0 && this.buckets[this.index - 1] != this.current) { // L: 69 + var1 = this.current; // L: 70 + this.current = var1.previous; // L: 71 + return var1; // L: 72 } else { do { - if (this.index >= this.size) { // L: 72 - return null; // L: 79 + if (this.index >= this.size) { // L: 74 + return null; // L: 81 } - var1 = this.buckets[this.index++].previous; // L: 73 - } while(var1 == this.buckets[this.index - 1]); // L: 74 + var1 = this.buckets[this.index++].previous; // L: 75 + } while(var1 == this.buckets[this.index - 1]); // L: 76 - this.current = var1.previous; // L: 75 - return var1; // L: 76 + this.current = var1.previous; // L: 77 + return var1; // L: 78 } } public Iterator iterator() { - return new IterableNodeHashTableIterator(this); // L: 83 + return new IterableNodeHashTableIterator(this); // L: 86 } } diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index 0238431fec..e989908299 100644 --- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java +++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java @@ -4,27 +4,27 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pu") +@ObfuscatedName("pn") @Implements("IterableNodeHashTableIterator") public class IterableNodeHashTableIterator implements Iterator { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lpt;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Loq;" + descriptor = "Los;" ) @Export("head") Node head; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("index") int index; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Loq;" + descriptor = "Los;" ) @Export("last") Node last; @@ -38,7 +38,7 @@ public class IterableNodeHashTableIterator implements Iterator { this.start(); // L: 14 } // L: 15 - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("start") void start() { this.head = this.hashTable.buckets[0].previous; // L: 18 @@ -46,51 +46,51 @@ public class IterableNodeHashTableIterator implements Iterator { 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; - } else { - while (this.index < this.hashTable.size) { // L: 43 - if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { // L: 44 - this.head = this.hashTable.buckets[this.index - 1].previous; // L: 45 - return true; // L: 46 - } - - this.head = this.hashTable.buckets[this.index - 1]; // L: 49 - } - - return false; // L: 52 - } - } - public void remove() { - if (this.last == null) { // L: 56 + if (this.last == null) { // L: 57 throw new IllegalStateException(); } else { - this.last.remove(); // L: 57 - this.last = null; // L: 58 + this.last.remove(); // L: 58 + this.last = null; // L: 59 } - } // L: 59 + } // L: 60 + + public boolean hasNext() { + if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 43 + return true; + } else { + while (this.index < this.hashTable.size) { // L: 44 + if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { // L: 45 + this.head = this.hashTable.buckets[this.index - 1].previous; // L: 46 + return true; // L: 47 + } + + this.head = this.hashTable.buckets[this.index - 1]; // L: 50 + } + + return false; // L: 53 + } + } + + public Object next() { + Node var1; + if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 25 + var1 = this.head; // L: 26 + this.head = var1.previous; // L: 27 + this.last = var1; // L: 28 + return var1; // L: 29 + } else { + do { + if (this.index >= this.hashTable.size) { // L: 31 + return null; // L: 39 + } + + var1 = this.hashTable.buckets[this.index++].previous; // L: 32 + } while(var1 == this.hashTable.buckets[this.index - 1]); // L: 33 + + this.head = var1.previous; // L: 34 + this.last = var1; // L: 35 + return var1; // L: 36 + } + } } diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java index e07290739b..bbbab2bb04 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -1,50 +1,443 @@ 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("fp") @Implements("JagexCache") public class JagexCache { - @ObfuscatedName("b") + @ObfuscatedName("k") + @Export("JagexCache_locationFile") + static File JagexCache_locationFile; + @ObfuscatedName("a") @Export("cacheDir") static File cacheDir; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -701030665 - ) - @Export("idxCount") - static int idxCount; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lpb;" + descriptor = "Lpz;" ) @Export("JagexCache_randomDat") public static BufferedFile JagexCache_randomDat; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lpb;" + descriptor = "Lpz;" ) @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lpb;" + descriptor = "Lpz;" ) @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; - @ObfuscatedName("ek") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Llx;" + descriptor = "[Lpz;" ) - @Export("archive10") - static Archive archive10; + @Export("JagexCache_idxFiles") + public static BufferedFile[] JagexCache_idxFiles; + @ObfuscatedName("d") + @Export("operatingSystemName") + static String operatingSystemName; static { - JagexCache_randomDat = null; // L: 22 - JagexCache_dat2File = null; // L: 23 + JagexCache_randomDat = null; + JagexCache_dat2File = null; JagexCache_idx255File = null; // L: 24 } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lpx;Lpt;I)Lpt;", + garbageValue = "-1071419975" + ) + @Export("readStringIntParameters") + static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { + int var2 = var0.readUnsignedByte(); // L: 16 + int var3; + if (var1 == null) { // L: 17 + var3 = FontName.method7228(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) { + var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); // L: 25 + } else { + var6 = new IntegerNode(var0.readInt()); // L: 26 + } + + var1.put((Node)var6, (long)var5); + } + + return var1; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Llp;Llp;B)V", + garbageValue = "35" + ) + public static void method3154(AbstractArchive var0, AbstractArchive var1) { + class18.KitDefinition_archive = var0; // L: 27 + class361.KitDefinition_modelsArchive = var1; // L: 28 + class147.KitDefinition_fileCount = class18.KitDefinition_archive.getGroupFileCount(3); // L: 29 + } // L: 30 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Ldz;FZB)F", + garbageValue = "-1" + ) + static float method3159(class117 var0, float var1, boolean var2) { + float var3 = 0.0F; // L: 209 + if (var0 != null && var0.method2695() != 0) { // L: 210 + float var4 = (float)var0.field1476[0].field1430; // L: 213 + float var5 = (float)var0.field1476[var0.method2695() - 1].field1430; // L: 214 + float var6 = var5 - var4; // L: 215 + if ((double)var6 == 0.0D) { // L: 216 + return var0.field1476[0].field1428; // L: 217 + } else { + float var7 = 0.0F; // L: 219 + if (var1 > var5) { // L: 220 + var7 = (var1 - var5) / var6; // L: 221 + } else { + var7 = (var1 - var4) / var6; // L: 224 + } + + double var8 = (double)((int)var7); // L: 226 + float var10 = Math.abs((float)((double)var7 - var8)); // L: 227 + float var11 = var10 * var6; // L: 228 + var8 = Math.abs(var8 + 1.0D); // L: 229 + double var12 = var8 / 2.0D; // L: 230 + double var14 = (double)((int)var12); // L: 231 + var10 = (float)(var12 - var14); // L: 232 + float var16; + float var17; + if (var2) { // L: 235 + if (var0.field1472 == class116.field1468) { // L: 236 + if ((double)var10 != 0.0D) { // L: 237 + var11 += var4; // L: 238 + } else { + var11 = var5 - var11; // L: 241 + } + } else if (var0.field1472 != class116.field1464 && var0.field1472 != class116.field1466) { // L: 244 + if (var0.field1472 == class116.field1465) { // L: 247 + var11 = var4 - var1; // L: 248 + var16 = var0.field1476[0].field1423; // L: 249 + var17 = var0.field1476[0].field1424; // L: 250 + var3 = var0.field1476[0].field1428; // L: 251 + if (0.0D != (double)var16) { // L: 252 + var3 -= var17 * var11 / var16; // L: 253 + } + + return var3; // L: 255 + } + } else { + var11 = var5 - var11; // L: 245 + } + } else if (var0.field1475 == class116.field1468) { // L: 259 + if ((double)var10 != 0.0D) { // L: 260 + var11 = var5 - var11; // L: 261 + } else { + var11 += var4; // L: 264 + } + } else if (var0.field1475 != class116.field1464 && var0.field1475 != class116.field1466) { // L: 267 + if (var0.field1475 == class116.field1465) { // L: 270 + var11 = var1 - var5; // L: 271 + var16 = var0.field1476[var0.method2695() - 1].field1425; // L: 272 + var17 = var0.field1476[var0.method2695() - 1].field1426; // L: 273 + var3 = var0.field1476[var0.method2695() - 1].field1428; // L: 274 + if (0.0D != (double)var16) { // L: 275 + var3 += var17 * var11 / var16; // L: 276 + } + + return var3; // L: 278 + } + } else { + var11 += var4; // L: 268 + } + + var3 = MusicPatchNode.method5315(var0, var11); // L: 281 + float var18; + if (var2 && var0.field1472 == class116.field1466) { // L: 283 + var18 = var0.field1476[var0.method2695() - 1].field1428 - var0.field1476[0].field1428; // L: 284 + var3 = (float)((double)var3 - var8 * (double)var18); // L: 285 + } else if (!var2 && var0.field1475 == class116.field1466) { // L: 287 + var18 = var0.field1476[var0.method2695() - 1].field1428 - var0.field1476[0].field1428; // L: 288 + var3 = (float)((double)var3 + (double)var18 * var8); // L: 289 + } + + return var3; // L: 291 + } + } else { + return var3; // L: 211 + } + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Llp;Ljava/lang/String;Ljava/lang/String;B)Lqd;", + garbageValue = "-119" + ) + @Export("SpriteBuffer_getIndexedSpriteByName") + public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 85 + int var4 = var0.getFileId(var3, var2); // L: 86 + return ViewportMouse.method4372(var0, var3, var4); // L: 87 + } + + @ObfuscatedName("eu") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1667871503" + ) + static final void method3155() { + Scene.Scene_isLowDetail = false; // L: 817 + Client.isLowDetail = false; // L: 818 + } // L: 819 + + @ObfuscatedName("gd") + @ObfuscatedSignature( + descriptor = "(Lca;III)V", + garbageValue = "-1086335003" + ) + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { + if (var0.sequence == var1 && var1 != -1) { // L: 4318 + int var3 = class114.SequenceDefinition_get(var1).field2208; // L: 4319 + if (var3 == 1) { // L: 4320 + var0.sequenceFrame = 0; // L: 4321 + var0.sequenceFrameCycle = 0; // L: 4322 + var0.sequenceDelay = var2; // L: 4323 + var0.field1186 = 0; // L: 4324 + } + + if (var3 == 2) { // L: 4326 + var0.field1186 = 0; // L: 4327 + } + } else if (var1 == -1 || var0.sequence == -1 || class114.SequenceDefinition_get(var1).field2220 >= class114.SequenceDefinition_get(var0.sequence).field2220) { // L: 4330 + var0.sequence = var1; // L: 4331 + var0.sequenceFrame = 0; // L: 4332 + var0.sequenceFrameCycle = 0; // L: 4333 + var0.sequenceDelay = var2; // L: 4334 + var0.field1186 = 0; // L: 4335 + var0.field1200 = var0.pathLength; // L: 4336 + } + + } // L: 4338 + + @ObfuscatedName("ha") + @ObfuscatedSignature( + descriptor = "(Lpc;I)V", + garbageValue = "-1313288236" + ) + static final void method3158(PacketBuffer var0) { + for (int var1 = 0; var1 < Client.field565; ++var1) { // L: 8174 + int var2 = Client.field601[var1]; // L: 8175 + NPC var3 = Client.npcs[var2]; // L: 8176 + int var4 = var0.readUnsignedByte(); // L: 8177 + int var5; + if (class393.field4428 && (var4 & 8) != 0) { // L: 8178 + var5 = var0.readUnsignedByte(); // L: 8179 + var4 += var5 << 8; // L: 8180 + } + + int var6; + int var7; + int var8; + if ((var4 & 16) != 0) { // L: 8182 + var5 = var0.readUnsignedShort(); // L: 8183 + var6 = var0.method7716(); // L: 8184 + if (class393.field4428) { // L: 8185 + var3.field1173 = var0.method7546() == 1; // L: 8186 + } + + var7 = var3.x - (var5 - SecureRandomCallable.baseX - SecureRandomCallable.baseX) * 64; // L: 8188 + var8 = var3.y - (var6 - GrandExchangeOfferOwnWorldComparator.baseY - GrandExchangeOfferOwnWorldComparator.baseY) * 64; // L: 8189 + if (var7 != 0 || var8 != 0) { // L: 8190 + var3.field1172 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; + } + } + + if ((var4 & 1024) != 0) { // L: 8192 + var3.field1210 = var0.method7568(); // L: 8193 + } + + if ((var4 & 2) != 0) { // L: 8195 + var3.targetIndex = var0.method7554(); // L: 8196 + if (var3.targetIndex == 65535) { // L: 8197 + var3.targetIndex = -1; + } + } + + if ((var4 & 32) != 0) { // L: 8199 + var5 = var0.method7716(); // L: 8200 + if (var5 == 65535) { // L: 8201 + var5 = -1; // L: 8202 + } + + var6 = var0.readUnsignedByte(); // L: 8204 + if (var5 == var3.sequence && var5 != -1) { // L: 8205 + var7 = class114.SequenceDefinition_get(var5).field2208; // L: 8206 + if (var7 == 1) { // L: 8207 + var3.sequenceFrame = 0; // L: 8208 + var3.sequenceFrameCycle = 0; // L: 8209 + var3.sequenceDelay = var6; // L: 8210 + var3.field1186 = 0; // L: 8211 + } + + if (var7 == 2) { // L: 8213 + var3.field1186 = 0; // L: 8214 + } + } else if (var5 == -1 || var3.sequence == -1 || class114.SequenceDefinition_get(var5).field2220 >= class114.SequenceDefinition_get(var3.sequence).field2220) { // L: 8217 + var3.sequence = var5; // L: 8218 + var3.sequenceFrame = 0; // L: 8219 + var3.sequenceFrameCycle = 0; // L: 8220 + var3.sequenceDelay = var6; // L: 8221 + var3.field1186 = 0; // L: 8222 + var3.field1200 = var3.pathLength; // L: 8223 + } + } + + if ((var4 & 512) != 0) { // L: 8227 + var3.field1196 = Client.cycle + var0.method7576(); // L: 8228 + var3.field1197 = Client.cycle + var0.method7576(); // L: 8229 + var3.field1143 = var0.readByte(); // L: 8230 + var3.field1199 = var0.method7548(); // L: 8231 + var3.field1153 = var0.method7548(); // L: 8232 + var3.field1140 = (byte)var0.readUnsignedByte(); // L: 8233 + } + + if (class393.field4428 && (var4 & 256) != 0 || !class393.field4428 && (var4 & 8) != 0) { // L: 8235 + var3.field1187 = var0.method7548(); // L: 8236 + var3.field1189 = var0.method7549(); // L: 8237 + var3.field1188 = var0.method7548(); // L: 8238 + var3.field1190 = var0.method7547(); // L: 8239 + var3.field1191 = var0.method7716() + Client.cycle; // L: 8240 + var3.field1192 = var0.method7716() + Client.cycle; // L: 8241 + var3.field1139 = var0.readUnsignedShort(); // L: 8242 + var3.pathLength = 1; // L: 8243 + var3.field1200 = 0; // L: 8244 + var3.field1187 += var3.pathX[0]; // L: 8245 + var3.field1189 += var3.pathY[0]; // L: 8246 + var3.field1188 += var3.pathX[0]; // L: 8247 + var3.field1190 += var3.pathY[0]; // L: 8248 + } + + if ((var4 & 64) != 0) { // L: 8250 + var3.overheadText = var0.readStringCp1252NullTerminated(); // L: 8251 + var3.overheadTextCyclesRemaining = 100; // L: 8252 + } + + if ((var4 & 1) != 0) { // L: 8254 + var3.spotAnimation = var0.method7576(); // L: 8255 + var5 = var0.method7701(); // L: 8256 + var3.spotAnimationHeight = var5 >> 16; // L: 8257 + var3.field1185 = (var5 & 65535) + Client.cycle; // L: 8258 + var3.spotAnimationFrame = 0; // L: 8259 + var3.spotAnimationFrameCycle = 0; // L: 8260 + if (var3.field1185 > Client.cycle) { // L: 8261 + var3.spotAnimationFrame = -1; + } + + if (var3.spotAnimation == 65535) { // L: 8262 + var3.spotAnimation = -1; + } + } + + if ((var4 & 4) != 0) { // L: 8264 + var5 = var0.readUnsignedByte(); // L: 8265 + int var9; + int var10; + int var11; + if (var5 > 0) { // L: 8266 + for (var6 = 0; var6 < var5; ++var6) { // L: 8267 + var8 = -1; // L: 8269 + var9 = -1; // L: 8270 + var10 = -1; // L: 8271 + var7 = var0.readUShortSmart(); // L: 8272 + if (var7 == 32767) { // L: 8273 + var7 = var0.readUShortSmart(); // L: 8274 + var9 = var0.readUShortSmart(); // L: 8275 + var8 = var0.readUShortSmart(); // L: 8276 + var10 = var0.readUShortSmart(); // L: 8277 + } else if (var7 != 32766) { // L: 8279 + var9 = var0.readUShortSmart(); // L: 8280 + } else { + var7 = -1; // L: 8282 + } + + var11 = var0.readUShortSmart(); // L: 8283 + var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); // L: 8284 + } + } + + var6 = var0.method7546(); // L: 8287 + if (var6 > 0) { // L: 8288 + for (var7 = 0; var7 < var6; ++var7) { // L: 8289 + var8 = var0.readUShortSmart(); // L: 8290 + var9 = var0.readUShortSmart(); // L: 8291 + if (var9 != 32767) { // L: 8292 + var10 = var0.readUShortSmart(); // L: 8293 + var11 = var0.readUnsignedByte(); // L: 8294 + int var12 = var9 > 0 ? var0.method7546() : var11; // L: 8295 + var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); // L: 8296 + } else { + var3.removeHealthBar(var8); // L: 8298 + } + } + } + } + + if ((var4 & 2048) != 0) { // L: 8302 + var3.method2338(var0.readStringCp1252NullTerminated()); // L: 8303 + } + + if ((var4 & 128) != 0) { // L: 8305 + var3.definition = WorldMapSectionType.getNpcDefinition(var0.method7554()); // L: 8306 + var3.field1167 = var3.definition.size; // L: 8307 + var3.field1204 = var3.definition.rotation; // L: 8308 + var3.walkSequence = var3.definition.walkSequence; // L: 8309 + var3.walkBackSequence = var3.definition.walkBackSequence; // L: 8310 + var3.walkLeftSequence = var3.definition.walkLeftSequence; // L: 8311 + var3.walkRightSequence = var3.definition.walkRightSequence; // L: 8312 + var3.idleSequence = var3.definition.idleSequence; // L: 8313 + var3.turnLeftSequence = var3.definition.turnLeftSequence; // L: 8314 + var3.turnRightSequence = var3.definition.turnRightSequence; // L: 8315 + } + } + + } // L: 8318 + + @ObfuscatedName("jr") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "-1222597684" + ) + @Export("drawScrollBar") + static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { + class127.scrollBarSprites[0].drawAt(var0, var1); // L: 10863 + class127.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 10864 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field555); // L: 10865 + int var5 = var3 * (var3 - 32) / var4; // L: 10866 + if (var5 < 8) { // L: 10867 + var5 = 8; + } + + int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 10868 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field556); // L: 10869 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field483); // L: 10870 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field483); // L: 10871 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field483); // L: 10872 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field483); // L: 10873 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field640); // L: 10874 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field640); // L: 10875 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field640); // L: 10876 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field640); // L: 10877 + } // L: 10878 } diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index 319df6dbae..a9642735c1 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -8,111 +8,106 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("e") +@ObfuscatedName("z") @Implements("KeyHandler") public final class KeyHandler implements KeyListener, FocusListener { - @ObfuscatedName("sz") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lay;" - ) - @Export("pcmPlayer0") - static PcmPlayer pcmPlayer0; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Le;" + descriptor = "Lz;" ) @Export("KeyHandler_instance") public static KeyHandler KeyHandler_instance; - @ObfuscatedName("cp") + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lki;" + ) + @Export("scriptActiveWidget") + static Widget scriptActiveWidget; + @ObfuscatedName("cn") @Export("KeyHandler_pressedKeys") public static boolean[] KeyHandler_pressedKeys; - @ObfuscatedName("co") - public static boolean[] field140; - @ObfuscatedName("ca") - public static boolean[] field131; - @ObfuscatedName("cr") - public static int[] field145; + @ObfuscatedName("cc") + public static boolean[] field120; + @ObfuscatedName("cy") + public static boolean[] field132; + @ObfuscatedName("cw") + public static int[] field133; + @ObfuscatedName("cf") + @ObfuscatedGetter( + intValue = 389412323 + ) + public static int field150; @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = 818092329 + intValue = -1808601055 ) - public static int field133; - @ObfuscatedName("cn") - @ObfuscatedGetter( - intValue = -119285303 - ) - public static int field128; - @ObfuscatedName("cu") - static char[] field135; + public static int field135; @ObfuscatedName("cg") - static int[] field136; - @ObfuscatedName("cj") - public static int[] field143; + static char[] field136; + @ObfuscatedName("cl") + static int[] field122; + @ObfuscatedName("cu") + public static int[] field138; + @ObfuscatedName("ch") + @ObfuscatedGetter( + intValue = 897973963 + ) + public static int field139; + @ObfuscatedName("cz") + public static int[] field140; @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = -1041441839 + intValue = -1147676417 ) - public static int field118; - @ObfuscatedName("cl") - public static int[] field139; - @ObfuscatedName("ck") + public static int field134; + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = -1817748749 - ) - public static int field132; - @ObfuscatedName("cd") - @ObfuscatedGetter( - intValue = -2054154743 - ) - public static int field141; - @ObfuscatedName("cw") - @ObfuscatedGetter( - intValue = 295038649 + intValue = 1995078643 ) public static int field142; - @ObfuscatedName("cx") + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = -1399162193 + intValue = -1414175135 ) - public static int field138; - @ObfuscatedName("dr") + public static int field143; + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = -1784108457 + intValue = 1395793263 + ) + public static int field144; + @ObfuscatedName("dc") + @ObfuscatedGetter( + intValue = -2030198205 ) @Export("KeyHandler_idleCycles") public static volatile int KeyHandler_idleCycles; - @ObfuscatedName("dj") + @ObfuscatedName("dp") @Export("KeyHandler_keyCodes") static int[] KeyHandler_keyCodes; - @ObfuscatedName("es") + @ObfuscatedName("mn") @ObfuscatedGetter( - longValue = 4474634211423163711L + intValue = -1725658923 ) - static long field149; - @ObfuscatedName("el") - @ObfuscatedSignature( - descriptor = "Llx;" - ) - @Export("archive0") - static Archive archive0; + @Export("menuWidth") + static int menuWidth; static { KeyHandler_instance = new KeyHandler(); // L: 14 KeyHandler_pressedKeys = new boolean[112]; // L: 101 - field140 = new boolean[112]; // L: 102 - field131 = new boolean[112]; // L: 103 - field145 = new int[128]; // L: 106 - field133 = 0; // L: 107 - field128 = 0; // L: 108 - field135 = new char[128]; // L: 109 - field136 = new int[128]; // L: 110 - field143 = new int[128]; // L: 111 - field118 = 0; // L: 112 - field139 = new int[128]; // L: 113 - field132 = 0; // L: 114 - field141 = 0; // L: 115 - field142 = 0; // L: 116 - field138 = 0; // L: 117 + field120 = new boolean[112]; // L: 102 + field132 = new boolean[112]; // L: 103 + field133 = new int[128]; // L: 106 + field150 = 0; // L: 107 + field135 = 0; // L: 108 + field136 = new char[128]; // L: 109 + field122 = new int[128]; // L: 110 + field138 = new int[128]; // L: 111 + field139 = 0; // L: 112 + field140 = new int[128]; // L: 113 + field134 = 0; // L: 114 + field142 = 0; // L: 115 + field143 = 0; // L: 116 + field144 = 0; // L: 117 KeyHandler_idleCycles = 0; // L: 118 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: 119 } @@ -121,205 +116,261 @@ public final class KeyHandler implements KeyListener, FocusListener { } // L: 121 public final void keyTyped(KeyEvent var1) { - if (KeyHandler_instance != null) { // L: 221 - char var2 = var1.getKeyChar(); // L: 222 - if (var2 != 0 && var2 != '\uffff' && class134.method2905(var2)) { // L: 223 - int var3 = field142 + 1 & 127; // L: 224 - if (var3 != field141) { // L: 225 - field136[field142] = -1; // L: 226 - field135[field142] = var2; // L: 227 - field142 = var3; // L: 228 + if (KeyHandler_instance != null) { // L: 188 + char var2 = var1.getKeyChar(); // L: 189 + if (var2 != 0 && var2 != '\uffff') { // L: 190 + boolean var3; + if (var2 > 0 && var2 < 128 || var2 >= 160 && var2 <= 255) { // L: 193 + var3 = true; // L: 194 + } else { + label58: { + if (var2 != 0) { // L: 197 + char[] var4 = class341.cp1252AsciiExtension; // L: 199 + + for (int var5 = 0; var5 < var4.length; ++var5) { // L: 200 + char var6 = var4[var5]; // L: 201 + if (var6 == var2) { // L: 203 + var3 = true; // L: 204 + break label58; + } + } + } + + var3 = false; // L: 211 + } + } + + if (var3) { // L: 213 + int var7 = field143 + 1 & 127; // L: 214 + if (var7 != field142) { // L: 215 + field122[field143] = -1; // L: 216 + field136[field143] = var2; // L: 217 + field143 = var7; // L: 218 + } } } } - var1.consume(); // L: 232 - } // L: 233 - - public final synchronized void keyReleased(KeyEvent var1) { - if (KeyHandler_instance != null) { // L: 207 - int var2 = var1.getKeyCode(); // L: 208 - if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 209 - var2 = KeyHandler_keyCodes[var2] & -129; - } else { - var2 = -1; // L: 210 - } - - if (field128 >= 0 && var2 >= 0) { // L: 211 - field145[field128] = ~var2; // L: 212 - field128 = field128 + 1 & 127; // L: 213 - if (field133 == field128) { // L: 214 - field128 = -1; - } - } - } - - var1.consume(); // L: 217 - } // L: 218 + var1.consume(); + } public final void focusGained(FocusEvent var1) { - } // L: 266 + } // L: 257 + + public final synchronized void focusLost(FocusEvent var1) { + if (KeyHandler_instance != null) { // L: 260 + field135 = -1; // L: 261 + } + + } // L: 263 public final synchronized void keyPressed(KeyEvent var1) { - if (KeyHandler_instance != null) { // L: 179 - int var2 = var1.getKeyCode(); // L: 180 - if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 181 - var2 = KeyHandler_keyCodes[var2]; // L: 182 - if ((var2 & 128) != 0) { // L: 183 + if (KeyHandler_instance != null) { // L: 146 + int var2 = var1.getKeyCode(); // L: 147 + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 148 + var2 = KeyHandler_keyCodes[var2]; // L: 149 + if ((var2 & 128) != 0) { // L: 150 var2 = -1; } } else { - var2 = -1; // L: 185 + var2 = -1; // L: 152 } - if (field128 >= 0 && var2 >= 0) { // L: 186 - field145[field128] = var2; // L: 187 - field128 = field128 + 1 & 127; // L: 188 - if (field128 == field133) { // L: 189 - field128 = -1; + if (field135 >= 0 && var2 >= 0) { // L: 153 + field133[field135] = var2; // L: 154 + field135 = field135 + 1 & 127; // L: 155 + if (field135 == field150) { // L: 156 + field135 = -1; } } int var3; - if (var2 >= 0) { // L: 191 - var3 = field142 + 1 & 127; // L: 192 - if (var3 != field141) { // L: 193 - field136[field142] = var2; // L: 194 - field135[field142] = 0; // L: 195 - field142 = var3; // L: 196 + if (var2 >= 0) { // L: 158 + var3 = field143 + 1 & 127; // L: 159 + if (var3 != field142) { // L: 160 + field122[field143] = var2; // L: 161 + field136[field143] = 0; // L: 162 + field143 = var3; // L: 163 } } - var3 = var1.getModifiers(); // L: 199 - if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 200 - var1.consume(); // L: 201 + var3 = var1.getModifiers(); // L: 166 + if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 167 + var1.consume(); // L: 168 } } - } // L: 204 + } // L: 171 - public final synchronized void focusLost(FocusEvent var1) { - if (KeyHandler_instance != null) { // L: 269 - field128 = -1; // L: 270 - } - - } // L: 272 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IB)Lft;", - garbageValue = "1" - ) - @Export("getNpcDefinition") - public static NPCComposition getNpcDefinition(int var0) { - NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); // L: 62 - if (var1 != null) { // L: 63 - return var1; - } else { - byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); // L: 64 - var1 = new NPCComposition(); // L: 65 - var1.id = var0; // L: 66 - if (var2 != null) { // L: 67 - var1.decode(new Buffer(var2)); + public final synchronized void keyReleased(KeyEvent var1) { + if (KeyHandler_instance != null) { // L: 174 + int var2 = var1.getKeyCode(); // L: 175 + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 176 + var2 = KeyHandler_keyCodes[var2] & -129; + } else { + var2 = -1; // L: 177 } - var1.postDecode(); // L: 68 - NPCComposition.NpcDefinition_cached.put(var1, (long)var0); // L: 69 - return var1; // L: 70 - } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IB)Lkl;", - garbageValue = "-105" - ) - public static GameBuild method332(int var0) { - GameBuild[] var1 = class155.method3185(); // 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 + if (field135 >= 0 && var2 >= 0) { // L: 178 + field133[field135] = ~var2; // L: 179 + field135 = field135 + 1 & 127; // L: 180 + if (field150 == field135) { // L: 181 + field135 = -1; + } } } - return null; // L: 31 - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-471060529" - ) - static final void method337(int var0, int var1, int var2) { - int var3; - for (var3 = 0; var3 < 8; ++var3) { // L: 154 - for (int var4 = 0; var4 < 8; ++var4) { // L: 155 - Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; - } - } - - if (var1 > 0) { // L: 157 - for (var3 = 1; var3 < 8; ++var3) { // L: 158 - Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; - } - } - - if (var2 > 0) { - for (var3 = 1; var3 < 8; ++var3) { - Tiles.Tiles_heights[var0][var3 + var1][var2] = Tiles.Tiles_heights[var0][var3 + var1][var2 - 1]; - } - } - - if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { // L: 163 - 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: 164 - 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: 165 - Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; - } - - } // L: 166 + var1.consume(); // L: 184 + } // L: 185 @ObfuscatedName("l") - static final void method350(long var0) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; // L: 80 - } // L: 81 + @ObfuscatedSignature( + descriptor = "(ILbb;ZB)I", + garbageValue = "-1" + ) + static int method329(int var0, Script var1, boolean var2) { + if (var0 < 1000) { // L: 427 + return SoundSystem.method777(var0, var1, var2); + } else if (var0 < 1100) { // L: 428 + return GrandExchangeOfferNameComparator.method5782(var0, var1, var2); + } else if (var0 < 1200) { // L: 429 + return WorldMapAreaData.method4887(var0, var1, var2); + } else if (var0 < 1300) { // L: 430 + return Interpreter.method1793(var0, var1, var2); + } else if (var0 < 1400) { // L: 431 + return Calendar.method5349(var0, var1, var2); + } else if (var0 < 1500) { // L: 432 + return Player.method2157(var0, var1, var2); + } else if (var0 < 1600) { // L: 433 + return FriendsList.method6454(var0, var1, var2); + } else if (var0 < 1700) { // L: 434 + return class138.method2880(var0, var1, var2); + } else if (var0 < 1800) { // L: 435 + return class270.method5036(var0, var1, var2); + } else if (var0 < 1900) { // L: 436 + return ArchiveLoader.method2041(var0, var1, var2); + } else if (var0 < 2000) { // L: 437 + return FaceNormal.method4212(var0, var1, var2); + } else if (var0 < 2100) { // L: 438 + return GrandExchangeOfferNameComparator.method5782(var0, var1, var2); + } else if (var0 < 2200) { // L: 439 + return WorldMapAreaData.method4887(var0, var1, var2); + } else if (var0 < 2300) { // L: 440 + return Interpreter.method1793(var0, var1, var2); + } else if (var0 < 2400) { // L: 441 + return Calendar.method5349(var0, var1, var2); + } else if (var0 < 2500) { + return Player.method2157(var0, var1, var2); // L: 442 + } else if (var0 < 2600) { // L: 443 + return Tile.method3903(var0, var1, var2); + } else if (var0 < 2700) { // L: 444 + return WorldMapDecoration.method4804(var0, var1, var2); + } else if (var0 < 2800) { // L: 445 + return VerticalAlignment.method3447(var0, var1, var2); + } else if (var0 < 2900) { // L: 446 + return class282.method5334(var0, var1, var2); + } else if (var0 < 3000) { // L: 447 + return FaceNormal.method4212(var0, var1, var2); + } else if (var0 < 3200) { // L: 448 + return DynamicObject.method1963(var0, var1, var2); + } else if (var0 < 3300) { // L: 449 + return class137.method2873(var0, var1, var2); + } else if (var0 < 3400) { // L: 450 + return class155.method3124(var0, var1, var2); + } else if (var0 < 3500) { // L: 451 + return class309.method5600(var0, var1, var2); + } else if (var0 < 3600) { // L: 452 + return ArchiveLoader.method2045(var0, var1, var2); + } else if (var0 < 3700) { // L: 453 + return class305.method5591(var0, var1, var2); + } else if (var0 < 3800) { // L: 454 + return class182.method3473(var0, var1, var2); + } else if (var0 < 3900) { // L: 455 + return Language.method5884(var0, var1, var2); + } else if (var0 < 4000) { // L: 456 + return Tiles.method2030(var0, var1, var2); + } else if (var0 < 4100) { // L: 457 + return class302.method5584(var0, var1, var2); + } else if (var0 < 4200) { + return class267.method5027(var0, var1, var2); // L: 458 + } else if (var0 < 4300) { // L: 459 + return GrandExchangeOfferOwnWorldComparator.method1120(var0, var1, var2); + } else if (var0 < 5100) { // L: 460 + return FontName.method7231(var0, var1, var2); + } else if (var0 < 5400) { // L: 461 + return VertexNormal.method4377(var0, var1, var2); + } else if (var0 < 5600) { // L: 462 + return Archive.method5623(var0, var1, var2); + } else if (var0 < 5700) { // L: 463 + return class290.method5389(var0, var1, var2); + } else if (var0 < 6300) { // L: 464 + return Client.method1240(var0, var1, var2); + } else if (var0 < 6600) { // L: 465 + return class33.method592(var0, var1, var2); + } else if (var0 < 6700) { // L: 466 + return class326.method5868(var0, var1, var2); + } else if (var0 < 6800) { // L: 467 + return class6.method47(var0, var1, var2); + } else if (var0 < 6900) { // L: 468 + return DevicePcmPlayerProvider.method335(var0, var1, var2); + } else if (var0 < 7000) { // L: 469 + return ReflectionCheck.method598(var0, var1, var2); + } else if (var0 < 7100) { // L: 470 + return TextureProvider.method4246(var0, var1, var2); + } else if (var0 < 7200) { // L: 471 + return Tile.method3902(var0, var1, var2); + } else if (var0 < 7300) { // L: 472 + return class182.method3472(var0, var1, var2); + } else { + return var0 < 7500 ? MusicPatch.method5277(var0, var1, var2) : 2; // L: 473 474 + } + } @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1206801353" + descriptor = "(Lbx;Lbx;IZI)I", + garbageValue = "-380169429" ) - static final void method348(String var0) { - class149.method3138("Please remove " + var0 + " from your friend list first"); // L: 160 - } // L: 161 - - @ObfuscatedName("ft") - @ObfuscatedSignature( - descriptor = "(Lgw;IIIB)V", - garbageValue = "85" - ) - static void method336(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && class131.clientPreferences.method2270() != 0) { // L: 3575 - if (var0.field2144 != null && var0.field2144.containsKey(var1)) { // L: 3576 - int var4 = (Integer)var0.field2144.get(var1); // L: 3577 - if (var4 != 0) { // L: 3581 - int var7 = var4 >> 8; // L: 3582 - int var8 = var4 >> 4 & 7; // L: 3583 - int var9 = var4 & 15; // L: 3584 - Client.soundEffectIds[Client.soundEffectCount] = var7; // L: 3585 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; // L: 3586 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3587 - Client.soundEffects[Client.soundEffectCount] = null; // L: 3588 - int var10 = (var2 - 64) / 128; // L: 3589 - int var11 = (var3 - 64) / 128; // L: 3590 - Client.soundLocations[Client.soundEffectCount] = var9 + (var11 << 8) + (var10 << 16); // L: 3591 - ++Client.soundEffectCount; // L: 3592 + @Export("compareWorlds") + static int compareWorlds(World var0, World var1, int var2, boolean var3) { + if (var2 == 1) { // L: 221 + int var4 = var0.population; // L: 222 + int var5 = var1.population; // L: 223 + if (!var3) { // L: 224 + if (var4 == -1) { // L: 225 + var4 = 2001; } + if (var5 == -1) { // L: 226 + var5 = 2001; + } } + + return var4 - var5; // L: 228 + } else if (var2 == 2) { // L: 230 + return var0.location - var1.location; + } else if (var2 == 3) { // L: 231 + if (var0.activity.equals("-")) { // L: 232 + if (var1.activity.equals("-")) { // L: 233 + return 0; + } else { + return var3 ? -1 : 1; // L: 234 + } + } else if (var1.activity.equals("-")) { // L: 236 + return var3 ? 1 : -1; + } else { + return var0.activity.compareTo(var1.activity); // L: 237 + } + } else if (var2 == 4) { // L: 239 + return var0.method1644() ? (var1.method1644() ? 0 : 1) : (var1.method1644() ? -1 : 0); + } else if (var2 == 5) { // L: 240 + return var0.method1615() ? (var1.method1615() ? 0 : 1) : (var1.method1615() ? -1 : 0); + } else if (var2 == 6) { // L: 241 + return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); + } else if (var2 == 7) { // L: 242 + return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); + } else { + return var0.id - var1.id; // L: 243 } - } // L: 3594 + } } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 0ada5cfc68..ae11b5fcd4 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -1,61 +1,43 @@ -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fq") +@ObfuscatedName("fb") @Implements("KitDefinition") public class KitDefinition extends DualNode { - @ObfuscatedName("v") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lln;" - ) - @Export("KitDefinition_archive") - public static AbstractArchive KitDefinition_archive; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1767972963 - ) - @Export("KitDefinition_fileCount") - public static int KitDefinition_fileCount; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("KitDefinition_cached") static EvictingDualNodeHashTable KitDefinition_cached; - @ObfuscatedName("hm") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1856258713 - ) - static int field1855; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1991201937 + intValue = -1308166265 ) @Export("bodypartID") public int bodypartID; - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("models2") int[] models2; - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("models") int[] models; - @ObfuscatedName("p") + @ObfuscatedName("c") @Export("nonSelectable") public boolean nonSelectable; @@ -69,216 +51,178 @@ public class KitDefinition extends DualNode { this.nonSelectable = false; // L: 22 } // L: 24 - @ObfuscatedName("c") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-322514028" + descriptor = "(Lpx;B)V", + garbageValue = "-26" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 38 - if (var2 == 0) { // L: 39 - return; // L: 42 + int var2 = var1.readUnsignedByte(); // L: 44 + if (var2 == 0) { // L: 45 + return; // L: 48 } - this.decodeNext(var1, var2); // L: 40 + this.decodeNext(var1, var2); // L: 46 } } - @ObfuscatedName("i") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lpi;IB)V", - garbageValue = "14" + descriptor = "(Lpx;IB)V", + garbageValue = "16" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 45 + if (var2 == 1) { // L: 51 this.bodypartID = var1.readUnsignedByte(); } else { int var3; int var4; - if (var2 == 2) { // L: 46 - var3 = var1.readUnsignedByte(); // L: 47 - this.models2 = new int[var3]; // L: 48 + if (var2 == 2) { // L: 52 + var3 = var1.readUnsignedByte(); // L: 53 + this.models2 = new int[var3]; // L: 54 - for (var4 = 0; var4 < var3; ++var4) { // L: 49 + for (var4 = 0; var4 < var3; ++var4) { // L: 55 this.models2[var4] = var1.readUnsignedShort(); } - } else if (var2 == 3) { // L: 51 + } else if (var2 == 3) { // L: 57 this.nonSelectable = true; - } else if (var2 == 40) { // L: 52 - var3 = var1.readUnsignedByte(); // L: 53 - this.recolorFrom = new short[var3]; // L: 54 - this.recolorTo = new short[var3]; // L: 55 + } else if (var2 == 40) { // L: 58 + var3 = var1.readUnsignedByte(); // L: 59 + this.recolorFrom = new short[var3]; // L: 60 + this.recolorTo = new short[var3]; // L: 61 - for (var4 = 0; var4 < var3; ++var4) { // L: 56 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); - this.recolorTo[var4] = (short)var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { // L: 62 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 63 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 64 } - } else if (var2 == 41) { // L: 61 - var3 = var1.readUnsignedByte(); // L: 62 - this.retextureFrom = new short[var3]; // L: 63 - this.retextureTo = new short[var3]; // L: 64 + } 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 - for (var4 = 0; var4 < var3; ++var4) { // L: 65 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 66 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 67 + for (var4 = 0; var4 < var3; ++var4) { // L: 71 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 72 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 73 } - } else if (var2 >= 60 && var2 < 70) { // L: 70 + } else if (var2 >= 60 && var2 < 70) { // L: 76 this.models[var2 - 60] = var1.readUnsignedShort(); } } - } // L: 72 + } // L: 78 - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "579619376" + garbageValue = "-312148005" ) @Export("ready") public boolean ready() { - if (this.models2 == null) { // L: 75 + if (this.models2 == null) { // L: 81 return true; } else { - boolean var1 = true; // L: 76 + boolean var1 = true; // L: 82 - for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 77 - if (!class147.KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) { + for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 83 + if (!class361.KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) { var1 = false; } } - return var1; // L: 78 + return var1; // L: 84 } } - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)Lhc;", - garbageValue = "-1349429336" + descriptor = "(I)Lgs;", + garbageValue = "121889507" ) @Export("getModelData") public ModelData getModelData() { - if (this.models2 == null) { // L: 82 + if (this.models2 == null) { // L: 88 return null; } else { - ModelData[] var1 = new ModelData[this.models2.length]; // L: 83 + ModelData[] var1 = new ModelData[this.models2.length]; // L: 89 - for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 84 - var1[var2] = ModelData.ModelData_get(class147.KitDefinition_modelsArchive, this.models2[var2], 0); + for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 90 + var1[var2] = ModelData.ModelData_get(class361.KitDefinition_modelsArchive, this.models2[var2], 0); } ModelData var4; - if (var1.length == 1) { // L: 86 + if (var1.length == 1) { // L: 92 var4 = var1[0]; } else { - var4 = new ModelData(var1, var1.length); // L: 87 + var4 = new ModelData(var1, var1.length); // L: 93 } int var3; - if (this.recolorFrom != null) { // L: 88 - for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 89 - var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 90 + if (this.recolorFrom != null) { // L: 94 + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 95 + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 96 } } - if (this.retextureFrom != null) { // L: 93 - for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 94 - var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 95 + if (this.retextureFrom != null) { // L: 99 + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 100 + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 101 } } - return var4; // L: 98 + return var4; // L: 104 } } - @ObfuscatedName("n") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "293914398" + descriptor = "(B)Z", + garbageValue = "-92" ) - public boolean method3447() { - boolean var1 = true; // L: 102 + public boolean method3335() { + boolean var1 = true; // L: 108 - for (int var2 = 0; var2 < 5; ++var2) { // L: 103 - if (this.models[var2] != -1 && !class147.KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { // L: 104 + for (int var2 = 0; var2 < 5; ++var2) { // L: 109 + if (this.models[var2] != -1 && !class361.KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { // L: 110 var1 = false; } } - return var1; // L: 106 + return var1; // L: 112 } @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(S)Lhc;", - garbageValue = "1402" + descriptor = "(I)Lgs;", + garbageValue = "-674666284" ) @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { - ModelData[] var1 = new ModelData[5]; // L: 110 - int var2 = 0; // L: 111 + ModelData[] var1 = new ModelData[5]; // L: 116 + int var2 = 0; // L: 117 - for (int var3 = 0; var3 < 5; ++var3) { // L: 112 - if (this.models[var3] != -1) { // L: 113 - var1[var2++] = ModelData.ModelData_get(class147.KitDefinition_modelsArchive, this.models[var3], 0); + for (int var3 = 0; var3 < 5; ++var3) { // L: 118 + if (this.models[var3] != -1) { // L: 119 + var1[var2++] = ModelData.ModelData_get(class361.KitDefinition_modelsArchive, this.models[var3], 0); } } - ModelData var5 = new ModelData(var1, var2); // L: 115 + ModelData var5 = new ModelData(var1, var2); // L: 121 int var4; - if (this.recolorFrom != null) { // L: 116 - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 117 - var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 118 + if (this.recolorFrom != null) { // L: 122 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 123 + var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 124 } } - if (this.retextureFrom != null) { // L: 121 - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 122 - var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 123 + if (this.retextureFrom != null) { // L: 127 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 128 + var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 129 } } - return var5; // L: 126 + return var5; // L: 132 } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Lln;Lln;I)V", - garbageValue = "-1509322924" - ) - public static void method3452(AbstractArchive var0, AbstractArchive var1) { - NPCComposition.NpcDefinition_archive = var0; // L: 57 - NPCComposition.NpcDefinition_modelArchive = var1; // L: 58 - } // L: 59 - - @ObfuscatedName("kq") - static final void method3453(double var0) { - Rasterizer3D.Rasterizer3D_setBrightness(var0); // L: 11999 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); // L: 12000 - ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 12002 - class131.clientPreferences.method2239(var0); // L: 12004 - } // L: 12005 - - @ObfuscatedName("lx") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2073437950" - ) - @Export("FriendSystem_invalidateIgnoreds") - static final void FriendSystem_invalidateIgnoreds() { - Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 12355 - - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); // L: 12356 - var1.clearIsFromIgnored(); // L: 12358 - } - - if (ClientPacket.friendsChat != null) { // L: 12362 - ClientPacket.friendsChat.invalidateIgnoreds(); // L: 12363 - } - - } // L: 12365 } diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index e1e9acd357..1cd921dc44 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -6,389 +6,674 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("lo") +@ObfuscatedName("lq") @Implements("Language") public class Language implements MouseWheel { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "Llq;" ) @Export("Language_EN") public static final Language Language_EN; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "Llq;" ) @Export("Language_DE") static final Language Language_DE; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "Llq;" ) @Export("Language_FR") public static final Language Language_FR; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "Llq;" ) @Export("Language_PT") static final Language Language_PT; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "Llq;" ) @Export("Language_NL") static final Language Language_NL; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "Llq;" ) @Export("Language_ES") public static final Language Language_ES; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "Llq;" ) @Export("Language_ES_MX") static final Language Language_ES_MX; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "[Llo;" + descriptor = "[Llq;" ) @Export("Language_valuesOrdered") - static final Language[] Language_valuesOrdered; - @ObfuscatedName("ey") - @ObfuscatedSignature( - descriptor = "Lnc;" - ) - @Export("spriteIds") - static GraphicsDefaults spriteIds; - @ObfuscatedName("l") - final String field4047; - @ObfuscatedName("q") + public static final Language[] Language_valuesOrdered; + @ObfuscatedName("s") + final String field4120; + @ObfuscatedName("r") @Export("language") final String language; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1865036015 + intValue = 1541903629 ) @Export("id") final int id; static { - Language_EN = new Language("EN", "en", "English", ModeWhere.field4069, 0, "GB"); // L: 10 - Language_DE = new Language("DE", "de", "German", ModeWhere.field4069, 1, "DE"); // L: 11 - Language_FR = new Language("FR", "fr", "French", ModeWhere.field4069, 2, "FR"); // L: 12 - Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field4069, 3, "BR"); // L: 13 - Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field4065, 4, "NL"); // L: 14 - Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field4065, 5, "ES"); // L: 15 - Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field4069, 6, "MX"); // L: 16 - Language[] var0 = new Language[]{Language_ES_MX, Language_FR, Language_ES, Language_NL, Language_EN, Language_PT, Language_DE}; // L: 25 - Language_valuesOrdered = new Language[var0.length]; // L: 28 - Language[] var2 = var0; // L: 30 + Language_EN = new Language("EN", "en", "English", ModeWhere.field4125, 0, "GB"); // L: 12 + Language_DE = new Language("DE", "de", "German", ModeWhere.field4125, 1, "DE"); // L: 13 + Language_FR = new Language("FR", "fr", "French", ModeWhere.field4125, 2, "FR"); // L: 14 + Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field4125, 3, "BR"); // L: 15 + Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field4130, 4, "NL"); // L: 16 + Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field4130, 5, "ES"); // L: 17 + Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field4125, 6, "MX"); // L: 18 + Language[] var0 = new Language[]{Language_FR, Language_NL, Language_DE, Language_ES, Language_ES_MX, Language_EN, Language_PT}; // L: 27 + Language_valuesOrdered = new Language[var0.length]; // L: 30 + Language[] var2 = var0; // L: 32 - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 31 - Language var4 = var2[var3]; // L: 32 - if (Language_valuesOrdered[var4.id] != null) { // L: 34 - throw new IllegalStateException(); // L: 35 + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 33 + Language var4 = var2[var3]; // L: 34 + if (Language_valuesOrdered[var4.id] != null) { // L: 36 + throw new IllegalStateException(); // L: 37 } - Language_valuesOrdered[var4.id] = var4; // L: 37 + Language_valuesOrdered[var4.id] = var4; // L: 39 } - } // L: 41 + } // L: 43 @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Llv;ILjava/lang/String;)V" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Llz;ILjava/lang/String;)V" ) Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) { - this.field4047 = var1; - this.language = var2; - this.id = var5; - if (var6 != null) { - new Locale(var2.substring(0, 2), var6); + this.field4120 = var1; // L: 46 + this.language = var2; // L: 47 + this.id = var5; // L: 48 + if (var6 != null) { // L: 49 + new Locale(var2.substring(0, 2), var6); // L: 50 } else { - new Locale(var2.substring(0, 2)); + new Locale(var2.substring(0, 2)); // L: 53 } - } + } // L: 55 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 60 + return this.id; // L: 63 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1969590033" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-75" ) @Export("getLanguage") String getLanguage() { - return this.language; // L: 56 + return this.language; // L: 58 } public String toString() { - return this.getLanguage().toLowerCase(Locale.ENGLISH); // L: 69 + return this.getLanguage().toLowerCase(Locale.ENGLISH); // L: 68 } - @ObfuscatedName("v") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Llx;IIIBZI)V", - garbageValue = "-1446748586" + descriptor = "(CI)C", + garbageValue = "-380169429" ) - @Export("requestNetFile") - static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { - long var6 = (long)((var1 << 16) + var2); // L: 42 - NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 43 - if (var8 == null) { // L: 44 - var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 45 - if (var8 == null) { // L: 46 - var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 47 - if (var8 != null) { // L: 48 - if (var5) { // L: 49 - var8.removeDual(); // L: 50 - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 51 - --NetCache.NetCache_pendingWritesCount; // L: 52 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 53 - } - - } else { - if (!var5) { // L: 57 - var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 58 - if (var8 != null) { // L: 59 - return; - } - } - - var8 = new NetFileRequest(); // L: 61 - var8.archive = var0; // L: 62 - var8.crc = var3; // L: 63 - var8.padding = var4; - if (var5) { - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 66 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 67 - } else { - NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 70 - NetCache.NetCache_pendingWrites.put(var8, var6); // L: 71 - ++NetCache.NetCache_pendingWritesCount; // L: 72 - } - - } - } + static char method5877(char var0) { + switch(var0) { // L: 103 + case ' ': + case '-': + case '_': + case ' ': + return '_'; // L: 163 + case '#': + case '[': + case ']': + return var0; // L: 135 + case 'À': + case 'Á': + case 'Â': + case 'Ã': + case 'Ä': + case 'à': + case 'á': + case 'â': + case 'ã': + case 'ä': + return 'a'; // L: 128 + case 'Ç': + case 'ç': + return 'c'; // L: 117 + case 'È': + case 'É': + case 'Ê': + case 'Ë': + case 'è': + case 'é': + case 'ê': + case 'ë': + return 'e'; // L: 144 + case 'Í': + case 'Î': + case 'Ï': + case 'í': + case 'î': + case 'ï': + return 'i'; // L: 172 + case 'Ñ': + case 'ñ': + return 'n'; // L: 131 + case 'Ò': + case 'Ó': + case 'Ô': + case 'Õ': + case 'Ö': + case 'ò': + case 'ó': + case 'ô': + case 'õ': + case 'ö': + return 'o'; // L: 114 + case 'Ù': + case 'Ú': + case 'Û': + case 'Ü': + case 'ù': + case 'ú': + case 'û': + case 'ü': + return 'u'; // L: 153 + case 'ß': + return 'b'; // L: 155 + case 'ÿ': + case 'Ÿ': + return 'y'; // L: 158 + default: + return Character.toLowerCase(var0); // L: 165 } - } // L: 55 74 + } @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IB)Llo;", - garbageValue = "-24" + descriptor = "(Lmx;Lmx;I)V", + garbageValue = "412458899" ) - public static Language method6077(int var0) { - return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; // L: 64 65 - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "532413421" - ) - static int method6079(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { // L: 1031 - var0 -= 1000; // L: 1032 - var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1033 - } else { - var3 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1035 + static void method5885(Font var0, Font var1) { + if (GameEngine.worldSelectBackSprites == null) { // L: 1661 + GameEngine.worldSelectBackSprites = Frames.method4218(class305.archive8, "sl_back", ""); } - String var4 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 1036 - int[] var5 = null; // L: 1037 - if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 1038 - int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1039 - if (var6 > 0) { // L: 1040 - for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]) { // L: 1041 1042 - } - } - - var4 = var4.substring(0, var4.length() - 1); // L: 1044 + IndexedSprite[] var2; + Archive var3; + int var4; + int var5; + if (class260.worldSelectFlagSprites == null) { // L: 1662 + var3 = class305.archive8; // L: 1664 + var4 = var3.getGroupId("sl_flags"); // L: 1666 + var5 = var3.getFileId(var4, ""); // L: 1667 + var2 = ItemContainer.method2062(var3, var4, var5); // L: 1668 + class260.worldSelectFlagSprites = var2; // L: 1670 } - Object[] var8 = new Object[var4.length() + 1]; // L: 1046 + if (class114.worldSelectArrows == null) { // L: 1672 + var3 = class305.archive8; // L: 1674 + var4 = var3.getGroupId("sl_arrows"); // L: 1676 + var5 = var3.getFileId(var4, ""); // L: 1677 + var2 = ItemContainer.method2062(var3, var4, var5); // L: 1678 + class114.worldSelectArrows = var2; // L: 1680 + } - int var7; - for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 1047 - if (var4.charAt(var7 - 1) == 's') { // L: 1048 - var8[var7] = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; + if (class267.worldSelectStars == null) { // L: 1682 + var3 = class305.archive8; // L: 1684 + var4 = var3.getGroupId("sl_stars"); // L: 1686 + var5 = var3.getFileId(var4, ""); // L: 1687 + var2 = ItemContainer.method2062(var3, var4, var5); // L: 1688 + class267.worldSelectStars = var2; // L: 1690 + } + + if (class126.worldSelectLeftSprite == null) { // L: 1692 + class126.worldSelectLeftSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(class305.archive8, "leftarrow", ""); + } + + if (class424.worldSelectRightSprite == null) { // L: 1693 + class424.worldSelectRightSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(class305.archive8, "rightarrow", ""); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 1694 + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 1695 + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 1696 + var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 1697 + if (class267.worldSelectStars != null) { // L: 1698 + class267.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 1699 + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 1700 + class267.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 1701 + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 1702 + } + + if (class114.worldSelectArrows != null) { // L: 1704 + int var22 = Login.xPadding + 280; // L: 1705 + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 1706 + class114.worldSelectArrows[2].drawAt(var22, 4); } else { - var8[var7] = new Integer(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1049 - } - } - - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1051 - if (var7 != -1) { // L: 1052 - var8[0] = new Integer(var7); - } else { - var8 = null; // L: 1053 - } - - if (var0 == ScriptOpcodes.CC_SETONCLICK) { - var3.onClick = var8; // L: 1054 - } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 1055 - var3.onHold = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 1056 - var3.onRelease = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 1057 - var3.onMouseOver = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 1058 - var3.onMouseLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 1059 - var3.onDrag = var8; - } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 1060 - var3.onTargetLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 1061 - var3.onVarTransmit = var8; // L: 1062 - var3.varTransmitTriggers = var5; // L: 1063 - } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 1065 - var3.onTimer = var8; - } else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 1066 - var3.onOp = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 1067 - var3.onDragComplete = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 1068 - var3.onClickRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 1069 - var3.onMouseRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 1070 - var3.onInvTransmit = var8; // L: 1071 - var3.invTransmitTriggers = var5; // L: 1072 - } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 1074 - var3.onStatTransmit = var8; // L: 1075 - var3.statTransmitTriggers = var5; // L: 1076 - } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { // L: 1078 - var3.onTargetEnter = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 1079 - var3.onScroll = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 1080 - var3.onChatTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 1081 - var3.onKey = var8; - } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 1082 - var3.onFriendTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 1083 - var3.onClanTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 1084 - var3.onMiscTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 1085 - var3.onDialogAbort = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1086 - var3.onSubChange = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1087 - var3.onStockTransmit = var8; - } else if (var0 == 1426) { // L: 1088 - var3.field3432 = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { // L: 1089 - var3.onResize = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANSETTINGSTRANSMIT) { // L: 1090 - var3.field3454 = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANCHANNELTRANSMIT) { // L: 1091 - var3.field3455 = var8; - } else if (var0 == 1430) { // L: 1092 - var3.field3416 = var8; - } else if (var0 == 1431) { // L: 1093 - var3.field3451 = var8; - } else { - if (var0 != 1434) { // L: 1094 - return 2; // L: 1095 + class114.worldSelectArrows[0].drawAt(var22, 4); // L: 1707 } - var3.field3462 = var8; - } - - var3.hasListener = true; // L: 1096 - return 1; // L: 1097 - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-866525828" - ) - static int method6091(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3789 - Interpreter.Interpreter_intStackSize -= 2; // L: 3790 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3791 - int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3792 - if (!Client.isCameraLocked) { // L: 3793 - Client.camAngleX = var3; // L: 3794 - Client.camAngleY = var4; // L: 3795 + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 1708 + class114.worldSelectArrows[3].drawAt(var22 + 15, 4); + } else { + class114.worldSelectArrows[1].drawAt(var22 + 15, 4); // L: 1709 } - return 1; // L: 3797 - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3799 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3800 - return 1; // L: 3801 - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3803 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3804 - return 1; // L: 3805 - } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3807 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3808 - if (var3 < 0) { // L: 3809 - var3 = 0; + var0.draw("World", var22 + 32, 17, 16777215, -1); // L: 1710 + int var23 = Login.xPadding + 390; // L: 1711 + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 1712 + class114.worldSelectArrows[2].drawAt(var23, 4); + } else { + class114.worldSelectArrows[0].drawAt(var23, 4); // L: 1713 } - Client.camFollowHeight = var3; // L: 3810 - return 1; // L: 3811 - } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3813 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3814 - return 1; // L: 3815 - } else { - return 2; // L: 3817 - } - } + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 1714 + class114.worldSelectArrows[3].drawAt(var23 + 15, 4); + } else { + class114.worldSelectArrows[1].drawAt(var23 + 15, 4); // L: 1715 + } - @ObfuscatedName("fw") - @ObfuscatedSignature( - descriptor = "(Lgw;IIII)V", - garbageValue = "-478908474" - ) - static void method6087(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && class131.clientPreferences.method2270() != 0) { // L: 3553 - if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 3554 - int var4 = var0.soundEffects[var1]; // L: 3555 - if (var4 != 0) { // L: 3559 - int var7 = var4 >> 8; // L: 3560 - int var8 = var4 >> 4 & 7; // L: 3561 - int var9 = var4 & 15; // L: 3562 - Client.soundEffectIds[Client.soundEffectCount] = var7; // L: 3563 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; // L: 3564 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3565 - Client.soundEffects[Client.soundEffectCount] = null; // L: 3566 - int var10 = (var2 - 64) / 128; // L: 3567 - int var11 = (var3 - 64) / 128; // L: 3568 - Client.soundLocations[Client.soundEffectCount] = var9 + (var11 << 8) + (var10 << 16); // L: 3569 - ++Client.soundEffectCount; // L: 3570 + var0.draw("Players", var23 + 32, 17, 16777215, -1); // L: 1716 + var4 = Login.xPadding + 500; // L: 1717 + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 1718 + class114.worldSelectArrows[2].drawAt(var4, 4); + } else { + class114.worldSelectArrows[0].drawAt(var4, 4); // L: 1719 + } + + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 1720 + class114.worldSelectArrows[3].drawAt(var4 + 15, 4); + } else { + class114.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 1721 + } + + var0.draw("Location", var4 + 32, 17, 16777215, -1); // L: 1722 + var5 = Login.xPadding + 610; // L: 1723 + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 1724 + class114.worldSelectArrows[2].drawAt(var5, 4); + } else { + class114.worldSelectArrows[0].drawAt(var5, 4); // L: 1725 + } + + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 1726 + class114.worldSelectArrows[3].drawAt(var5 + 15, 4); + } else { + class114.worldSelectArrows[1].drawAt(var5 + 15, 4); // L: 1727 + } + + var0.draw("Type", var5 + 32, 17, 16777215, -1); // L: 1728 + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 1730 + var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 1731 + Login.hoveredWorldIndex = -1; // L: 1732 + if (GameEngine.worldSelectBackSprites != null) { // L: 1733 + byte var26 = 88; // L: 1734 + byte var27 = 19; // L: 1735 + var4 = 765 / (var26 + 1) - 1; // L: 1736 + var5 = 480 / (var27 + 1); // L: 1737 + + int var6; + int var7; + do { + var6 = var5; // L: 1739 + var7 = var4; // L: 1740 + if (var5 * (var4 - 1) >= World.World_count) { // L: 1741 + --var4; } + if (var4 * (var5 - 1) >= World.World_count) { // L: 1742 + --var5; + } + + if (var4 * (var5 - 1) >= World.World_count) { // L: 1743 + --var5; + } + } while(var5 != var6 || var4 != var7); // L: 1744 + + var6 = (765 - var26 * var4) / (var4 + 1); // L: 1746 + if (var6 > 5) { // L: 1747 + var6 = 5; + } + + var7 = (480 - var5 * var27) / (var5 + 1); // L: 1748 + if (var7 > 5) { // L: 1749 + var7 = 5; + } + + int var8 = (765 - var4 * var26 - var6 * (var4 - 1)) / 2; // L: 1750 + int var9 = (480 - var5 * var27 - var7 * (var5 - 1)) / 2; // L: 1751 + int var10 = (var5 + World.World_count - 1) / var5; // L: 1752 + Login.worldSelectPagesCount = var10 - var4; // L: 1753 + if (class126.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1754 + class126.worldSelectLeftSprite.drawAt(8, class433.canvasHeight / 2 - class126.worldSelectLeftSprite.subHeight / 2); // L: 1755 + } + + if (class424.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1757 + class424.worldSelectRightSprite.drawAt(GraphicsObject.canvasWidth - class424.worldSelectRightSprite.subWidth - 8, class433.canvasHeight / 2 - class424.worldSelectRightSprite.subHeight / 2); // L: 1758 + } + + int var11 = var9 + 23; // L: 1760 + int var12 = var8 + Login.xPadding; // L: 1761 + int var13 = 0; // L: 1762 + boolean var14 = false; // L: 1763 + int var15 = Login.worldSelectPage; // L: 1764 + + int var16; + for (var16 = var5 * var15; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { // L: 1765 1766 + World var17 = World.World_worlds[var16]; // L: 1769 + boolean var18 = true; // L: 1770 + String var19 = Integer.toString(var17.population); // L: 1771 + if (var17.population == -1) { // L: 1772 + var19 = "OFF"; // L: 1773 + var18 = false; // L: 1774 + } else if (var17.population > 1980) { // L: 1776 + var19 = "FULL"; // L: 1777 + var18 = false; // L: 1778 + } + + int var21 = 0; // L: 1781 + byte var20; + if (var17.isBeta()) { // L: 1782 + if (var17.isMembersOnly()) { // L: 1783 + var20 = 7; + } else { + var20 = 6; // L: 1784 + } + } else if (var17.isDeadman()) { // L: 1786 + var21 = 16711680; // L: 1787 + if (var17.isMembersOnly()) { // L: 1788 + var20 = 5; + } else { + var20 = 4; // L: 1789 + } + } else if (var17.method1619()) { // L: 1791 + if (var17.isMembersOnly()) { // L: 1792 + var20 = 9; + } else { + var20 = 8; // L: 1793 + } + } else if (var17.isPvp()) { // L: 1795 + if (var17.isMembersOnly()) { // L: 1796 + var20 = 3; + } else { + var20 = 2; // L: 1797 + } + } else if (var17.isMembersOnly()) { // L: 1800 + var20 = 1; + } else { + var20 = 0; // L: 1801 + } + + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var26 + var12 && MouseHandler.MouseHandler_y < var11 + var27 && var18) { // L: 1803 + Login.hoveredWorldIndex = var16; // L: 1804 + GameEngine.worldSelectBackSprites[var20].drawTransOverlayAt(var12, var11, 128, 16777215); // L: 1805 + var14 = true; // L: 1806 + } else { + GameEngine.worldSelectBackSprites[var20].drawAt(var12, var11); // L: 1808 + } + + if (class260.worldSelectFlagSprites != null) { // L: 1809 + class260.worldSelectFlagSprites[(var17.isMembersOnly() ? 8 : 0) + var17.location].drawAt(var12 + 29, var11); + } + + var0.drawCentered(Integer.toString(var17.id), var12 + 15, var27 / 2 + var11 + 5, var21, -1); // L: 1810 + var1.drawCentered(var19, var12 + 60, var27 / 2 + var11 + 5, 268435455, -1); // L: 1811 + var11 = var11 + var7 + var27; // L: 1812 + ++var13; // L: 1813 + if (var13 >= var5) { + var11 = var9 + 23; // L: 1814 + var12 = var12 + var6 + var26; // L: 1815 + var13 = 0; // L: 1816 + ++var15; // L: 1817 + } + } + + if (var14) { // L: 1820 + var16 = var1.stringWidth(World.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1821 + int var24 = var1.ascent + 8; // L: 1822 + int var25 = MouseHandler.MouseHandler_y + 25; // L: 1823 + if (var25 + var24 > 480) { // L: 1824 + var25 = MouseHandler.MouseHandler_y - 25 - var24; // L: 1825 + } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var24, 16777120); // L: 1827 + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var24, 0); // L: 1828 + var1.drawCentered(World.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var25 + var1.ascent + 4, 0, -1); // L: 1829 } } - } // L: 3572 - @ObfuscatedName("jg") + DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0); // L: 1832 + } // L: 1833 + + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "-695139684" + descriptor = "(ILbb;ZB)I", + garbageValue = "-27" ) - @Export("updateRootInterface") - static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (class155.loadInterface(var0)) { // L: 11183 - VarpDefinition.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 11184 + static int method5884(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_LISTENED) { // L: 2710 + if (class358.guestClanSettings != null) { // L: 2711 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 2712 + FontName.field4583 = class358.guestClanSettings; // L: 2713 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2715 + } + + return 1; // L: 2716 + } else { + int var3; + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_AFFINED) { // L: 2718 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2719 + if (Client.currentClanSettings[var3] != null) { // L: 2720 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 2721 + FontName.field4583 = Client.currentClanSettings[var3]; // L: 2722 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2724 + } + + return 1; // L: 2725 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCLANNAME) { // L: 2727 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = FontName.field4583.name; // L: 2728 + return 1; // L: 2729 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETALLOWUNAFFINED) { // L: 2731 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.allowGuests ? 1 : 0; // L: 2732 + return 1; // L: 2733 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKTALK) { // L: 2735 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.field1633; // L: 2736 + return 1; // L: 2737 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKKICK) { // L: 2739 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.field1641; // L: 2740 + return 1; // L: 2741 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKLOOTSHARE) { // L: 2743 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.field1642; // L: 2744 + return 1; // L: 2745 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCOINSHARE) { // L: 2747 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.field1648; // L: 2748 + return 1; // L: 2749 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDCOUNT) { // L: 2751 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.memberCount; // L: 2752 + return 1; // L: 2753 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME) { // L: 2755 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2756 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = FontName.field4583.memberNames[var3]; // L: 2757 + return 1; // L: 2758 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDRANK) { // L: 2760 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2761 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.memberRanks[var3]; // L: 2762 + return 1; // L: 2763 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDCOUNT) { // L: 2765 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.bannedMemberCount; // L: 2766 + return 1; // L: 2767 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME) { // L: 2769 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2770 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = FontName.field4583.bannedMemberNames[var3]; // L: 2771 + return 1; // L: 2772 + } else { + int var5; + int var6; + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO) { // L: 2774 + class12.Interpreter_intStackSize -= 3; // L: 2775 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 2776 + var6 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2777 + var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 2778 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.method2885(var3, var6, var5); // L: 2779 + return 1; // L: 2780 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT) { // L: 2782 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.currentOwner; // L: 2783 + return 1; // L: 2784 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT) { // L: 2786 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.field1652; // L: 2787 + return 1; // L: 2788 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDSLOT) { // L: 2790 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.method2884(Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]); // L: 2791 + return 1; // L: 2792 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT) { // L: 2794 + Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1] = FontName.field4583.getSortedMembers()[Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1]]; // L: 2795 + return 1; // L: 2796 + } else if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL) { // L: 2798 + class12.Interpreter_intStackSize -= 2; // L: 2799 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 2800 + var6 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2801 + class142.method2967(var6, var3); // L: 2802 + return 1; // L: 2803 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY) { // L: 2805 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2806 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.field1649[var3]; // L: 2807 + return 1; // L: 2808 + } else { + if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL) { // L: 2810 + class12.Interpreter_intStackSize -= 3; // L: 2811 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 2812 + boolean var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1] == 1; // L: 2813 + var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 2814 + class168.method3251(var5, var3, var4); // L: 2815 + } + + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDMUTED) { // L: 2817 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2818 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.field1650[var3] ? 1 : 0; // L: 2819 + return 1; // L: 2820 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_LISTENED) { // L: 2822 + if (UserComparator10.guestClanChannel != null) { // L: 2823 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 2824 + class1.field2 = UserComparator10.guestClanChannel; // L: 2825 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2827 + } + + return 1; // L: 2828 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_AFFINED) { // L: 2830 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2831 + if (Client.currentClanChannels[var3] != null) { // L: 2832 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 2833 + class1.field2 = Client.currentClanChannels[var3]; // L: 2834 + class121.field1529 = var3; // L: 2835 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2837 + } + + return 1; // L: 2838 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETCLANNAME) { // L: 2840 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = class1.field2.name; // L: 2841 + return 1; // L: 2842 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKKICK) { // L: 2844 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class1.field2.field1706; // L: 2845 + return 1; // L: 2846 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKTALK) { // L: 2848 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class1.field2.field1711; // L: 2849 + return 1; // L: 2850 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERCOUNT) { // L: 2852 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class1.field2.method3005(); // L: 2853 + return 1; // L: 2854 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERDISPLAYNAME) { // L: 2856 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2857 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ((ClanChannelMember)class1.field2.members.get(var3)).username.getName(); // L: 2858 + return 1; // L: 2859 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERRANK) { // L: 2861 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2862 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = ((ClanChannelMember)class1.field2.members.get(var3)).rank; // L: 2863 + return 1; // L: 2864 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERWORLD) { // L: 2866 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2867 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = ((ClanChannelMember)class1.field2.members.get(var3)).world; // L: 2868 + return 1; // L: 2869 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_KICKUSER) { // L: 2871 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2872 + InterfaceParent.method2069(class121.field1529, var3); // L: 2873 + return 1; // L: 2874 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERSLOT) { // L: 2876 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class1.field2.method3023(Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]); // L: 2877 + return 1; // L: 2878 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETSORTEDUSERSLOT) { // L: 2880 + Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1] = class1.field2.getSortedMembers()[Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1]]; // L: 2881 + return 1; // L: 2882 + } else if (var0 == ScriptOpcodes.CLANPROFILE_FIND) { // L: 2884 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = UserComparator8.field1378 != null ? 1 : 0; // L: 2885 + return 1; // L: 2886 + } else { + return 2; // L: 2888 + } + } + } } - } // L: 11185 + } + + @ObfuscatedName("jn") + @ObfuscatedSignature( + descriptor = "([Lki;IIIZB)V", + garbageValue = "74" + ) + @Export("resizeInterface") + static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { + for (int var5 = 0; var5 < var0.length; ++var5) { // L: 10781 + Widget var6 = var0[var5]; // L: 10782 + if (var6 != null && var6.parentId == var1) { // L: 10783 10784 + FloorOverlayDefinition.alignWidgetSize(var6, var2, var3, var4); // L: 10785 + ChatChannel.alignWidgetPosition(var6, var2, var3); // L: 10786 + if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 10787 + var6.scrollX = var6.scrollWidth - var6.width; + } + + if (var6.scrollX < 0) { // L: 10788 + var6.scrollX = 0; + } + + if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 10789 + var6.scrollY = var6.scrollHeight - var6.height; + } + + if (var6.scrollY < 0) { // L: 10790 + var6.scrollY = 0; + } + + if (var6.type == 0) { // L: 10791 + UserComparator8.revalidateWidgetScroll(var0, var6, var4); + } + } + } + + } // L: 10793 } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index eb8fb755d7..d8cbf45998 100644 --- a/runescape-client/src/main/java/Link.java +++ b/runescape-client/src/main/java/Link.java @@ -3,23 +3,23 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ot") +@ObfuscatedName("og") @Implements("Link") public class Link { - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Log;" ) @Export("previous") public Link previous; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Log;" ) @Export("next") public Link next; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("remove") public void remove() { if (this.next != null) { // L: 8 diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java index 3460d9b04c..65c4314efd 100644 --- a/runescape-client/src/main/java/LinkDeque.java +++ b/runescape-client/src/main/java/LinkDeque.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lr") +@ObfuscatedName("lm") @Implements("LinkDeque") public class LinkDeque { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Log;" ) @Export("sentinel") Link sentinel; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Log;" ) @Export("current") Link current; @@ -25,9 +25,9 @@ public class LinkDeque { this.sentinel.next = this.sentinel; // L: 11 } // L: 12 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lot;)V" + descriptor = "(Log;)V" ) @Export("addFirst") public void addFirst(Link var1) { @@ -41,35 +41,35 @@ public class LinkDeque { var1.previous.next = var1; // L: 19 } // L: 20 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "()Lot;" + descriptor = "()Log;" ) @Export("last") public Link last() { - Link var1 = this.sentinel.previous; // L: 23 - if (var1 == this.sentinel) { // L: 24 - this.current = null; // L: 25 - return null; // L: 26 + Link var1 = this.sentinel.previous; // L: 24 + if (var1 == this.sentinel) { // L: 25 + this.current = null; // L: 26 + return null; // L: 27 } else { - this.current = var1.previous; // L: 28 - return var1; // L: 29 + this.current = var1.previous; // L: 29 + return var1; // L: 30 } } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Lot;" + descriptor = "()Log;" ) @Export("previous") public Link previous() { - Link var1 = this.current; // L: 33 - if (var1 == this.sentinel) { // L: 34 - this.current = null; // L: 35 - return null; // L: 36 + Link var1 = this.current; // L: 35 + if (var1 == this.sentinel) { // L: 36 + this.current = null; // L: 37 + return null; // L: 38 } else { - this.current = var1.previous; // L: 38 - return var1; // L: 39 + this.current = var1.previous; // L: 40 + return var1; // L: 41 } } } diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 0830e4301a..f3d6375e01 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -5,411 +5,188 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bs") +@ObfuscatedName("bu") @Implements("Login") public class Login { - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("clearLoginScreen") static boolean clearLoginScreen; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 2022945893 + intValue = 276898147 ) @Export("xPadding") static int xPadding; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "[Lqq;" + descriptor = "[Lqd;" ) @Export("runesSprite") static IndexedSprite[] runesSprite; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lqq;" + descriptor = "Lqd;" ) @Export("titleboxSprite") static IndexedSprite titleboxSprite; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lqq;" + descriptor = "Lqd;" ) @Export("titlebuttonSprite") static IndexedSprite titlebuttonSprite; - @ObfuscatedName("y") + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lqd;" + ) + static IndexedSprite field882; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lqd;" + ) + static IndexedSprite field888; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1514793593 + intValue = -2055950189 ) @Export("loginBoxX") static int loginBoxX; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 66055169 + intValue = 135788845 ) @Export("Login_loadingPercent") static int Login_loadingPercent; - @ObfuscatedName("z") + @ObfuscatedName("i") @Export("Login_loadingText") static String Login_loadingText; - @ObfuscatedName("au") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 688596069 + intValue = -799291101 ) - static int field901; - @ObfuscatedName("ai") + static int field887; + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -547641813 + intValue = 148812415 ) - static int field895; - @ObfuscatedName("az") + static int field907; + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -1615096635 + intValue = 1290370117 ) @Export("loginIndex") static int loginIndex; - @ObfuscatedName("as") + @ObfuscatedName("at") @Export("Login_response0") static String Login_response0; - @ObfuscatedName("aa") + @ObfuscatedName("br") @Export("Login_response1") static String Login_response1; - @ObfuscatedName("bj") + @ObfuscatedName("ba") @Export("Login_response2") static String Login_response2; - @ObfuscatedName("bm") + @ObfuscatedName("bk") @Export("Login_response3") static String Login_response3; - @ObfuscatedName("br") + @ObfuscatedName("bi") @Export("Login_username") static String Login_username; - @ObfuscatedName("bo") + @ObfuscatedName("bc") @Export("Login_password") static String Login_password; - @ObfuscatedName("be") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 326073325 + intValue = 1915795539 ) - static int field903; + static int field896; + @ObfuscatedName("bs") + static String[] field876; @ObfuscatedName("bh") - static String[] field904; - @ObfuscatedName("by") - static boolean field909; - @ObfuscatedName("bt") - static boolean field906; - @ObfuscatedName("bp") - static boolean field907; - @ObfuscatedName("bi") + static boolean field879; + @ObfuscatedName("bb") + static boolean field881; + @ObfuscatedName("bn") + static boolean field900; + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = 1549221867 + intValue = -1833124077 ) @Export("currentLoginField") static int currentLoginField; - @ObfuscatedName("cm") + @ObfuscatedName("ck") @Export("worldSelectOpen") static boolean worldSelectOpen; - @ObfuscatedName("cb") + @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = -1213239867 + intValue = 286320775 ) @Export("hoveredWorldIndex") static int hoveredWorldIndex; - @ObfuscatedName("cp") + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = -418396213 + intValue = -246673921 ) @Export("worldSelectPage") static int worldSelectPage; - @ObfuscatedName("co") + @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = -2129612195 + intValue = 70762845 ) @Export("worldSelectPagesCount") static int worldSelectPagesCount; - @ObfuscatedName("ci") + @ObfuscatedName("cd") @ObfuscatedGetter( - longValue = -2025470405168207311L + longValue = -2630741259631538253L ) - static long field915; - @ObfuscatedName("cy") + static long field883; + @ObfuscatedName("cw") @ObfuscatedGetter( - longValue = 679387299211312041L + longValue = -7505772833145072753L ) - static long field916; - @ObfuscatedName("cr") - static String[] field917; + static long field909; + @ObfuscatedName("cf") + static String[] field910; @ObfuscatedName("cq") - static String[] field918; + static String[] field911; + @ObfuscatedName("dv") + @Export("mouseCam") + static boolean mouseCam; + @ObfuscatedName("py") + @ObfuscatedSignature( + descriptor = "Lpd;" + ) + @Export("HitSplatDefinition_cachedSprites") + static class428 HitSplatDefinition_cachedSprites; static { xPadding = 0; // L: 47 - loginBoxX = xPadding + 202; + loginBoxX = xPadding + 202; // L: 66 Login_loadingPercent = 10; // L: 68 Login_loadingText = ""; // L: 69 - field901 = -1; // L: 87 - field895 = 1; // L: 90 - loginIndex = 0; // L: 94 - Login_response0 = ""; // L: 95 - Login_response1 = ""; // L: 96 - Login_response2 = ""; // L: 97 - Login_response3 = ""; // L: 98 - Login_username = ""; // L: 99 - Login_password = ""; // L: 100 - field903 = 0; // L: 102 - field904 = new String[8]; // L: 103 - field909 = false; // L: 114 - field906 = false; // L: 115 - field907 = true; // L: 118 - currentLoginField = 0; // L: 119 - worldSelectOpen = false; // L: 123 - hoveredWorldIndex = -1; // L: 131 - worldSelectPage = 0; // L: 132 - worldSelectPagesCount = 0; // L: 133 - new DecimalFormat("##0.00"); // L: 136 + field887 = -1; // L: 88 + field907 = 1; // L: 91 + loginIndex = 0; // L: 95 + Login_response0 = ""; // L: 96 + Login_response1 = ""; // L: 97 + Login_response2 = ""; // L: 98 + Login_response3 = ""; // L: 99 + Login_username = ""; // L: 100 + Login_password = ""; // L: 101 + field896 = 0; // L: 103 + field876 = new String[8]; // L: 104 + field879 = false; // L: 115 + field881 = false; // L: 116 + field900 = true; // L: 119 + currentLoginField = 0; // L: 120 + worldSelectOpen = false; // L: 124 + hoveredWorldIndex = -1; // L: 132 + worldSelectPage = 0; // L: 133 + worldSelectPagesCount = 0; // L: 134 + new DecimalFormat("##0.00"); // L: 137 new class120(); - field915 = -1L; // L: 144 - field916 = -1L; // L: 145 - field917 = new String[]{"title.jpg"}; // L: 148 - field918 = new String[]{"logo", "logo_deadman_mode", "logo_seasonal_mode", "titlebox", "titlebutton", "titlebutton_large", "play_now_text", "titlebutton_wide42,1", "runes", "title_mute", "options_radio_buttons,0", "options_radio_buttons,2", "options_radio_buttons,4", "options_radio_buttons,6", "sl_back", "sl_flags", "sl_arrows", "sl_stars", "sl_button"}; // L: 151 + field883 = -1L; // L: 145 + field909 = -1L; // L: 146 + field910 = new String[]{"title.jpg"}; // L: 149 + field911 = new String[]{"logo", "logo_deadman_mode", "logo_seasonal_mode", "titlebox", "titlebutton", "titlebutton_large", "play_now_text", "titlebutton_wide42,1", "runes", "title_mute", "options_radio_buttons,0", "options_radio_buttons,2", "options_radio_buttons,4", "options_radio_buttons,6", "sl_back", "sl_flags", "sl_arrows", "sl_stars", "sl_button"}; // L: 152 } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2061264207" - ) - static void method1960() { - ByteArrayPool.field4167.clear(); // L: 61 - ByteArrayPool.field4167.add(100); // L: 62 - ByteArrayPool.field4167.add(5000); // L: 63 - ByteArrayPool.field4167.add(10000); // L: 64 - ByteArrayPool.field4167.add(30000); // L: 65 - } // L: 66 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lpz;ILcz;II)V", - garbageValue = "540363482" - ) - static final void method1932(PacketBuffer var0, int var1, Player var2, int var3) { - byte var4 = class193.field2186.field2183; // L: 451 - if ((var3 & 8192) != 0) { // L: 452 - var2.field1167 = Client.cycle + var0.method7714(); // L: 453 - var2.field1168 = Client.cycle + var0.method7713(); // L: 454 - var2.field1169 = var0.method7708(); // L: 455 - var2.field1114 = var0.method7708(); // L: 456 - var2.field1171 = var0.method7885(); // L: 457 - var2.field1122 = (byte)var0.method7773(); // L: 458 - } - - if ((var3 & 256) != 0) { // L: 460 - var4 = var0.method7885(); // L: 461 - } - - int var5; - int var8; - int var9; - int var12; - if ((var3 & 1) != 0) { // L: 463 - var5 = var0.method7713(); // L: 464 - PlayerType var6 = (PlayerType)MusicPatchPcmStream.findEnumerated(WorldMapManager.PlayerType_values(), var0.readUnsignedByte()); // L: 465 - boolean var7 = var0.method7742() == 1; // L: 466 - var8 = var0.method7742(); // L: 467 - var9 = var0.offset; // L: 468 - if (var2.username != null && var2.appearance != null) { // L: 469 - boolean var10 = false; // L: 470 - if (var6.isUser && Decimator.friendSystem.isIgnored(var2.username)) { // L: 471 472 - var10 = true; - } - - if (!var10 && Client.field618 == 0 && !var2.isHidden) { // L: 474 - Players.field1273.offset = 0; // L: 475 - var0.method7814(Players.field1273.array, 0, var8); // L: 476 - Players.field1273.offset = 0; // L: 477 - String var11 = AbstractFont.escapeBrackets(MouseHandler.method584(class193.method3883(Players.field1273))); // L: 478 - var2.overheadText = var11.trim(); // L: 479 - var2.overheadTextColor = var5 >> 8; // L: 480 - var2.overheadTextEffect = var5 & 255; // L: 481 - var2.overheadTextCyclesRemaining = 150; // L: 482 - var2.isAutoChatting = var7; // L: 483 - var2.field1130 = var2 != GrandExchangeEvents.localPlayer && var6.isUser && "" != Client.field728 && var11.toLowerCase().indexOf(Client.field728) == -1; // L: 484 - if (var6.isPrivileged) { // L: 486 - var12 = var7 ? 91 : 1; - } else { - var12 = var7 ? 90 : 2; // L: 487 - } - - if (var6.modIcon != -1) { // L: 488 - Actor.addGameMessage(var12, Script.method1990(var6.modIcon) + var2.username.getName(), var11); - } else { - Actor.addGameMessage(var12, var2.username.getName(), var11); // L: 489 - } - } - } - - var0.offset = var8 + var9; // L: 492 - } - - if ((var3 & 2048) != 0) { // L: 494 - for (var5 = 0; var5 < 3; ++var5) { // L: 495 - var2.actions[var5] = var0.readStringCp1252NullTerminated(); - } - } - - if ((var3 & 4096) != 0) { // L: 497 - var2.spotAnimation = var0.method7713(); // L: 498 - var5 = var0.method7705(); // L: 499 - var2.spotAnimationHeight = var5 >> 16; // L: 500 - var2.field1134 = (var5 & 65535) + Client.cycle; // L: 501 - var2.spotAnimationFrame = 0; // L: 502 - var2.spotAnimationFrameCycle = 0; // L: 503 - if (var2.field1134 > Client.cycle) { // L: 504 - var2.spotAnimationFrame = -1; - } - - if (var2.spotAnimation == 65535) { // L: 505 - var2.spotAnimation = -1; - } - } - - if ((var3 & 128) != 0) { // L: 507 - var5 = var0.method7742(); // L: 508 - byte[] var17 = new byte[var5]; // L: 509 - Buffer var13 = new Buffer(var17); // L: 510 - var0.method7814(var17, 0, var5); // L: 511 - Players.field1276[var1] = var13; // L: 512 - var2.read(var13); // L: 513 - } - - if ((var3 & 512) != 0) { // L: 515 - var2.field1129 = var0.method7707(); // L: 516 - var2.field1160 = var0.readByte(); // L: 517 - var2.field1132 = var0.method7885(); // L: 518 - var2.field1161 = var0.method7708(); // L: 519 - var2.field1143 = var0.method7714() + Client.cycle; // L: 520 - var2.field1163 = var0.method7715() + Client.cycle; // L: 521 - var2.field1135 = var0.method7713(); // L: 522 - if (var2.field1070) { // L: 523 - var2.field1129 += var2.tileX; // L: 524 - var2.field1160 += var2.tileY; // L: 525 - var2.field1132 += var2.tileX; // L: 526 - var2.field1161 += var2.tileY; // L: 527 - var2.pathLength = 0; // L: 528 - } else { - var2.field1129 += var2.pathX[0]; // L: 531 - var2.field1160 += var2.pathY[0]; // L: 532 - var2.field1132 += var2.pathX[0]; // L: 533 - var2.field1161 += var2.pathY[0]; // L: 534 - var2.pathLength = 1; // L: 535 - } - - var2.field1170 = 0; // L: 537 - } - - if ((var3 & 16) != 0) { // L: 539 - var2.field1121 = var0.readUnsignedShort(); // L: 540 - if (var2.pathLength == 0) { // L: 541 - var2.orientation = var2.field1121; // L: 542 - var2.field1121 = -1; // L: 543 - } - } - - if ((var3 & 2) != 0) { // L: 546 - var2.overheadText = var0.readStringCp1252NullTerminated(); // L: 547 - if (var2.overheadText.charAt(0) == '~') { // L: 548 - var2.overheadText = var2.overheadText.substring(1); // L: 549 - Actor.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 550 - } else if (var2 == GrandExchangeEvents.localPlayer) { // L: 552 - Actor.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 553 - } - - var2.isAutoChatting = false; // L: 555 - var2.overheadTextColor = 0; // L: 556 - var2.overheadTextEffect = 0; // L: 557 - var2.overheadTextCyclesRemaining = 150; // L: 558 - } - - int var14; - if ((var3 & 8) != 0) { // L: 560 - var5 = var0.method7715(); // L: 561 - if (var5 == 65535) { // L: 562 - var5 = -1; - } - - var14 = var0.method7742(); // L: 563 - GrandExchangeOfferOwnWorldComparator.performPlayerAnimation(var2, var5, var14); // L: 564 - } - - if ((var3 & 16384) != 0) { // L: 566 - class193[] var15 = Players.field1286; // L: 567 - class193[] var21 = new class193[]{class193.field2185, class193.field2187, class193.field2186, class193.field2184}; // L: 571 - var15[var1] = (class193)MusicPatchPcmStream.findEnumerated(var21, var0.method7708()); // L: 573 - } - - if ((var3 & 32) != 0) { // L: 575 - var2.targetIndex = var0.method7713(); // L: 576 - if (var2.targetIndex == 65535) { // L: 577 - var2.targetIndex = -1; - } - } - - if ((var3 & 4) != 0) { // L: 579 - var5 = var0.method7773(); // L: 580 - int var16; - int var19; - int var20; - if (var5 > 0) { // L: 581 - for (var14 = 0; var14 < var5; ++var14) { // L: 582 - var8 = -1; // L: 584 - var9 = -1; // L: 585 - var20 = -1; // L: 586 - var19 = var0.readUShortSmart(); // L: 587 - if (var19 == 32767) { // L: 588 - var19 = var0.readUShortSmart(); // L: 589 - var9 = var0.readUShortSmart(); // L: 590 - var8 = var0.readUShortSmart(); // L: 591 - var20 = var0.readUShortSmart(); // L: 592 - } else if (var19 != 32766) { // L: 594 - var9 = var0.readUShortSmart(); // L: 595 - } else { - var19 = -1; // L: 597 - } - - var16 = var0.readUShortSmart(); // L: 598 - var2.addHitSplat(var19, var9, var8, var20, Client.cycle, var16); // L: 599 - } - } - - var14 = var0.readUnsignedByte(); // L: 602 - if (var14 > 0) { // L: 603 - for (var19 = 0; var19 < var14; ++var19) { // L: 604 - var8 = var0.readUShortSmart(); // L: 605 - var9 = var0.readUShortSmart(); // L: 606 - if (var9 != 32767) { // L: 607 - var20 = var0.readUShortSmart(); // L: 608 - var16 = var0.readUnsignedByte(); // L: 609 - var12 = var9 > 0 ? var0.method7773() : var16; // L: 610 - var2.addHealthBar(var8, Client.cycle, var9, var20, var16, var12); // L: 611 - } else { - var2.removeHealthBar(var8); // L: 613 - } - } - } - } - - if (var2.field1070) { // L: 617 - if (var4 == 127) { // L: 618 - var2.resetPath(var2.tileX, var2.tileY); - } else { - class193 var22; - if (var4 != class193.field2186.field2183) { // L: 621 - class193[] var18 = new class193[]{class193.field2185, class193.field2187, class193.field2186, class193.field2184}; // L: 624 - var22 = (class193)MusicPatchPcmStream.findEnumerated(var18, var4); // L: 626 - } else { - var22 = Players.field1286[var1]; // L: 628 - } - - var2.method2125(var2.tileX, var2.tileY, var22); // L: 629 - } - } - - } // L: 633 } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index f7de8f77aa..e306aa8ec4 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -4,61 +4,61 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jv") +@ObfuscatedName("jn") @Implements("LoginPacket") public class LoginPacket implements class261 { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljv;" + descriptor = "Ljn;" ) - public static final LoginPacket field3137; - @ObfuscatedName("c") + public static final LoginPacket field3192; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Ljv;" + descriptor = "Ljn;" ) - static final LoginPacket field3131; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Ljv;" - ) - public static final LoginPacket field3132; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Ljv;" - ) - public static final LoginPacket field3133; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Ljv;" - ) - public static final LoginPacket field3134; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Ljv;" - ) - static final LoginPacket field3130; + static final LoginPacket field3196; @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[Ljv;" + descriptor = "Ljn;" + ) + public static final LoginPacket field3193; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final LoginPacket field3194; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final LoginPacket field3195; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + static final LoginPacket field3191; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "[Ljn;" ) @Export("LoginPacket_indexedValues") static final LoginPacket[] LoginPacket_indexedValues; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 696686347 + intValue = -1526221881 ) @Export("id") public final int id; static { - field3137 = new LoginPacket(14, 0); // L: 5 - field3131 = new LoginPacket(15, 4); // L: 6 - field3132 = new LoginPacket(16, -2); // L: 7 - field3133 = new LoginPacket(18, -2); // L: 8 - field3134 = new LoginPacket(19, -2); // L: 9 - field3130 = new LoginPacket(27, 0); // L: 10 + field3192 = new LoginPacket(14, 0); // L: 5 + field3196 = new LoginPacket(15, 4); // L: 6 + field3193 = new LoginPacket(16, -2); // L: 7 + field3194 = new LoginPacket(18, -2); // L: 8 + field3195 = new LoginPacket(19, -2); // L: 9 + field3191 = new LoginPacket(27, 0); // L: 10 LoginPacket_indexedValues = new LoginPacket[32]; // L: 12 - LoginPacket[] var0 = class127.method2836(); // L: 15 + LoginPacket[] var0 = UserList.method6607(); // L: 15 for (int var1 = 0; var1 < var0.length; ++var1) { // L: 16 LoginPacket_indexedValues[var0[var1].id] = var0[var1]; // L: 17 @@ -74,36 +74,32 @@ public class LoginPacket implements class261 { this.id = var1; // L: 26 } // L: 27 - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Lpz;I)I", - garbageValue = "-1030532734" - ) - static int method5195(PacketBuffer var0) { - int var1 = var0.readBits(2); // L: 187 - int var2; - if (var1 == 0) { // L: 189 - var2 = 0; - } else if (var1 == 1) { - var2 = var0.readBits(5); // L: 190 - } else if (var1 == 2) { // L: 191 - var2 = var0.readBits(8); - } else { - var2 = var0.readBits(11); // L: 192 - } - - return var2; // L: 193 + @ObfuscatedName("l") + public static boolean method5022(long var0) { + return 0L != var0 && !class129.method2816(var0); // L: 52 } - @ObfuscatedName("gl") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "16" + descriptor = "(Lpx;B)Ljava/lang/String;", + garbageValue = "120" ) - static void method5192() { - if (Client.renderSelf) { // L: 4767 - ArchiveLoader.addPlayerToScene(GrandExchangeEvents.localPlayer, false); // L: 4768 + public static String method5025(Buffer var0) { + String var1; + try { + int var2 = var0.readUShortSmart(); // L: 67 + if (var2 > 32767) { // L: 68 + var2 = 32767; + } + + byte[] var3 = new byte[var2]; // L: 69 + var0.offset += class282.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 70 + String var4 = EnumComposition.decodeStringCp1252(var3, 0, var2); // L: 71 + var1 = var4; // L: 72 + } catch (Exception var6) { // L: 74 + var1 = "Cabbage"; // L: 75 } - } // L: 4770 + return var1; // L: 78 + } } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 2222439435..986802546a 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -4,214 +4,208 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("co") +@ObfuscatedName("cc") @Implements("LoginScreenAnimation") public class LoginScreenAnimation { - @ObfuscatedName("ex") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Llx;" - ) - @Export("archive7") - static Archive archive7; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "[Lqq;" + descriptor = "[Lqd;" ) @Export("sprites") IndexedSprite[] sprites; - @ObfuscatedName("s") - int[] field1196; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1097615297 - ) - int field1197; - @ObfuscatedName("q") - int[] field1206; - @ObfuscatedName("o") - int[] field1199; - @ObfuscatedName("r") - int[] field1200; @ObfuscatedName("p") - int[] field1207; + int[] field1222; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 60362303 + ) + int field1226; + @ObfuscatedName("r") + int[] field1221; + @ObfuscatedName("v") + int[] field1225; + @ObfuscatedName("y") + int[] field1224; + @ObfuscatedName("c") + int[] field1232; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1370547723 + intValue = 831623427 ) - int field1202; - @ObfuscatedName("k") + int field1228; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 816290751 + intValue = -159416635 ) - int field1201; - @ObfuscatedName("d") - int[] field1204; - @ObfuscatedName("m") - int[] field1198; - @ObfuscatedName("u") - int[] field1205; + int field1229; @ObfuscatedName("t") - int[] field1191; + int[] field1230; @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 1422508409 - ) - int field1208; + int[] field1231; @ObfuscatedName("x") + int[] field1236; + @ObfuscatedName("n") + int[] field1233; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1378268659 + intValue = 1954849781 ) - int field1209; - @ObfuscatedName("a") + int field1234; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 131127333 + intValue = -718393717 ) - int field1210; + int field1235; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1681238853 + ) + int field1217; @ObfuscatedSignature( - descriptor = "([Lqq;)V" + descriptor = "([Lqd;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { - this.field1196 = new int[256]; // L: 13 - this.field1197 = 0; // L: 14 - this.field1202 = 0; // L: 19 - this.field1201 = 0; // L: 20 - this.field1208 = 0; // L: 25 - this.field1209 = 0; // L: 26 - this.field1210 = 0; // L: 27 + this.field1222 = new int[256]; // L: 13 + this.field1226 = 0; // L: 14 + this.field1228 = 0; // L: 19 + this.field1229 = 0; // L: 20 + this.field1234 = 0; // L: 25 + this.field1235 = 0; // L: 26 + this.field1217 = 0; // L: 27 this.sprites = var1; // L: 30 this.initColors(); // L: 31 } // L: 32 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1658294303" + descriptor = "(S)V", + garbageValue = "-8569" ) @Export("initColors") void initColors() { - this.field1199 = new int[256]; // L: 35 + this.field1225 = new int[256]; // L: 35 int var1; for (var1 = 0; var1 < 64; ++var1) { // L: 36 - this.field1199[var1] = var1 * 262144; + this.field1225[var1] = var1 * 262144; } for (var1 = 0; var1 < 64; ++var1) { // L: 37 - this.field1199[var1 + 64] = var1 * 1024 + 16711680; + this.field1225[var1 + 64] = var1 * 1024 + 16711680; } for (var1 = 0; var1 < 64; ++var1) { // L: 38 - this.field1199[var1 + 128] = var1 * 4 + 16776960; + this.field1225[var1 + 128] = var1 * 4 + 16776960; } for (var1 = 0; var1 < 64; ++var1) { // L: 39 - this.field1199[var1 + 192] = 16777215; + this.field1225[var1 + 192] = 16777215; } - this.field1200 = new int[256]; // L: 40 + this.field1224 = new int[256]; // L: 40 for (var1 = 0; var1 < 64; ++var1) { // L: 41 - this.field1200[var1] = var1 * 1024; + this.field1224[var1] = var1 * 1024; } for (var1 = 0; var1 < 64; ++var1) { // L: 42 - this.field1200[var1 + 64] = var1 * 4 + 65280; + this.field1224[var1 + 64] = var1 * 4 + 65280; } for (var1 = 0; var1 < 64; ++var1) { // L: 43 - this.field1200[var1 + 128] = var1 * 262144 + 65535; + this.field1224[var1 + 128] = var1 * 262144 + 65535; } for (var1 = 0; var1 < 64; ++var1) { // L: 44 - this.field1200[var1 + 192] = 16777215; + this.field1224[var1 + 192] = 16777215; } - this.field1207 = new int[256]; // L: 45 + this.field1232 = new int[256]; // L: 45 for (var1 = 0; var1 < 64; ++var1) { // L: 46 - this.field1207[var1] = var1 * 4; + this.field1232[var1] = var1 * 4; } for (var1 = 0; var1 < 64; ++var1) { // L: 47 - this.field1207[var1 + 64] = var1 * 262144 + 255; + this.field1232[var1 + 64] = var1 * 262144 + 255; } for (var1 = 0; var1 < 64; ++var1) { // L: 48 - this.field1207[var1 + 128] = var1 * 1024 + 16711935; + this.field1232[var1 + 128] = var1 * 1024 + 16711935; } for (var1 = 0; var1 < 64; ++var1) { // L: 49 - this.field1207[var1 + 192] = 16777215; + this.field1232[var1 + 192] = 16777215; } - this.field1206 = new int[256]; // L: 50 - this.field1208 = 0; // L: 51 - this.field1205 = new int[32768]; // L: 52 - this.field1191 = new int[32768]; // L: 53 - this.method2200((IndexedSprite)null); // L: 54 - this.field1204 = new int[32768]; // L: 55 - this.field1198 = new int[32768]; // L: 56 + this.field1221 = new int[256]; // L: 50 + this.field1234 = 0; // L: 51 + this.field1236 = new int[32768]; // L: 52 + this.field1233 = new int[32768]; // L: 53 + this.method2193((IndexedSprite)null); // L: 54 + this.field1230 = new int[32768]; // L: 55 + this.field1231 = new int[32768]; // L: 56 } // L: 57 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1316000316" + garbageValue = "1724362438" ) - void method2193() { - this.field1199 = null; // L: 60 - this.field1200 = null; // L: 61 - this.field1207 = null; // L: 62 - this.field1206 = null; // L: 63 - this.field1205 = null; // L: 64 - this.field1191 = null; // L: 65 - this.field1204 = null; // L: 66 - this.field1198 = null; // L: 67 - this.field1208 = 0; // L: 68 - this.field1209 = 0; // L: 69 + void method2214() { + this.field1225 = null; // L: 60 + this.field1224 = null; + this.field1232 = null; + this.field1221 = null; + this.field1236 = null; + this.field1233 = null; + this.field1230 = null; + this.field1231 = null; // L: 67 + this.field1234 = 0; // L: 68 + this.field1235 = 0; // L: 69 } // L: 70 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-168793986" + garbageValue = "-1593640252" ) @Export("draw") void draw(int var1, int var2) { - if (this.field1204 == null) { // L: 73 + if (this.field1230 == null) { // L: 73 this.initColors(); // L: 74 } - if (this.field1210 == 0) { // L: 76 - this.field1210 = var2; // L: 77 + if (this.field1217 == 0) { // L: 76 + this.field1217 = var2; // L: 77 } - int var3 = var2 - this.field1210; // L: 79 + int var3 = var2 - this.field1217; // L: 79 if (var3 >= 256) { // L: 80 var3 = 0; } - this.field1210 = var2; // L: 81 + this.field1217 = var2; // L: 81 if (var3 > 0) { // L: 82 - this.method2195(var3); // L: 83 + this.method2189(var3); // L: 83 } - this.method2222(var1); // L: 85 + this.method2208(var1); // L: 85 } // L: 86 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" + descriptor = "(II)V", + garbageValue = "1193226532" ) - final void method2195(int var1) { - this.field1208 += 128 * var1; // L: 89 + final void method2189(int var1) { + this.field1234 += 128 * var1; // L: 89 int var2; - if (this.field1208 > this.field1205.length) { // L: 90 - this.field1208 -= this.field1205.length; // L: 91 + if (this.field1234 > this.field1236.length) { // L: 90 + this.field1234 -= this.field1236.length; // L: 91 var2 = (int)(Math.random() * 12.0D); // L: 92 - this.method2200(this.sprites[var2]); // L: 93 + this.method2193(this.sprites[var2]); // L: 93 } var2 = 0; // L: 95 @@ -220,12 +214,12 @@ public class LoginScreenAnimation { int var6; for (int var5 = 0; var5 < var4; ++var5) { // L: 98 - var6 = this.field1204[var2 + var3] - this.field1205[var2 + this.field1208 & this.field1205.length - 1] * var1 / 6; // L: 99 + var6 = this.field1230[var3 + var2] - this.field1236[var2 + this.field1234 & this.field1236.length - 1] * var1 / 6; // L: 99 if (var6 < 0) { // L: 100 var6 = 0; } - this.field1204[var2++] = var6; // L: 101 + this.field1230[var2++] = var6; // L: 101 } byte var15 = 10; // L: 103 @@ -239,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.field1204[var9 + var8] = 255; + this.field1230[var9 + var8] = 255; } else { - this.field1204[var9 + var8] = 0; // L: 110 + this.field1230[var9 + var8] = 0; // L: 110 } } } - if (this.field1202 > 0) { // L: 113 - this.field1202 -= var1 * 4; + if (this.field1228 > 0) { // L: 113 + this.field1228 -= var1 * 4; } - if (this.field1201 > 0) { // L: 114 - this.field1201 -= var1 * 4; + if (this.field1229 > 0) { // L: 114 + this.field1229 -= var1 * 4; } - if (this.field1202 == 0 && this.field1201 == 0) { // L: 115 + if (this.field1228 == 0 && this.field1229 == 0) { // L: 115 var7 = (int)(Math.random() * (double)(2000 / var1)); // L: 116 if (var7 == 0) { // L: 117 - this.field1202 = 1024; + this.field1228 = 1024; } if (var7 == 1) { // L: 118 - this.field1201 = 1024; + this.field1229 = 1024; } } for (var7 = 0; var7 < 256 - var1; ++var7) { // L: 120 - this.field1196[var7] = this.field1196[var7 + var1]; + this.field1222[var7] = this.field1222[var7 + var1]; } for (var7 = 256 - var1; var7 < 256; ++var7) { // L: 121 - this.field1196[var7] = (int)(Math.sin((double)this.field1197 / 14.0D) * 16.0D + Math.sin((double)this.field1197 / 15.0D) * 14.0D + Math.sin((double)this.field1197 / 16.0D) * 12.0D); // L: 122 - ++this.field1197; // L: 123 + this.field1222[var7] = (int)(Math.sin((double)this.field1226 / 14.0D) * 16.0D + Math.sin((double)this.field1226 / 15.0D) * 14.0D + Math.sin((double)this.field1226 / 16.0D) * 12.0D); // L: 122 + ++this.field1226; // L: 123 } - this.field1209 += var1; // L: 125 + this.field1235 += var1; // L: 125 var7 = ((Client.cycle & 1) + var1) / 2; // L: 126 if (var7 > 0) { // L: 127 short var16 = 128; // L: 128 @@ -284,13 +278,13 @@ public class LoginScreenAnimation { int var11; int var12; int var13; - for (var11 = 0; var11 < this.field1209 * 100; ++var11) { // L: 131 + for (var11 = 0; var11 < this.field1235 * 100; ++var11) { // L: 131 var12 = (int)(Math.random() * (double)var10) + var17; // L: 132 var13 = (int)(Math.random() * (double)var16) + var16; // L: 133 - this.field1204[var12 + (var13 << 7)] = 192; // L: 134 + this.field1230[var12 + (var13 << 7)] = 192; // L: 134 } - this.field1209 = 0; // L: 136 + this.field1235 = 0; // L: 136 int var14; for (var11 = 0; var11 < 256; ++var11) { // L: 137 @@ -298,16 +292,16 @@ public class LoginScreenAnimation { var13 = var11 * 128; // L: 139 for (var14 = -var7; var14 < 128; ++var14) { // L: 140 - if (var7 + var14 < 128) { // L: 141 - var12 += this.field1204[var7 + var14 + var13]; + if (var14 + var7 < 128) { // L: 141 + var12 += this.field1230[var13 + var14 + var7]; } if (var14 - (var7 + 1) >= 0) { // L: 142 - var12 -= this.field1204[var14 + var13 - (var7 + 1)]; + var12 -= this.field1230[var14 + var13 - (var7 + 1)]; } if (var14 >= 0) { // L: 143 - this.field1198[var14 + var13] = var12 / (var7 * 2 + 1); + this.field1231[var13 + var14] = var12 / (var7 * 2 + 1); } } } @@ -317,16 +311,16 @@ public class LoginScreenAnimation { for (var13 = -var7; var13 < 256; ++var13) { // L: 148 var14 = var13 * 128; // L: 149 - if (var13 + var7 < 256) { // L: 150 - var12 += this.field1198[var7 * 128 + var11 + var14]; + if (var7 + var13 < 256) { // L: 150 + var12 += this.field1231[var11 + var14 + var7 * 128]; } if (var13 - (var7 + 1) >= 0) { // L: 151 - var12 -= this.field1198[var11 + var14 - (var7 + 1) * 128]; + var12 -= this.field1231[var14 + var11 - (var7 + 1) * 128]; } if (var13 >= 0) { // L: 152 - this.field1204[var14 + var11] = var12 / (var7 * 2 + 1); + this.field1230[var14 + var11] = var12 / (var7 * 2 + 1); } } } @@ -334,66 +328,66 @@ public class LoginScreenAnimation { } // L: 156 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "620136463" + descriptor = "(IIIS)I", + garbageValue = "22355" ) - final int method2196(int var1, int var2, int var3) { + final int method2190(int var1, int var2, int var3) { int var4 = 256 - var3; // L: 159 - return (var4 * (var1 & 65280) + var3 * (var2 & 65280) & 16711680) + (var3 * (var2 & 16711935) + var4 * (var1 & 16711935) & -16711936) >> 8; // L: 160 + return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8; // L: 160 } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-46" + garbageValue = "43" ) - final void method2222(int var1) { - int var2 = this.field1206.length; // L: 164 - if (this.field1202 > 0) { // L: 165 - this.method2198(this.field1202, this.field1200); // L: 166 - } else if (this.field1201 > 0) { // L: 168 - this.method2198(this.field1201, this.field1207); // L: 169 + final void method2208(int var1) { + int var2 = this.field1221.length; // L: 164 + if (this.field1228 > 0) { // L: 165 + this.method2191(this.field1228, this.field1224); // L: 166 + } else if (this.field1229 > 0) { // L: 168 + this.method2191(this.field1229, this.field1232); // L: 169 } else { for (int var3 = 0; var3 < var2; ++var3) { // L: 172 - this.field1206[var3] = this.field1199[var3]; + this.field1221[var3] = this.field1225[var3]; } } - this.method2199(var1); // L: 174 + this.method2187(var1); // L: 174 } // L: 175 - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I[II)V", - garbageValue = "-2116901787" + descriptor = "(I[IB)V", + garbageValue = "1" ) - final void method2198(int var1, int[] var2) { - int var3 = this.field1206.length; // L: 178 + final void method2191(int var1, int[] var2) { + int var3 = this.field1221.length; // L: 178 for (int var4 = 0; var4 < var3; ++var4) { // L: 179 if (var1 > 768) { // L: 180 - this.field1206[var4] = this.method2196(this.field1199[var4], var2[var4], 1024 - var1); + this.field1221[var4] = this.method2190(this.field1225[var4], var2[var4], 1024 - var1); } else if (var1 > 256) { - this.field1206[var4] = var2[var4]; // L: 181 + this.field1221[var4] = var2[var4]; // L: 181 } else { - this.field1206[var4] = this.method2196(var2[var4], this.field1199[var4], 256 - var1); // L: 182 + this.field1221[var4] = this.method2190(var2[var4], this.field1225[var4], 256 - var1); // L: 182 } } } // L: 184 - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-922347681" + garbageValue = "569365785" ) - final void method2199(int var1) { + final void method2187(int var1) { int var2 = 0; // L: 187 for (int var3 = 1; var3 < 255; ++var3) { // L: 188 - int var4 = (256 - var3) * this.field1196[var3] / 256; // L: 189 + int var4 = (256 - var3) * this.field1222[var3] / 256; // L: 189 int var5 = var4 + var1; // L: 190 int var6 = 0; // L: 191 int var7 = 128; // L: 192 @@ -402,22 +396,22 @@ public class LoginScreenAnimation { var5 = 0; // L: 195 } - if (var5 + 128 >= FontName.rasterProvider.width) { // L: 197 - var7 = FontName.rasterProvider.width - var5; // L: 198 + if (var5 + 128 >= DevicePcmPlayerProvider.rasterProvider.width) { // L: 197 + var7 = DevicePcmPlayerProvider.rasterProvider.width - var5; // L: 198 } - int var8 = var5 + (var3 + 8) * FontName.rasterProvider.width; // L: 200 + int var8 = var5 + (var3 + 8) * DevicePcmPlayerProvider.rasterProvider.width; // L: 200 var2 += var6; // L: 201 for (int var9 = var6; var9 < var7; ++var9) { // L: 202 - int var10 = this.field1204[var2++]; // L: 203 + int var10 = this.field1230[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.field1206[var10]; // L: 208 - int var14 = FontName.rasterProvider.pixels[var8]; // L: 209 - FontName.rasterProvider.pixels[var8++] = -16777216 | ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) + (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) >> 8; // L: 210 + var10 = this.field1221[var10]; // L: 208 + int var14 = DevicePcmPlayerProvider.rasterProvider.pixels[var8]; // L: 209 + DevicePcmPlayerProvider.rasterProvider.pixels[var8++] = -16777216 | ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) + (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) >> 8; // L: 210 } else { ++var8; // L: 212 } @@ -428,21 +422,21 @@ public class LoginScreenAnimation { } // L: 216 - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lqq;B)V", - garbageValue = "-36" + descriptor = "(Lqd;I)V", + garbageValue = "1942415753" ) - final void method2200(IndexedSprite var1) { + final void method2193(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1205.length; ++var2) { // L: 219 - this.field1205[var2] = 0; + for (var2 = 0; var2 < this.field1236.length; ++var2) { // L: 219 + this.field1236[var2] = 0; } int var3; for (var2 = 0; var2 < 5000; ++var2) { // L: 220 var3 = (int)(Math.random() * 128.0D * 256.0D); // L: 221 - this.field1205[var3] = (int)(Math.random() * 256.0D); // L: 222 + this.field1236[var3] = (int)(Math.random() * 256.0D); // L: 222 } int var4; @@ -451,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.field1191[var5] = (this.field1205[var5 + 1] + this.field1205[var5 + 128] + this.field1205[var5 - 128] + this.field1205[var5 - 1]) / 4; // L: 228 + this.field1233[var5] = (this.field1236[var5 + 128] + this.field1236[var5 - 128] + this.field1236[var5 + 1] + this.field1236[var5 - 1]) / 4; // L: 228 } } - int[] var8 = this.field1205; // L: 231 - this.field1205 = this.field1191; // L: 232 - this.field1191 = var8; // L: 233 + int[] var8 = this.field1236; // L: 231 + this.field1236 = this.field1233; // L: 232 + this.field1233 = var8; // L: 233 } if (var1 != null) { // L: 235 @@ -469,11 +463,24 @@ 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.field1205[var7] = 0; // L: 243 + this.field1236[var7] = 0; // L: 243 } } } } } // L: 248 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "27409" + ) + static void method2217() { + ByteArrayPool.field4212.clear(); // L: 61 + ByteArrayPool.field4212.add(100); // L: 62 + ByteArrayPool.field4212.add(5000); // L: 63 + ByteArrayPool.field4212.add(10000); // L: 64 + ByteArrayPool.field4212.add(30000); // L: 65 + } // L: 66 } diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index 51aa1794e6..60ee08361b 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -4,89 +4,91 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pe") +@ObfuscatedName("pj") @Implements("LoginType") public class LoginType { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lpe;" + descriptor = "Lpj;" ) @Export("oldscape") public static final LoginType oldscape; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lpe;" - ) - static final LoginType field4556; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lpe;" - ) - static final LoginType field4550; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lpe;" - ) - static final LoginType field4552; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lpe;" - ) - static final LoginType field4551; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lpe;" - ) - static final LoginType field4548; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lpe;" - ) - static final LoginType field4554; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lpe;" - ) - static final LoginType field4553; @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lpe;" + descriptor = "Lpj;" ) - public static final LoginType field4555; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 475165021 + static final LoginType field4612; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lpj;" ) - final int field4557; + static final LoginType field4610; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lpj;" + ) + static final LoginType field4615; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lpj;" + ) + static final LoginType field4611; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lpj;" + ) + static final LoginType field4613; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lpj;" + ) + static final LoginType field4614; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lpj;" + ) + static final LoginType field4609; @ObfuscatedName("r") - final String field4558; + @ObfuscatedSignature( + descriptor = "Lpj;" + ) + public static final LoginType field4616; + @ObfuscatedName("gl") + static int[] field4619; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 2054125157 + ) + final int field4617; + @ObfuscatedName("y") + final String field4618; static { - oldscape = new LoginType(7, 0, "", ""); // L: 5 - field4556 = new LoginType(5, 1, "", ""); // L: 6 - field4550 = new LoginType(4, 2, "", ""); // L: 7 - field4552 = new LoginType(2, 3, "", ""); // L: 8 - field4551 = new LoginType(8, 4, "", ""); // L: 9 - field4548 = new LoginType(1, 5, "", ""); // L: 10 - field4554 = new LoginType(6, 6, "", ""); // L: 11 - field4553 = new LoginType(3, 7, "", ""); // L: 12 - field4555 = new LoginType(0, -1, "", "", true, new LoginType[]{oldscape, field4556, field4550, field4551, field4552}); // L: 13 + oldscape = new LoginType(3, 0, "", ""); // L: 5 + field4612 = new LoginType(1, 1, "", ""); // L: 6 + field4610 = new LoginType(2, 2, "", ""); // L: 7 + field4615 = new LoginType(4, 3, "", ""); // L: 8 + field4611 = new LoginType(6, 4, "", ""); // L: 9 + field4613 = new LoginType(0, 5, "", ""); // L: 10 + field4614 = new LoginType(8, 6, "", ""); // L: 11 + field4609 = new LoginType(7, 7, "", ""); // L: 12 + field4616 = new LoginType(5, -1, "", "", true, new LoginType[]{oldscape, field4612, field4610, field4611, field4615}); // L: 13 } LoginType(int var1, int var2, String var3, String var4) { - this.field4557 = var1; // L: 18 - this.field4558 = var4; // L: 19 + this.field4617 = var1; // L: 18 + this.field4618 = var4; // L: 19 } // L: 20 @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lpe;)V" + descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lpj;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.field4557 = var1; // L: 23 - this.field4558 = var4; // L: 24 + this.field4617 = var1; // L: 23 + this.field4618 = var4; // L: 24 } // L: 25 public String toString() { - return this.field4558; // L: 28 + return this.field4618; // L: 29 } } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index d962449327..2a140533eb 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -4,116 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ba") +@ObfuscatedName("bv") @Implements("MenuAction") public class MenuAction { - @ObfuscatedName("pz") - @ObfuscatedSignature( - descriptor = "Lfo;" - ) - @Export("mouseWheel") - static class158 mouseWheel; - @ObfuscatedName("v") + @ObfuscatedName("b") + static int[] field866; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1429096249 + intValue = 912945925 ) @Export("param0") int param0; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 2131658559 + intValue = 1803529141 ) @Export("param1") int param1; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1741045209 + intValue = 1012533909 ) @Export("opcode") int opcode; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1117975603 + intValue = 1732693837 ) @Export("identifier") int identifier; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("action") String action; MenuAction() { - } // L: 12699 + } // L: 12749 - @ObfuscatedName("hk") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "942696763" + descriptor = "(IIB)Z", + garbageValue = "32" ) - static final void method1907() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7751 7752 7795 - if (var0.hitpoints > 0) { // L: 7753 - --var0.hitpoints; - } - - boolean var1; - int var2; - int var3; - ObjectComposition var4; - if (var0.hitpoints == 0) { // L: 7754 - if (var0.objectId >= 0) { // L: 7756 - var2 = var0.objectId; // L: 7758 - var3 = var0.field1105; // L: 7759 - var4 = class146.getObjectDefinition(var2); // L: 7761 - if (var3 == 11) { // L: 7762 - var3 = 10; - } - - if (var3 >= 5 && var3 <= 8) { // L: 7763 - var3 = 4; - } - - var1 = var4.method3664(var3); // L: 7764 - if (!var1) { // L: 7766 - continue; - } - } - - ClanChannel.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field1104, var0.field1105); // L: 7768 - var0.remove(); // L: 7769 - } else { - if (var0.delay > 0) { // L: 7773 - --var0.delay; - } - - if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102) { // L: 7774 - if (var0.id >= 0) { // L: 7776 - var2 = var0.id; // L: 7778 - var3 = var0.field1107; // L: 7779 - var4 = class146.getObjectDefinition(var2); // L: 7781 - if (var3 == 11) { // L: 7782 - var3 = 10; - } - - if (var3 >= 5 && var3 <= 8) { // L: 7783 - var3 = 4; - } - - var1 = var4.method3664(var3); // L: 7784 - if (!var1) { // L: 7786 - continue; - } - } - - ClanChannel.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field1107); // L: 7788 - var0.delay = -1; // L: 7789 - if (var0.id == var0.objectId && var0.objectId == -1) { // L: 7790 - var0.remove(); - } else if (var0.id == var0.objectId && var0.orientation == var0.field1104 && var0.field1105 == var0.field1107) { // L: 7791 - var0.remove(); - } - } - } - } - - } // L: 7797 + public static boolean method1880(int var0, int var1) { + return (var0 >> var1 + 1 & 1) != 0; // L: 9 + } } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 866c597c52..9bad81829f 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -1,80 +1,83 @@ -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("be") +@ObfuscatedName("bo") @Implements("Message") public class Message extends DualNode { - @ObfuscatedName("eb") - @ObfuscatedSignature( - descriptor = "Llx;" - ) - @Export("archive11") - static Archive archive11; - @ObfuscatedName("v") + @ObfuscatedName("tj") @ObfuscatedGetter( - intValue = 1496139277 + intValue = -126703041 + ) + static int field469; + @ObfuscatedName("ec") + @ObfuscatedSignature( + descriptor = "Lle;" + ) + @Export("archive5") + static Archive archive5; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 2133469117 ) @Export("count") int count; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1765114105 + intValue = -1640607835 ) @Export("cycle") int cycle; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -820996673 + intValue = -1762197281 ) @Export("type") int type; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("sender") String sender; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lqb;" + descriptor = "Lqv;" ) @Export("senderUsername") Username senderUsername; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnq;" ) @Export("isFromFriend0") TriBool isFromFriend0; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnq;" ) @Export("isFromIgnored0") TriBool isFromIgnored0; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("prefix") String prefix; - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("text") String text; Message(int var1, String var2, String var3, String var4) { this.isFromFriend0 = TriBool.TriBool_unknown; // L: 13 - this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 14 + this.isFromIgnored0 = TriBool.TriBool_unknown; this.set(var1, var2, var3, var4); // L: 19 } // L: 20 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", - garbageValue = "-56" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "1537190698" ) @Export("set") void set(int var1, String var2, String var3, String var4) { - int var5 = ++Messages.Messages_count - 1; + int var5 = ++Messages.Messages_count - 1; // L: 25 this.count = var5; // L: 27 this.cycle = Client.cycle; this.type = var1; @@ -84,56 +87,56 @@ public class Message extends DualNode { this.text = var4; this.clearIsFromFriend(); this.clearIsFromIgnored(); - } + } // L: 36 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1771611339" + garbageValue = "1779773713" ) @Export("clearIsFromFriend") void clearIsFromFriend() { this.isFromFriend0 = TriBool.TriBool_unknown; // L: 39 } // L: 40 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "46" + garbageValue = "61" ) @Export("isFromFriend") final boolean isFromFriend() { - if (this.isFromFriend0 == TriBool.TriBool_unknown) { + if (this.isFromFriend0 == TriBool.TriBool_unknown) { // L: 43 this.fillIsFromFriend(); // L: 44 } - return this.isFromFriend0 == TriBool.TriBool_true; + return this.isFromFriend0 == TriBool.TriBool_true; // L: 46 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-799651703" + garbageValue = "402871861" ) @Export("fillIsFromFriend") void fillIsFromFriend() { - this.isFromFriend0 = Decimator.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 50 + this.isFromFriend0 = BufferedSource.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 50 } // L: 51 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1801173346" + descriptor = "(B)V", + garbageValue = "-87" ) @Export("clearIsFromIgnored") void clearIsFromIgnored() { this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 54 } // L: 55 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1804603647" + garbageValue = "1909676695" ) @Export("isFromIgnored") final boolean isFromIgnored() { @@ -144,83 +147,74 @@ public class Message extends DualNode { return this.isFromIgnored0 == TriBool.TriBool_true; // L: 61 } - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "206265672" + garbageValue = "1418350386" ) @Export("fillIsFromIgnored") void fillIsFromIgnored() { - this.isFromIgnored0 = Decimator.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 65 + this.isFromIgnored0 = BufferedSource.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 65 } // L: 66 - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1910614922" + garbageValue = "604155557" ) @Export("fillSenderUsername") final void fillSenderUsername() { - if (this.sender != null) { - this.senderUsername = new Username(class160.method3280(this.sender), class122.loginType); // L: 69 + if (this.sender != null) { // L: 69 + this.senderUsername = new Username(class150.method3026(this.sender), class391.loginType); } else { this.senderUsername = null; // L: 70 } } // L: 71 - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/io/File;", - garbageValue = "-717808877" + descriptor = "(III)I", + garbageValue = "786721157" ) - @Export("getFile") - static File getFile(String var0) { - if (!FileSystem.FileSystem_hasPermissions) { // L: 22 - throw new RuntimeException(""); + static int method1079(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14 + if (var2 == null) { // L: 15 + return -1; } else { - File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); // L: 23 - if (var1 != null) { // L: 24 - return var1; - } else { - File var2 = new File(class120.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 - } - } + return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17 } } - @ObfuscatedName("f") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)[Lkt;", - garbageValue = "620716737" + descriptor = "(II)Lgi;", + garbageValue = "-1137848227" ) - public static StudioGame[] method1116() { - return new StudioGame[]{StudioGame.oldscape, StudioGame.game4, StudioGame.runescape, StudioGame.game3, StudioGame.game5, StudioGame.stellardawn}; // L: 17 + public static FloorOverlayDefinition method1098(int var0) { + FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); // L: 28 + if (var1 != null) { // L: 29 + return var1; + } else { + byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); // L: 30 + var1 = new FloorOverlayDefinition(); // L: 31 + if (var2 != null) { // L: 32 + var1.decode(new Buffer(var2), var0); + } + + var1.postDecode(); // L: 33 + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); // L: 34 + return var1; // L: 35 + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(IZI)Ljava/lang/String;", + garbageValue = "15280176" + ) + @Export("intToString") + public static String intToString(int var0, boolean var1) { + return var1 && var0 >= 0 ? class152.method3046(var0, 10, var1) : Integer.toString(var0); // L: 106 107 } } diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index afa11228ef..859a6410da 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -6,35 +6,31 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ce") +@Deprecated +@ObfuscatedName("ch") @Implements("Messages") public class Messages { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("Messages_channels") static final Map Messages_channels; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "Lpt;" ) @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lmr;" + descriptor = "Lma;" ) @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1887673835 + intValue = -501470971 ) @Export("Messages_count") static int Messages_count; - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "Lkt;" - ) - static StudioGame field1305; static { Messages_channels = new HashMap(); // L: 9 @@ -42,23 +38,4 @@ public class Messages { Messages_queue = new IterableDualNodeQueue(); // L: 11 Messages_count = 0; // L: 12 } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-2020687752" - ) - @Export("Login_promptCredentials") - static void Login_promptCredentials(boolean var0) { - Login.Login_response1 = ""; // L: 1123 - Login.Login_response2 = "Enter your username/email & password."; // L: 1124 - Login.Login_response3 = ""; // L: 1125 - Ignored.method6828(2); // L: 1126 - if (var0) { // L: 1127 - Login.Login_password = ""; - } - - Players.method2421(); // L: 1128 - class12.method157(); // L: 1129 - } // L: 1130 } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index 02dafdc247..e211e7fb35 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -3,38 +3,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jk") +@ObfuscatedName("je") @Implements("MidiFileReader") public class MidiFileReader { - @ObfuscatedName("o") - static final byte[] field3215; @ObfuscatedName("v") + static final byte[] field3280; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lpi;" + descriptor = "Lpx;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("division") int division; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("trackStarts") int[] trackStarts; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("trackPositions") int[] trackPositions; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("trackLengths") int[] trackLengths; - @ObfuscatedName("n") - int[] field3210; - @ObfuscatedName("s") - int field3212; - @ObfuscatedName("q") - long field3214; + @ObfuscatedName("m") + int[] field3276; + @ObfuscatedName("p") + int field3281; + @ObfuscatedName("r") + long field3279; static { - field3215 = 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 + field3280 = 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) { @@ -46,14 +46,14 @@ public class MidiFileReader { this.buffer = new Buffer((byte[])null); // L: 8 } // L: 23 - @ObfuscatedName("v") + @ObfuscatedName("o") @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.field3212 = 500000; // L: 37 + this.field3281 = 500000; // L: 37 this.trackStarts = new int[var2]; // L: 38 Buffer var10000; @@ -70,7 +70,7 @@ public class MidiFileReader { var10000 = this.buffer; // L: 46 } - this.field3214 = 0L; // L: 48 + this.field3279 = 0L; // L: 48 this.trackPositions = new int[var2]; // L: 49 for (var3 = 0; var3 < var2; ++var3) { // L: 50 @@ -78,50 +78,50 @@ public class MidiFileReader { } this.trackLengths = new int[var2]; // L: 51 - this.field3210 = new int[var2]; // L: 52 + this.field3276 = new int[var2]; // L: 52 } // L: 53 - @ObfuscatedName("c") + @ObfuscatedName("q") @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.field3210 = null; // L: 60 + this.field3276 = null; // L: 60 } // L: 61 - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("isReady") boolean isReady() { return this.buffer.array != null; // L: 64 } - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("trackCount") int trackCount() { return this.trackPositions.length; // L: 68 } - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("gotoTrack") void gotoTrack(int var1) { this.buffer.offset = this.trackPositions[var1]; // L: 72 } // L: 73 - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("markTrackPosition") void markTrackPosition(int var1) { this.trackPositions[var1] = this.buffer.offset; // L: 76 } // L: 77 - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("setTrackDone") void setTrackDone() { this.buffer.offset = -1; // L: 80 } // L: 81 - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("readTrackLength") void readTrackLength(int var1) { int var2 = this.buffer.readVarInt(); // L: 84 @@ -129,36 +129,36 @@ public class MidiFileReader { var10000[var1] += var2; // L: 85 } // L: 86 - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("readMessage") int readMessage(int var1) { int var2 = this.readMessage0(var1); // L: 89 return var2; // L: 90 } - @ObfuscatedName("o") + @ObfuscatedName("v") @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.field3210[var1] = var5; // L: 97 + this.field3276[var1] = var5; // L: 97 ++this.buffer.offset; // L: 98 } else { - var5 = this.field3210[var1]; // L: 101 + var5 = this.field3276[var1]; // L: 101 } if (var5 != 240 && var5 != 247) { // L: 103 - return this.method5379(var1, var5); // L: 116 + return this.method5221(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.field3210[var1] = var4; // L: 109 - return this.method5379(var1, var4); // L: 110 + this.field3276[var1] = var4; // L: 109 + return this.method5221(var1, var4); // L: 110 } } @@ -168,8 +168,8 @@ public class MidiFileReader { } } - @ObfuscatedName("r") - int method5379(int var1, int var2) { + @ObfuscatedName("y") + int method5221(int var1, int var2) { int var4; if (var2 == 255) { // L: 120 int var7 = this.buffer.readUnsignedByte(); // L: 121 @@ -183,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.field3214 += (long)var6 * (long)(this.field3212 - var5); // L: 131 - this.field3212 = var5; // L: 132 + this.field3279 += (long)var6 * (long)(this.field3281 - var5); // L: 131 + this.field3281 = var5; // L: 132 var10000 = this.buffer; // L: 133 var10000.offset += var4; return 2; // L: 134 @@ -194,7 +194,7 @@ public class MidiFileReader { return 3; // L: 137 } } else { - byte var3 = field3215[var2 - 128]; // L: 139 + byte var3 = field3280[var2 - 128]; // L: 139 var4 = var2; // L: 140 if (var3 >= 1) { // L: 141 var4 = var2 | this.buffer.readUnsignedByte() << 8; @@ -208,9 +208,9 @@ public class MidiFileReader { } } - @ObfuscatedName("p") - long method5393(int var1) { - return this.field3214 + (long)var1 * (long)this.field3212; // L: 147 + @ObfuscatedName("c") + long method5227(int var1) { + return this.field3279 + (long)var1 * (long)this.field3281; // L: 147 } @ObfuscatedName("w") @@ -230,7 +230,7 @@ public class MidiFileReader { return var2; // L: 161 } - @ObfuscatedName("k") + @ObfuscatedName("b") @Export("isDone") boolean isDone() { int var1 = this.trackPositions.length; // L: 165 @@ -244,15 +244,15 @@ public class MidiFileReader { return true; // L: 167 } - @ObfuscatedName("d") + @ObfuscatedName("t") @Export("reset") void reset(long var1) { - this.field3214 = var1; // L: 171 + this.field3279 = 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.field3210[var4] = 0; // L: 175 + this.field3276[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 a4c025a6d2..9d4f9f705d 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -4,155 +4,155 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ji") +@ObfuscatedName("jw") @Implements("MidiPcmStream") public class MidiPcmStream extends PcmStream { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lpo;" + descriptor = "Lpv;" ) @Export("musicPatches") NodeHashTable musicPatches; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -748679043 - ) - int field3179; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1077722431 - ) - int field3180; - @ObfuscatedName("f") - int[] field3181; - @ObfuscatedName("b") - int[] field3203; - @ObfuscatedName("n") - int[] field3183; - @ObfuscatedName("s") - int[] field3184; - @ObfuscatedName("l") - int[] field3185; @ObfuscatedName("q") - int[] field3178; - @ObfuscatedName("o") - int[] field3187; - @ObfuscatedName("r") - int[] field3186; - @ObfuscatedName("p") - int[] field3182; - @ObfuscatedName("x") - int[] field3193; + @ObfuscatedGetter( + intValue = -1448190869 + ) + int field3243; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 830339397 + ) + int field3264; + @ObfuscatedName("k") + int[] field3245; @ObfuscatedName("a") - int[] field3202; + int[] field3246; + @ObfuscatedName("m") + int[] field3269; + @ObfuscatedName("p") + int[] field3248; + @ObfuscatedName("s") + int[] field3249; + @ObfuscatedName("r") + int[] field3250; + @ObfuscatedName("v") + int[] field3251; @ObfuscatedName("y") - int[] field3192; - @ObfuscatedName("j") - int[] field3189; - @ObfuscatedName("e") - int[] field3194; - @ObfuscatedName("z") - int[] field3195; + int[] field3252; + @ObfuscatedName("c") + int[] field3253; @ObfuscatedName("h") + int[] field3247; + @ObfuscatedName("f") + int[] field3242; + @ObfuscatedName("d") + int[] field3265; + @ObfuscatedName("j") + int[] field3257; + @ObfuscatedName("z") + int[] field3261; + @ObfuscatedName("i") + int[] field3259; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "[[Ljn;" + descriptor = "[[Lji;" ) - MusicPatchNode[][] field3196; - @ObfuscatedName("ae") + MusicPatchNode[][] field3258; + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "[[Ljn;" + descriptor = "[[Lji;" ) - MusicPatchNode[][] field3197; - @ObfuscatedName("aq") + MusicPatchNode[][] field3255; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Ljk;" + descriptor = "Lje;" ) @Export("midiFile") MidiFileReader midiFile; - @ObfuscatedName("aw") - boolean field3199; @ObfuscatedName("am") + boolean field3263; + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 1021655575 + intValue = -2049940197 ) @Export("track") int track; - @ObfuscatedName("ak") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -1014777517 + intValue = -124001117 ) @Export("trackLength") int trackLength; - @ObfuscatedName("ao") - @ObfuscatedGetter( - longValue = -4285151308752849057L - ) - long field3188; @ObfuscatedName("aj") @ObfuscatedGetter( - longValue = 1303107017095870899L + longValue = -8059779539702401793L ) - long field3205; - @ObfuscatedName("al") + long field3266; + @ObfuscatedName("ae") + @ObfuscatedGetter( + longValue = 127445036892202121L + ) + long field3267; + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Ljt;" + descriptor = "Ljv;" ) @Export("patchStream") MusicPatchPcmStream patchStream; public MidiPcmStream() { - this.field3179 = 256; // L: 14 - this.field3180 = 1000000; // L: 15 - this.field3181 = new int[16]; // L: 16 - this.field3203 = new int[16]; // L: 17 - this.field3183 = new int[16]; // L: 18 - this.field3184 = new int[16]; // L: 19 - this.field3185 = new int[16]; // L: 20 - this.field3178 = new int[16]; // L: 21 - this.field3187 = new int[16]; // L: 22 - this.field3186 = new int[16]; // L: 23 - this.field3182 = new int[16]; // L: 24 - this.field3193 = new int[16]; // L: 28 - this.field3202 = new int[16]; // L: 29 - this.field3192 = new int[16]; // L: 30 - this.field3189 = new int[16]; // L: 31 - this.field3194 = new int[16]; // L: 32 - this.field3195 = new int[16]; // L: 33 - this.field3196 = new MusicPatchNode[16][128]; - this.field3197 = new MusicPatchNode[16][128]; - this.midiFile = new MidiFileReader(); + this.field3243 = 256; // L: 14 + this.field3264 = 1000000; // L: 15 + this.field3245 = new int[16]; // L: 16 + this.field3246 = new int[16]; // L: 17 + this.field3269 = new int[16]; // L: 18 + this.field3248 = new int[16]; // L: 19 + this.field3249 = new int[16]; // L: 20 + this.field3250 = new int[16]; // L: 21 + this.field3251 = new int[16]; // L: 22 + this.field3252 = new int[16]; // L: 23 + this.field3253 = new int[16]; // L: 24 + this.field3247 = new int[16]; // L: 28 + this.field3242 = new int[16]; // L: 29 + this.field3265 = new int[16]; // L: 30 + this.field3257 = new int[16]; // L: 31 + this.field3261 = new int[16]; // L: 32 + this.field3259 = new int[16]; // L: 33 + this.field3258 = new MusicPatchNode[16][128]; // L: 34 + this.field3255 = new MusicPatchNode[16][128]; // L: 35 + this.midiFile = new MidiFileReader(); // L: 36 this.patchStream = new MusicPatchPcmStream(this); // L: 42 this.musicPatches = new NodeHashTable(128); // L: 45 - this.method5259(); // L: 46 + this.method5099(); // L: 46 } // L: 47 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" + descriptor = "(IS)V", + garbageValue = "-4293" ) @Export("setPcmStreamVolume") public synchronized void setPcmStreamVolume(int var1) { - this.field3179 = var1; // L: 50 + this.field3243 = var1; // L: 50 } // L: 51 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2127112295" + garbageValue = "1552053459" ) - public int method5264() { - return this.field3179; // L: 54 + public int method5080() { + return this.field3243; // L: 54 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lju;Lln;Lac;IB)Z", - garbageValue = "36" + descriptor = "(Ljy;Llp;Lan;IB)Z", + garbageValue = "-8" ) @Export("loadMusicTrack") - public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { - var1.method5463(); // L: 58 + synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { + var1.method5310(); // L: 58 boolean var5 = true; // L: 59 int[] var6 = null; // L: 60 if (var4 > 0) { // L: 61 @@ -180,7 +180,7 @@ public class MidiPcmStream extends PcmStream { this.musicPatches.put(var10, (long)var8); // L: 80 } - if (!var9.method5427(var3, var7.byteArray, var6)) { // L: 82 + if (!var9.method5272(var3, var7.byteArray, var6)) { // L: 82 var5 = false; } } @@ -192,23 +192,23 @@ public class MidiPcmStream extends PcmStream { return var5; // L: 85 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1039741430" + garbageValue = "1506862644" ) @Export("clearAll") - public synchronized void clearAll() { + synchronized void clearAll() { for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 89 var1.clear(); } } // L: 90 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1531441938" + garbageValue = "-768637497" ) @Export("removeAll") public synchronized void removeAll() { @@ -218,65 +218,65 @@ public class MidiPcmStream extends PcmStream { } // L: 94 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "()Laf;" + descriptor = "()Lao;" ) @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { return this.patchStream; // L: 469 } - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "()Laf;" + descriptor = "()Lao;" ) @Export("nextSubStream") protected synchronized PcmStream nextSubStream() { return null; // L: 473 } - @ObfuscatedName("l") - protected synchronized int vmethod5441() { + @ObfuscatedName("s") + protected synchronized int vmethod5295() { return 0; // L: 477 } - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("fill") protected synchronized void fill(int[] var1, int var2, int var3) { if (this.midiFile.isReady()) { // L: 481 - int var4 = this.midiFile.division * this.field3180 / PcmPlayer.field268; // L: 482 + int var4 = this.midiFile.division * this.field3264 / PcmPlayer.field300; // L: 482 do { - long var5 = this.field3188 + (long)var4 * (long)var3; // L: 484 - if (this.field3205 - var5 >= 0L) { // L: 485 - this.field3188 = var5; // L: 486 + long var5 = this.field3266 + (long)var4 * (long)var3; // L: 484 + if (this.field3267 - var5 >= 0L) { // L: 485 + this.field3266 = var5; // L: 486 break; } - int var7 = (int)((this.field3205 - this.field3188 + (long)var4 - 1L) / (long)var4); // L: 489 - this.field3188 += (long)var4 * (long)var7; // L: 490 + int var7 = (int)((this.field3267 - this.field3266 + (long)var4 - 1L) / (long)var4); // L: 489 + this.field3266 += (long)var7 * (long)var4; // L: 490 this.patchStream.fill(var1, var2, var7); // L: 491 var2 += var7; // L: 492 var3 -= var7; // L: 493 - this.method5272(); // L: 494 + this.method5112(); // L: 494 } while(this.midiFile.isReady()); // L: 495 } this.patchStream.fill(var1, var2, var3); // L: 498 } // L: 499 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lju;ZB)V", - garbageValue = "11" + descriptor = "(Ljy;ZI)V", + garbageValue = "-1388253754" ) @Export("setMusicTrack") - public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { + synchronized void setMusicTrack(MusicTrack var1, boolean var2) { this.clear(); // L: 97 this.midiFile.parse(var1.midi); // L: 98 - this.field3199 = var2; // L: 99 - this.field3188 = 0L; // L: 100 + this.field3263 = var2; // L: 99 + this.field3266 = 0L; // L: 100 int var3 = this.midiFile.trackCount(); // L: 101 for (int var4 = 0; var4 < var3; ++var4) { // L: 102 @@ -287,248 +287,248 @@ public class MidiPcmStream extends PcmStream { this.track = this.midiFile.getPrioritizedTrack(); // L: 107 this.trackLength = this.midiFile.trackLengths[this.track]; // L: 108 - this.field3205 = this.midiFile.method5393(this.trackLength); // L: 109 + this.field3267 = this.midiFile.method5227(this.trackLength); // L: 109 } // L: 110 - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("skip") protected synchronized void skip(int var1) { if (this.midiFile.isReady()) { // L: 502 - int var2 = this.midiFile.division * this.field3180 / PcmPlayer.field268; // L: 503 + int var2 = this.midiFile.division * this.field3264 / PcmPlayer.field300; // L: 503 do { - long var3 = this.field3188 + (long)var2 * (long)var1; // L: 505 - if (this.field3205 - var3 >= 0L) { // L: 506 - this.field3188 = var3; // L: 507 + long var3 = this.field3266 + (long)var1 * (long)var2; // L: 505 + if (this.field3267 - var3 >= 0L) { // L: 506 + this.field3266 = var3; // L: 507 break; } - int var5 = (int)((this.field3205 - this.field3188 + (long)var2 - 1L) / (long)var2); // L: 510 - this.field3188 += (long)var5 * (long)var2; // L: 511 + int var5 = (int)(((long)var2 + (this.field3267 - this.field3266) - 1L) / (long)var2); // L: 510 + this.field3266 += (long)var5 * (long)var2; // L: 511 this.patchStream.skip(var5); // L: 512 var1 -= var5; // L: 513 - this.method5272(); // L: 514 + this.method5112(); // L: 514 } while(this.midiFile.isReady()); // L: 515 } this.patchStream.skip(var1); // L: 518 } // L: 519 - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "867852143" + descriptor = "(S)V", + garbageValue = "187" ) @Export("clear") public synchronized void clear() { this.midiFile.clear(); // L: 113 - this.method5259(); // L: 114 + this.method5099(); // L: 114 } // L: 115 @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-39" + descriptor = "(I)Z", + garbageValue = "-1853291213" ) @Export("isReady") public synchronized boolean isReady() { return this.midiFile.isReady(); // L: 118 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIS)V", - garbageValue = "-25295" + descriptor = "(III)V", + garbageValue = "1725996416" ) - public synchronized void method5248(int var1, int var2) { - this.method5249(var1, var2); // L: 122 + public synchronized void method5151(int var1, int var2) { + this.method5184(var1, var2); // L: 122 } // L: 123 - @ObfuscatedName("d") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "2146989537" + garbageValue = "-201628098" ) - void method5249(int var1, int var2) { - this.field3184[var1] = var2; // L: 126 - this.field3178[var1] = var2 & -128; // L: 127 - this.method5250(var1, var2); // L: 128 + void method5184(int var1, int var2) { + this.field3248[var1] = var2; // L: 126 + this.field3250[var1] = var2 & -128; // L: 127 + this.method5089(var1, var2); // L: 128 } // L: 129 - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1072257688" + garbageValue = "-1928331958" ) - void method5250(int var1, int var2) { - if (var2 != this.field3185[var1]) { // L: 132 - this.field3185[var1] = var2; // L: 133 + void method5089(int var1, int var2) { + if (var2 != this.field3249[var1]) { // L: 132 + this.field3249[var1] = var2; // L: 133 for (int var3 = 0; var3 < 128; ++var3) { // L: 134 - this.field3197[var1][var3] = null; + this.field3255[var1][var3] = null; } } } // L: 136 - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "887672121" + garbageValue = "-1114673013" ) - void method5251(int var1, int var2, int var3) { - this.method5252(var1, var2, 64); // L: 139 - if ((this.field3193[var1] & 2) != 0) { // L: 140 + void method5212(int var1, int var2, int var3) { + this.method5160(var1, var2, 64); // L: 139 + if ((this.field3247[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.field3248 == var1 && var4.field3249 < 0) { // L: 142 - this.field3196[var1][var4.field3251] = null; // L: 143 - this.field3196[var1][var2] = var4; // L: 144 - int var8 = (var4.field3245 * var4.field3244 >> 12) + var4.field3243; // L: 145 - var4.field3243 += var2 - var4.field3251 << 8; // L: 146 - var4.field3244 = var8 - var4.field3243; // L: 147 - var4.field3245 = 4096; // L: 148 - var4.field3251 = var2; // L: 149 + if (var4.field3308 == var1 && var4.field3316 < 0) { // L: 142 + this.field3258[var1][var4.field3307] = null; // L: 143 + this.field3258[var1][var2] = var4; // L: 144 + int var8 = (var4.field3302 * var4.field3309 >> 12) + var4.field3310; // L: 145 + var4.field3310 += var2 - var4.field3307 << 8; // L: 146 + var4.field3309 = var8 - var4.field3310; // L: 147 + var4.field3302 = 4096; // L: 148 + var4.field3307 = var2; // L: 149 return; // L: 150 } } } - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field3185[var1]); // L: 154 + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field3249[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.field3248 = var1; // L: 159 + var6.field3308 = var1; // L: 159 var6.patch = var9; // L: 160 var6.rawSound = var5; // L: 161 - var6.field3247 = var9.field3224[var2]; // L: 162 - var6.field3239 = var9.field3220[var2]; // L: 163 - var6.field3251 = var2; // L: 164 - var6.field3241 = var3 * var3 * var9.field3223[var2] * var9.field3228 + 1024 >> 11; // L: 165 - var6.field3242 = var9.field3222[var2] & 255; // L: 166 - var6.field3243 = (var2 << 8) - (var9.field3227[var2] & 32767); // L: 167 - var6.field3246 = 0; // L: 168 - var6.field3235 = 0; // L: 169 - var6.field3252 = 0; // L: 170 - var6.field3249 = -1; // L: 171 - var6.field3250 = 0; // L: 172 - if (this.field3189[var1] == 0) { // L: 173 - var6.stream = RawPcmStream.method791(var5, this.method5246(var6), this.method5244(var6), this.method5302(var6)); // L: 174 + var6.field3306 = var9.field3291[var2]; // L: 162 + var6.field3319 = var9.field3285[var2]; // L: 163 + var6.field3307 = var2; // L: 164 + var6.field3311 = var3 * var3 * var9.field3290[var2] * var9.field3288 + 1024 >> 11; // L: 165 + var6.field3312 = var9.field3289[var2] & 255; // L: 166 + var6.field3310 = (var2 << 8) - (var9.field3287[var2] & 32767); // L: 167 + var6.field3313 = 0; // L: 168 + var6.field3314 = 0; // L: 169 + var6.field3315 = 0; // L: 170 + var6.field3316 = -1; // L: 171 + var6.field3317 = 0; // L: 172 + if (this.field3257[var1] == 0) { // L: 173 + var6.stream = RawPcmStream.method829(var5, this.method5141(var6), this.method5105(var6), this.method5106(var6)); // L: 174 } else { - var6.stream = RawPcmStream.method791(var5, this.method5246(var6), 0, this.method5302(var6)); // L: 177 - this.method5342(var6, var9.field3227[var2] < 0); // L: 178 + var6.stream = RawPcmStream.method829(var5, this.method5141(var6), 0, this.method5106(var6)); // L: 177 + this.method5091(var6, var9.field3287[var2] < 0); // L: 178 } - if (var9.field3227[var2] < 0) { // L: 180 + if (var9.field3287[var2] < 0) { // L: 180 var6.stream.setNumLoops(-1); } - if (var6.field3239 >= 0) { // L: 181 - MusicPatchNode var7 = this.field3197[var1][var6.field3239]; // L: 182 - if (var7 != null && var7.field3249 < 0) { // L: 183 - this.field3196[var1][var7.field3251] = null; // L: 184 - var7.field3249 = 0; // L: 185 + if (var6.field3319 >= 0) { // L: 181 + MusicPatchNode var7 = this.field3255[var1][var6.field3319]; // L: 182 + if (var7 != null && var7.field3316 < 0) { // L: 183 + this.field3258[var1][var7.field3307] = null; // L: 184 + var7.field3316 = 0; // L: 185 } - this.field3197[var1][var6.field3239] = var6; // L: 187 + this.field3255[var1][var6.field3319] = var6; // L: 187 } this.patchStream.queue.addFirst(var6); // L: 189 - this.field3196[var1][var2] = var6; // L: 190 + this.field3258[var1][var2] = var6; // L: 190 } } } // L: 191 - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljn;ZI)V", - garbageValue = "2081023106" + descriptor = "(Lji;ZI)V", + garbageValue = "1848917000" ) - void method5342(MusicPatchNode var1, boolean var2) { + void method5091(MusicPatchNode var1, boolean var2) { int var3 = var1.rawSound.samples.length; // L: 194 int var4; - if (var2 && var1.rawSound.field254) { // L: 196 + if (var2 && var1.rawSound.field266) { // L: 196 int var5 = var3 + var3 - var1.rawSound.start; // L: 197 - var4 = (int)((long)var5 * (long)this.field3189[var1.field3248] >> 6); // L: 198 + var4 = (int)((long)this.field3257[var1.field3308] * (long)var5 >> 6); // L: 198 var3 <<= 8; // L: 199 if (var4 >= var3) { // L: 200 var4 = var3 + var3 - 1 - var4; // L: 201 - var1.stream.method800(); // L: 202 + var1.stream.method811(); // L: 202 } } else { - var4 = (int)((long)this.field3189[var1.field3248] * (long)var3 >> 6); // L: 206 + var4 = (int)((long)var3 * (long)this.field3257[var1.field3308] >> 6); // L: 206 } - var1.stream.method799(var4); // L: 208 + var1.stream.method807(var4); // L: 208 } // L: 209 - @ObfuscatedName("g") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IIIS)V", - garbageValue = "-1455" + descriptor = "(IIIB)V", + garbageValue = "-59" ) - void method5252(int var1, int var2, int var3) { - MusicPatchNode var4 = this.field3196[var1][var2]; // L: 212 + void method5160(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field3258[var1][var2]; // L: 212 if (var4 != null) { // L: 213 - this.field3196[var1][var2] = null; // L: 214 - if ((this.field3193[var1] & 2) != 0) { // L: 215 + this.field3258[var1][var2] = null; // L: 214 + if ((this.field3247[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.field3248 == var4.field3248 && var5.field3249 < 0 && var5 != var4) { // L: 217 - var4.field3249 = 0; // L: 218 + if (var4.field3308 == var5.field3308 && var5.field3316 < 0 && var5 != var4) { // L: 217 + var4.field3316 = 0; // L: 218 break; // L: 219 } } } else { - var4.field3249 = 0; // L: 224 + var4.field3316 = 0; // L: 224 } } } // L: 226 - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "94" + descriptor = "(IIII)V", + garbageValue = "823222013" ) - void method5253(int var1, int var2, int var3) { + void method5093(int var1, int var2, int var3) { } // L: 228 - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1226196956" + garbageValue = "-750627525" ) - void method5254(int var1, int var2) { + void method5087(int var1, int var2) { } // L: 229 - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IIS)V", - garbageValue = "-18394" + descriptor = "(III)V", + garbageValue = "-926778021" ) - void method5255(int var1, int var2) { - this.field3187[var1] = var2; // L: 232 + void method5095(int var1, int var2) { + this.field3251[var1] = var2; // L: 232 } // L: 233 @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "74" + garbageValue = "-25" ) - void method5256(int var1) { + void method5096(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 236 - if (var1 < 0 || var2.field3248 == var1) { // L: 237 + if (var1 < 0 || var2.field3308 == var1) { // L: 237 if (var2.stream != null) { // L: 238 - var2.stream.method882(PcmPlayer.field268 / 100); // L: 239 - if (var2.stream.method808()) { // L: 240 + var2.stream.method812(PcmPlayer.field300 / 100); // L: 239 + if (var2.stream.method935()) { // L: 240 this.patchStream.mixer.addSubStream(var2.stream); } - var2.method5473(); // L: 241 + var2.method5316(); // L: 241 } - if (var2.field3249 < 0) { // L: 243 - this.field3196[var2.field3248][var2.field3251] = null; + if (var2.field3316 < 0) { // L: 243 + this.field3258[var2.field3308][var2.field3307] = null; } var2.remove(); // L: 244 @@ -537,107 +537,107 @@ public class MidiPcmStream extends PcmStream { } // L: 247 - @ObfuscatedName("aj") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1161401652" + garbageValue = "-1406320585" ) - void method5257(int var1) { + void method5120(int var1) { if (var1 >= 0) { // L: 250 - this.field3181[var1] = 12800; // L: 254 - this.field3203[var1] = 8192; // L: 255 - this.field3183[var1] = 16383; // L: 256 - this.field3187[var1] = 8192; // L: 257 - this.field3186[var1] = 0; // L: 258 - this.field3182[var1] = 8192; // L: 259 - this.method5260(var1); // L: 260 - this.method5261(var1); // L: 261 - this.field3193[var1] = 0; // L: 262 - this.field3202[var1] = 32767; // L: 263 - this.field3192[var1] = 256; // L: 264 - this.field3189[var1] = 0; // L: 265 - this.method5303(var1, 8192); // L: 266 + this.field3245[var1] = 12800; // L: 254 + this.field3246[var1] = 8192; // L: 255 + this.field3269[var1] = 16383; // L: 256 + this.field3251[var1] = 8192; // L: 257 + this.field3252[var1] = 0; // L: 258 + this.field3253[var1] = 8192; // L: 259 + this.method5100(var1); // L: 260 + this.method5101(var1); // L: 261 + this.field3247[var1] = 0; // L: 262 + this.field3242[var1] = 32767; // L: 263 + this.field3265[var1] = 256; // L: 264 + this.field3257[var1] = 0; // L: 265 + this.method5138(var1, 8192); // L: 266 } else { for (var1 = 0; var1 < 16; ++var1) { // L: 251 - this.method5257(var1); + this.method5120(var1); } } } // L: 252 267 - @ObfuscatedName("al") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1206801353" + descriptor = "(IB)V", + garbageValue = "3" ) - void method5258(int var1) { + void method5098(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 270 - if ((var1 < 0 || var2.field3248 == var1) && var2.field3249 < 0) { // L: 271 272 - this.field3196[var2.field3248][var2.field3251] = null; // L: 273 - var2.field3249 = 0; // L: 274 + if ((var1 < 0 || var2.field3308 == var1) && var2.field3316 < 0) { // L: 271 272 + this.field3258[var2.field3308][var2.field3307] = null; // L: 273 + var2.field3316 = 0; // L: 274 } } } // L: 278 - @ObfuscatedName("at") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1660389199" + garbageValue = "1766234512" ) - void method5259() { - this.method5256(-1); // L: 281 - this.method5257(-1); // L: 282 + void method5099() { + this.method5096(-1); // L: 281 + this.method5120(-1); // L: 282 int var1; for (var1 = 0; var1 < 16; ++var1) { // L: 283 - this.field3185[var1] = this.field3184[var1]; + this.field3249[var1] = this.field3248[var1]; } for (var1 = 0; var1 < 16; ++var1) { // L: 284 - this.field3178[var1] = this.field3184[var1] & -128; + this.field3250[var1] = this.field3248[var1] & -128; } } // L: 285 - @ObfuscatedName("an") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" + descriptor = "(II)V", + garbageValue = "1091575779" ) - void method5260(int var1) { - if ((this.field3193[var1] & 2) != 0) { // L: 288 + void method5100(int var1) { + if ((this.field3247[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.field3248 == var1 && this.field3196[var1][var2.field3251] == null && var2.field3249 < 0) { // L: 290 291 - var2.field3249 = 0; + if (var2.field3308 == var1 && this.field3258[var1][var2.field3307] == null && var2.field3316 < 0) { // L: 290 291 + var2.field3316 = 0; } } } } // L: 295 - @ObfuscatedName("ay") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "527815614" + garbageValue = "1548994766" ) - void method5261(int var1) { - if ((this.field3193[var1] & 4) != 0) { // L: 298 + void method5101(int var1) { + if ((this.field3247[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.field3248 == var1) { // L: 300 - var2.field3238 = 0; + if (var2.field3308 == var1) { // L: 300 + var2.field3322 = 0; } } } } // L: 303 - @ObfuscatedName("ah") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-455692195" + garbageValue = "181741177" ) - void method5262(int var1) { + void method5102(int var1) { int var2 = var1 & 240; // L: 306 int var3; int var4; @@ -646,289 +646,289 @@ public class MidiPcmStream extends PcmStream { var3 = var1 & 15; // L: 308 var4 = var1 >> 8 & 127; // L: 309 var5 = var1 >> 16 & 127; // L: 310 - this.method5252(var3, var4, var5); // L: 311 + this.method5160(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.method5251(var3, var4, var5); + this.method5212(var3, var4, var5); } else { - this.method5252(var3, var4, 64); // L: 319 + this.method5160(var3, var4, 64); // L: 319 } } else if (var2 == 160) { // L: 322 var3 = var1 & 15; // L: 323 var4 = var1 >> 8 & 127; // L: 324 var5 = var1 >> 16 & 127; // L: 325 - this.method5253(var3, var4, var5); // L: 326 + this.method5093(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.field3178[var3] = (var5 << 14) + (this.field3178[var3] & -2080769); + this.field3250[var3] = (var5 << 14) + (this.field3250[var3] & -2080769); } if (var4 == 32) { // L: 334 - this.field3178[var3] = (var5 << 7) + (this.field3178[var3] & -16257); + this.field3250[var3] = (var5 << 7) + (this.field3250[var3] & -16257); } if (var4 == 1) { // L: 335 - this.field3186[var3] = (var5 << 7) + (this.field3186[var3] & -16257); + this.field3252[var3] = (var5 << 7) + (this.field3252[var3] & -16257); } if (var4 == 33) { // L: 336 - this.field3186[var3] = var5 + (this.field3186[var3] & -128); + this.field3252[var3] = var5 + (this.field3252[var3] & -128); } if (var4 == 5) { // L: 337 - this.field3182[var3] = (var5 << 7) + (this.field3182[var3] & -16257); + this.field3253[var3] = (var5 << 7) + (this.field3253[var3] & -16257); } if (var4 == 37) { // L: 338 - this.field3182[var3] = var5 + (this.field3182[var3] & -128); + this.field3253[var3] = var5 + (this.field3253[var3] & -128); } if (var4 == 7) { // L: 339 - this.field3181[var3] = (var5 << 7) + (this.field3181[var3] & -16257); + this.field3245[var3] = (var5 << 7) + (this.field3245[var3] & -16257); } if (var4 == 39) { // L: 340 - this.field3181[var3] = var5 + (this.field3181[var3] & -128); + this.field3245[var3] = var5 + (this.field3245[var3] & -128); } if (var4 == 10) { // L: 341 - this.field3203[var3] = (var5 << 7) + (this.field3203[var3] & -16257); + this.field3246[var3] = (var5 << 7) + (this.field3246[var3] & -16257); } if (var4 == 42) { // L: 342 - this.field3203[var3] = var5 + (this.field3203[var3] & -128); + this.field3246[var3] = var5 + (this.field3246[var3] & -128); } if (var4 == 11) { // L: 343 - this.field3183[var3] = (var5 << 7) + (this.field3183[var3] & -16257); + this.field3269[var3] = (var5 << 7) + (this.field3269[var3] & -16257); } if (var4 == 43) { // L: 344 - this.field3183[var3] = var5 + (this.field3183[var3] & -128); + this.field3269[var3] = var5 + (this.field3269[var3] & -128); } int[] var10000; if (var4 == 64) { // L: 345 if (var5 >= 64) { // L: 346 - var10000 = this.field3193; + var10000 = this.field3247; var10000[var3] |= 1; } else { - var10000 = this.field3193; // L: 347 + var10000 = this.field3247; // L: 347 var10000[var3] &= -2; } } if (var4 == 65) { // L: 349 if (var5 >= 64) { // L: 350 - var10000 = this.field3193; + var10000 = this.field3247; var10000[var3] |= 2; } else { - this.method5260(var3); // L: 352 - var10000 = this.field3193; // L: 353 + this.method5100(var3); // L: 352 + var10000 = this.field3247; // L: 353 var10000[var3] &= -3; } } if (var4 == 99) { // L: 356 - this.field3202[var3] = (var5 << 7) + (this.field3202[var3] & 127); + this.field3242[var3] = (var5 << 7) + (this.field3242[var3] & 127); } if (var4 == 98) { // L: 357 - this.field3202[var3] = (this.field3202[var3] & 16256) + var5; + this.field3242[var3] = (this.field3242[var3] & 16256) + var5; } if (var4 == 101) { // L: 358 - this.field3202[var3] = (var5 << 7) + (this.field3202[var3] & 127) + 16384; + this.field3242[var3] = (var5 << 7) + (this.field3242[var3] & 127) + 16384; } if (var4 == 100) { // L: 359 - this.field3202[var3] = (this.field3202[var3] & 16256) + var5 + 16384; + this.field3242[var3] = (this.field3242[var3] & 16256) + var5 + 16384; } if (var4 == 120) { // L: 360 - this.method5256(var3); + this.method5096(var3); } if (var4 == 121) { // L: 361 - this.method5257(var3); + this.method5120(var3); } if (var4 == 123) { // L: 362 - this.method5258(var3); + this.method5098(var3); } int var6; if (var4 == 6) { // L: 363 - var6 = this.field3202[var3]; // L: 364 + var6 = this.field3242[var3]; // L: 364 if (var6 == 16384) { // L: 365 - this.field3192[var3] = (var5 << 7) + (this.field3192[var3] & -16257); + this.field3265[var3] = (var5 << 7) + (this.field3265[var3] & -16257); } } if (var4 == 38) { // L: 367 - var6 = this.field3202[var3]; // L: 368 + var6 = this.field3242[var3]; // L: 368 if (var6 == 16384) { // L: 369 - this.field3192[var3] = var5 + (this.field3192[var3] & -128); + this.field3265[var3] = var5 + (this.field3265[var3] & -128); } } if (var4 == 16) { // L: 371 - this.field3189[var3] = (var5 << 7) + (this.field3189[var3] & -16257); + this.field3257[var3] = (var5 << 7) + (this.field3257[var3] & -16257); } if (var4 == 48) { // L: 372 - this.field3189[var3] = var5 + (this.field3189[var3] & -128); + this.field3257[var3] = var5 + (this.field3257[var3] & -128); } if (var4 == 81) { // L: 373 if (var5 >= 64) { // L: 374 - var10000 = this.field3193; + var10000 = this.field3247; var10000[var3] |= 4; } else { - this.method5261(var3); // L: 376 - var10000 = this.field3193; // L: 377 + this.method5101(var3); // L: 376 + var10000 = this.field3247; // L: 377 var10000[var3] &= -5; } } if (var4 == 17) { - this.method5303(var3, (var5 << 7) + (this.field3194[var3] & -16257)); // L: 380 + this.method5138(var3, (var5 << 7) + (this.field3261[var3] & -16257)); // L: 380 } if (var4 == 49) { // L: 381 - this.method5303(var3, var5 + (this.field3194[var3] & -128)); + this.method5138(var3, var5 + (this.field3261[var3] & -128)); } } else if (var2 == 192) { // L: 384 var3 = var1 & 15; // L: 385 var4 = var1 >> 8 & 127; // L: 386 - this.method5250(var3, var4 + this.field3178[var3]); // L: 387 + this.method5089(var3, var4 + this.field3250[var3]); // L: 387 } else if (var2 == 208) { // L: 390 var3 = var1 & 15; // L: 391 var4 = var1 >> 8 & 127; // L: 392 - this.method5254(var3, var4); // L: 393 + this.method5087(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.method5255(var3, var4); // L: 399 + this.method5095(var3, var4); // L: 399 } else { var2 = var1 & 255; // L: 402 if (var2 == 255) { // L: 403 - this.method5259(); // L: 404 + this.method5099(); // L: 404 } } } // L: 312 320 327 382 388 394 400 405 407 - @ObfuscatedName("ac") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "8396929" + garbageValue = "205692091" ) - void method5303(int var1, int var2) { - this.field3194[var1] = var2; // L: 410 - this.field3195[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); // L: 411 + void method5138(int var1, int var2) { + this.field3261[var1] = var2; // L: 410 + this.field3259[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); // L: 411 } // L: 412 - @ObfuscatedName("ab") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Ljn;I)I", - garbageValue = "2132643149" + descriptor = "(Lji;I)I", + garbageValue = "853798741" ) - int method5246(MusicPatchNode var1) { - int var2 = (var1.field3245 * var1.field3244 >> 12) + var1.field3243; // L: 415 - var2 += (this.field3187[var1.field3248] - 8192) * this.field3192[var1.field3248] >> 12; // L: 416 - MusicPatchNode2 var3 = var1.field3247; // L: 417 + int method5141(MusicPatchNode var1) { + int var2 = (var1.field3302 * var1.field3309 >> 12) + var1.field3310; // L: 415 + var2 += (this.field3251[var1.field3308] - 8192) * this.field3265[var1.field3308] >> 12; // L: 416 + MusicPatchNode2 var3 = var1.field3306; // L: 417 int var4; - if (var3.field3166 > 0 && (var3.field3161 > 0 || this.field3186[var1.field3248] > 0)) { // L: 418 - var4 = var3.field3161 << 2; // L: 419 - int var5 = var3.field3167 << 1; // L: 420 - if (var1.field3253 < var5) { // L: 421 - var4 = var4 * var1.field3253 / var5; + if (var3.field3229 > 0 && (var3.field3228 > 0 || this.field3252[var1.field3308] > 0)) { // L: 418 + var4 = var3.field3228 << 2; // L: 419 + int var5 = var3.field3222 << 1; // L: 420 + if (var1.field3318 < var5) { // L: 421 + var4 = var4 * var1.field3318 / var5; } - var4 += this.field3186[var1.field3248] >> 7; // L: 422 - double var6 = Math.sin(0.01227184630308513D * (double)(var1.field3237 & 511)); // L: 423 + var4 += this.field3252[var1.field3308] >> 7; // L: 422 + double var6 = Math.sin((double)(var1.field3304 & 511) * 0.01227184630308513D); // L: 423 var2 += (int)((double)var4 * var6); // L: 424 } - var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)PcmPlayer.field268 + 0.5D); // L: 426 + var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)PcmPlayer.field300 + 0.5D); // L: 426 return var4 < 1 ? 1 : var4; // L: 427 } - @ObfuscatedName("au") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(Ljn;B)I", - garbageValue = "22" + descriptor = "(Lji;I)I", + garbageValue = "-1655765523" ) - int method5244(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.field3247; // L: 431 - int var3 = this.field3181[var1.field3248] * this.field3183[var1.field3248] + 4096 >> 13; // L: 432 + int method5105(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field3306; // L: 431 + int var3 = this.field3269[var1.field3308] * this.field3245[var1.field3308] + 4096 >> 13; // L: 432 var3 = var3 * var3 + 16384 >> 15; // L: 433 - var3 = var3 * var1.field3241 + 16384 >> 15; // L: 434 - var3 = var3 * this.field3179 + 128 >> 8; // L: 435 - if (var2.field3162 > 0) { // L: 436 - var3 = (int)((double)var3 * Math.pow(0.5D, 1.953125E-5D * (double)var1.field3246 * (double)var2.field3162) + 0.5D); // L: 437 + var3 = var3 * var1.field3311 + 16384 >> 15; // L: 434 + var3 = var3 * this.field3243 + 128 >> 8; // L: 435 + if (var2.field3226 > 0) { // L: 436 + var3 = (int)((double)var3 * Math.pow(0.5D, 1.953125E-5D * (double)var1.field3313 * (double)var2.field3226) + 0.5D); // L: 437 } int var4; int var5; int var6; int var7; - if (var2.field3160 != null) { // L: 439 - var4 = var1.field3235; // L: 440 - var5 = var2.field3160[var1.field3252 + 1]; // L: 441 - if (var1.field3252 < var2.field3160.length - 2) { // L: 442 - var6 = (var2.field3160[var1.field3252] & 255) << 8; // L: 443 - var7 = (var2.field3160[var1.field3252 + 2] & 255) << 8; // L: 444 - var5 += (var2.field3160[var1.field3252 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 445 + if (var2.field3232 != null) { // L: 439 + var4 = var1.field3314; // L: 440 + var5 = var2.field3232[var1.field3315 + 1]; // L: 441 + if (var1.field3315 < var2.field3232.length - 2) { // L: 442 + var6 = (var2.field3232[var1.field3315] & 255) << 8; // L: 443 + var7 = (var2.field3232[var1.field3315 + 2] & 255) << 8; // L: 444 + var5 += (var2.field3232[var1.field3315 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 445 } var3 = var3 * var5 + 32 >> 6; // L: 447 } - if (var1.field3249 > 0 && var2.field3165 != null) { // L: 449 - var4 = var1.field3249; // L: 450 - var5 = var2.field3165[var1.field3250 + 1]; // L: 451 - if (var1.field3250 < var2.field3165.length - 2) { // L: 452 - var6 = (var2.field3165[var1.field3250] & 255) << 8; // L: 453 - var7 = (var2.field3165[var1.field3250 + 2] & 255) << 8; // L: 454 - var5 += (var4 - var6) * (var2.field3165[var1.field3250 + 3] - var5) / (var7 - var6); // L: 455 + if (var1.field3316 > 0 && var2.field3223 != null) { // L: 449 + var4 = var1.field3316; // L: 450 + var5 = var2.field3223[var1.field3317 + 1]; // L: 451 + if (var1.field3317 < var2.field3223.length - 2) { // L: 452 + var6 = (var2.field3223[var1.field3317] & 255) << 8; // L: 453 + var7 = (var2.field3223[var1.field3317 + 2] & 255) << 8; // L: 454 + var5 += (var2.field3223[var1.field3317 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 455 } - var3 = var3 * var5 + 32 >> 6; // L: 457 + var3 = var5 * var3 + 32 >> 6; // L: 457 } return var3; // L: 459 } - @ObfuscatedName("af") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ljn;I)I", - garbageValue = "17665426" + descriptor = "(Lji;I)I", + garbageValue = "-1374034074" ) - int method5302(MusicPatchNode var1) { - int var2 = this.field3203[var1.field3248]; // L: 463 - return var2 < 8192 ? var2 * var1.field3242 + 32 >> 6 : 16384 - ((128 - var1.field3242) * (16384 - var2) + 32 >> 6); // L: 464 465 + int method5106(MusicPatchNode var1) { + int var2 = this.field3246[var1.field3308]; // L: 463 + return var2 < 8192 ? var2 * var1.field3312 + 32 >> 6 : 16384 - ((128 - var1.field3312) * (16384 - var2) + 32 >> 6); // L: 464 465 } - @ObfuscatedName("ad") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2142415416" + descriptor = "(B)V", + garbageValue = "-37" ) - void method5272() { + void method5112() { int var1 = this.track; // L: 522 int var2 = this.trackLength; // L: 523 long var3; - for (var3 = this.field3205; var2 == this.trackLength; var3 = this.midiFile.method5393(var2)) { // L: 524 525 547 + for (var3 = this.field3267; var2 == this.trackLength; var3 = this.midiFile.method5227(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 @@ -936,8 +936,8 @@ public class MidiPcmStream extends PcmStream { this.midiFile.setTrackDone(); // L: 530 this.midiFile.markTrackPosition(var1); // L: 531 if (this.midiFile.isDone()) { // L: 532 - if (!this.field3199 || var2 == 0) { // L: 533 - this.method5259(); // L: 537 + if (!this.field3263 || var2 == 0) { // L: 533 + this.method5099(); // L: 537 this.midiFile.clear(); // L: 538 return; // L: 539 } @@ -948,7 +948,7 @@ public class MidiPcmStream extends PcmStream { } if ((var5 & 128) != 0) { // L: 541 - this.method5262(var5); + this.method5102(var5); } this.midiFile.readTrackLength(var1); // L: 542 @@ -961,20 +961,20 @@ public class MidiPcmStream extends PcmStream { this.track = var1; // L: 549 this.trackLength = var2; // L: 550 - this.field3205 = var3; // L: 551 + this.field3267 = var3; // L: 551 } // L: 552 - @ObfuscatedName("ai") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Ljn;I)Z", - garbageValue = "1597341922" + descriptor = "(Lji;I)Z", + garbageValue = "-1708353778" ) - boolean method5273(MusicPatchNode var1) { + boolean method5113(MusicPatchNode var1) { if (var1.stream == null) { // L: 555 - if (var1.field3249 >= 0) { // L: 556 + if (var1.field3316 >= 0) { // L: 556 var1.remove(); // L: 557 - if (var1.field3239 > 0 && var1 == this.field3197[var1.field3248][var1.field3239]) { // L: 558 - this.field3197[var1.field3248][var1.field3239] = null; // L: 559 + if (var1.field3319 > 0 && var1 == this.field3255[var1.field3308][var1.field3319]) { // L: 558 + this.field3255[var1.field3308][var1.field3319] = null; // L: 559 } } @@ -984,177 +984,103 @@ public class MidiPcmStream extends PcmStream { } } - @ObfuscatedName("ax") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Ljn;[IIII)Z", - garbageValue = "-1282463450" + descriptor = "(Lji;[IIII)Z", + garbageValue = "-2129548616" ) - boolean method5311(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.field3255 = PcmPlayer.field268 / 100; // L: 568 - if (var1.field3249 < 0 || var1.stream != null && !var1.stream.method830()) { // L: 569 - int var5 = var1.field3245; // L: 577 + boolean method5114(MusicPatchNode var1, int[] var2, int var3, int var4) { + var1.field3321 = PcmPlayer.field300 / 100; // L: 568 + if (var1.field3316 < 0 || var1.stream != null && !var1.stream.method815()) { // L: 569 + int var5 = var1.field3302; // L: 577 if (var5 > 0) { // L: 578 - var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field3182[var1.field3248] * 4.921259842519685E-4D) + 0.5D); // L: 579 + var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field3253[var1.field3308] * 4.921259842519685E-4D) + 0.5D); // L: 579 if (var5 < 0) { // L: 580 var5 = 0; } - var1.field3245 = var5; // L: 581 + var1.field3302 = var5; // L: 581 } - var1.stream.method896(this.method5246(var1)); // L: 583 - MusicPatchNode2 var6 = var1.field3247; // L: 584 + var1.stream.method813(this.method5141(var1)); // L: 583 + MusicPatchNode2 var6 = var1.field3306; // L: 584 boolean var7 = false; // L: 585 - ++var1.field3253; // L: 586 - var1.field3237 += var6.field3166; // L: 587 - double var8 = (double)((var1.field3251 - 60 << 8) + (var1.field3245 * var1.field3244 >> 12)) * 5.086263020833333E-6D; // L: 588 - if (var6.field3162 > 0) { // L: 589 - if (var6.field3164 > 0) { // L: 590 - var1.field3246 += (int)(128.0D * Math.pow(2.0D, (double)var6.field3164 * var8) + 0.5D); + ++var1.field3318; // L: 586 + var1.field3304 += var6.field3229; // L: 587 + double var8 = 5.086263020833333E-6D * (double)((var1.field3307 - 60 << 8) + (var1.field3309 * var1.field3302 >> 12)); // L: 588 + if (var6.field3226 > 0) { // L: 589 + if (var6.field3227 > 0) { // L: 590 + var1.field3313 += (int)(128.0D * Math.pow(2.0D, (double)var6.field3227 * var8) + 0.5D); } else { - var1.field3246 += 128; // L: 591 + var1.field3313 += 128; // L: 591 } } - if (var6.field3160 != null) { // L: 593 - if (var6.field3159 > 0) { // L: 594 - var1.field3235 += (int)(128.0D * Math.pow(2.0D, (double)var6.field3159 * var8) + 0.5D); + if (var6.field3232 != null) { // L: 593 + if (var6.field3225 > 0) { // L: 594 + var1.field3314 += (int)(128.0D * Math.pow(2.0D, (double)var6.field3225 * var8) + 0.5D); } else { - var1.field3235 += 128; // L: 595 + var1.field3314 += 128; // L: 595 } - while (var1.field3252 < var6.field3160.length - 2 && var1.field3235 > (var6.field3160[var1.field3252 + 2] & 255) << 8) { // L: 596 - var1.field3252 += 2; + while (var1.field3315 < var6.field3232.length - 2 && var1.field3314 > (var6.field3232[var1.field3315 + 2] & 255) << 8) { // L: 596 + var1.field3315 += 2; } - if (var6.field3160.length - 2 == var1.field3252 && var6.field3160[var1.field3252 + 1] == 0) { // L: 597 + if (var6.field3232.length - 2 == var1.field3315 && var6.field3232[var1.field3315 + 1] == 0) { // L: 597 var7 = true; } } - if (var1.field3249 >= 0 && var6.field3165 != null && (this.field3193[var1.field3248] & 1) == 0 && (var1.field3239 < 0 || var1 != this.field3197[var1.field3248][var1.field3239])) { // L: 599 600 - if (var6.field3163 > 0) { // L: 601 - var1.field3249 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field3163) + 0.5D); + if (var1.field3316 >= 0 && var6.field3223 != null && (this.field3247[var1.field3308] & 1) == 0 && (var1.field3319 < 0 || var1 != this.field3255[var1.field3308][var1.field3319])) { // L: 599 600 + if (var6.field3224 > 0) { // L: 601 + var1.field3316 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field3224) + 0.5D); } else { - var1.field3249 += 128; // L: 602 + var1.field3316 += 128; // L: 602 } - while (var1.field3250 < var6.field3165.length - 2 && var1.field3249 > (var6.field3165[var1.field3250 + 2] & 255) << 8) { // L: 603 - var1.field3250 += 2; + while (var1.field3317 < var6.field3223.length - 2 && var1.field3316 > (var6.field3223[var1.field3317 + 2] & 255) << 8) { // L: 603 + var1.field3317 += 2; } - if (var6.field3165.length - 2 == var1.field3250) { // L: 604 + if (var6.field3223.length - 2 == var1.field3317) { // L: 604 var7 = true; } } if (var7) { // L: 607 - var1.stream.method882(var1.field3255); // L: 608 + var1.stream.method812(var1.field3321); // L: 608 if (var2 != null) { // L: 609 var1.stream.fill(var2, var3, var4); } else { var1.stream.skip(var4); // L: 610 } - if (var1.stream.method808()) { // L: 611 + if (var1.stream.method935()) { // L: 611 this.patchStream.mixer.addSubStream(var1.stream); } - var1.method5473(); // L: 612 - if (var1.field3249 >= 0) { // L: 613 + var1.method5316(); // L: 612 + if (var1.field3316 >= 0) { // L: 613 var1.remove(); // L: 614 - if (var1.field3239 > 0 && var1 == this.field3197[var1.field3248][var1.field3239]) { // L: 615 - this.field3197[var1.field3248][var1.field3239] = null; // L: 616 + if (var1.field3319 > 0 && var1 == this.field3255[var1.field3308][var1.field3319]) { // L: 615 + this.field3255[var1.field3308][var1.field3319] = null; // L: 616 } } return true; // L: 619 } else { - var1.stream.method880(var1.field3255, this.method5244(var1), this.method5302(var1)); // L: 621 + var1.stream.method799(var1.field3321, this.method5105(var1), this.method5106(var1)); // L: 621 return false; // L: 622 } } else { - var1.method5473(); // L: 570 + var1.method5316(); // L: 570 var1.remove(); // L: 571 - if (var1.field3239 > 0 && var1 == this.field3197[var1.field3248][var1.field3239]) { // L: 572 - this.field3197[var1.field3248][var1.field3239] = null; // L: 573 + if (var1.field3319 > 0 && var1 == this.field3255[var1.field3308][var1.field3319]) { // L: 572 + this.field3255[var1.field3308][var1.field3319] = null; // L: 573 } return true; // L: 575 } } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lln;Ljava/lang/String;Ljava/lang/String;IZI)V", - garbageValue = "1823520808" - ) - public static void method5368(AbstractArchive var0, String var1, String var2, int var3, boolean var4) { - int var5 = var0.getGroupId(var1); // L: 34 - int var6 = var0.getFileId(var5, var2); // L: 35 - class18.method266(var0, var5, var6, var3, var4); // L: 36 - } // L: 37 - - @ObfuscatedName("ib") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)V", - garbageValue = "-126" - ) - static void method5366(int var0, String var1) { - int var2 = Players.Players_count; // L: 9607 - int[] var3 = Players.Players_indices; // L: 9608 - boolean var4 = false; // L: 9609 - Username var5 = new Username(var1, class122.loginType); // L: 9610 - - for (int var6 = 0; var6 < var2; ++var6) { // L: 9611 - Player var7 = Client.players[var3[var6]]; // L: 9612 - if (var7 != null && var7 != GrandExchangeEvents.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 9613 - PacketBufferNode var8; - if (var0 == 1) { // L: 9614 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2913, Client.packetWriter.isaacCipher); // L: 9616 - var8.packetBuffer.method7710(var3[var6]); // L: 9617 - var8.packetBuffer.method7701(0); // L: 9618 - Client.packetWriter.addNode(var8); // L: 9619 - } else if (var0 == 4) { // L: 9621 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2939, Client.packetWriter.isaacCipher); // L: 9623 - var8.packetBuffer.method7804(0); // L: 9624 - var8.packetBuffer.writeShort(var3[var6]); // L: 9625 - Client.packetWriter.addNode(var8); // L: 9626 - } else if (var0 == 6) { // L: 9628 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2931, Client.packetWriter.isaacCipher); // L: 9630 - var8.packetBuffer.method7712(var3[var6]); // L: 9631 - var8.packetBuffer.writeByte(0); // L: 9632 - Client.packetWriter.addNode(var8); // L: 9633 - } else if (var0 == 7) { // L: 9635 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2923, Client.packetWriter.isaacCipher); // L: 9637 - var8.packetBuffer.writeShort(var3[var6]); // L: 9638 - var8.packetBuffer.method7701(0); // L: 9639 - Client.packetWriter.addNode(var8); // L: 9640 - } - - var4 = true; // L: 9642 - break; - } - } - - if (!var4) { // L: 9646 - Actor.addGameMessage(4, "", "Unable to find " + var1); - } - - } // L: 9647 - - @ObfuscatedName("lu") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "2065627422" - ) - @Export("clanKickUser") - static final void clanKickUser(String var0) { - if (ClientPacket.friendsChat != null) { // L: 12385 - PacketBufferNode var1 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2909, Client.packetWriter.isaacCipher); // L: 12386 - var1.packetBuffer.writeByte(class425.stringCp1252NullTerminatedByteSize(var0)); // L: 12387 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 12388 - Client.packetWriter.addNode(var1); // L: 12389 - } - } // L: 12390 } diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index a012fdf8ef..799156250c 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -4,134 +4,138 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fn") +@ObfuscatedName("fz") @Implements("MilliClock") public class MilliClock extends Clock { - @ObfuscatedName("v") - long[] field1767; - @ObfuscatedName("c") + @ObfuscatedName("o") + long[] field1817; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -2105737199 + intValue = -613728771 ) - int field1769; - @ObfuscatedName("i") + int field1815; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -626928133 + intValue = -2030028533 ) - int field1768; - @ObfuscatedName("f") + int field1816; + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = 4722522205761016929L + longValue = 6860375109753774457L ) - long field1766; - @ObfuscatedName("b") + long field1814; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -186041197 + intValue = 101342221 ) - int field1770; - @ObfuscatedName("n") + int field1818; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1637603131 + intValue = 578259899 ) - int field1771; + int field1819; - public MilliClock() { - this.field1767 = new long[10]; // L: 7 - this.field1769 = 256; // L: 15 - this.field1768 = 1; // L: 16 - this.field1770 = 0; // L: 17 - this.field1766 = class136.method2931(); // L: 18 + MilliClock() { + this.field1817 = new long[10]; // L: 7 + this.field1815 = 256; // L: 15 + this.field1816 = 1; // L: 16 + this.field1818 = 0; // L: 17 + this.field1814 = class113.method2624(); // L: 18 for (int var1 = 0; var1 < 10; ++var1) { // L: 19 - this.field1767[var1] = this.field1766; // L: 20 + this.field1817[var1] = this.field1814; // L: 20 } - } // L: 22 + } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1350330504" + garbageValue = "-1993169750" ) @Export("mark") public void mark() { for (int var1 = 0; var1 < 10; ++var1) { // L: 25 - this.field1767[var1] = 0L; // L: 26 + this.field1817[var1] = 0L; // L: 26 } } // L: 28 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "2026134141" + garbageValue = "1389334721" ) @Export("wait") public int wait(int var1, int var2) { - int var3 = this.field1769; // L: 31 - int var4 = this.field1768; // L: 32 - this.field1769 = 300; // L: 33 - this.field1768 = 1; // L: 34 - this.field1766 = class136.method2931(); // L: 35 - if (this.field1767[this.field1771] == 0L) { // L: 36 - this.field1769 = var3; // L: 37 - this.field1768 = var4; // L: 38 - } else if (this.field1766 > this.field1767[this.field1771]) { // L: 40 - this.field1769 = (int)((long)(var1 * 2560) / (this.field1766 - this.field1767[this.field1771])); + int var3 = this.field1815; // L: 31 + int var4 = this.field1816; // L: 32 + this.field1815 = 300; // L: 33 + this.field1816 = 1; // L: 34 + this.field1814 = class113.method2624(); // L: 35 + if (0L == this.field1817[this.field1819]) { // L: 36 + this.field1815 = var3; // L: 37 + this.field1816 = var4; // L: 38 + } else if (this.field1814 > this.field1817[this.field1819]) { // L: 40 + this.field1815 = (int)((long)(var1 * 2560) / (this.field1814 - this.field1817[this.field1819])); } - if (this.field1769 < 25) { // L: 41 - this.field1769 = 25; + if (this.field1815 < 25) { // L: 41 + this.field1815 = 25; } - if (this.field1769 > 256) { // L: 42 - this.field1769 = 256; // L: 43 - this.field1768 = (int)((long)var1 - (this.field1766 - this.field1767[this.field1771]) / 10L); // L: 44 + if (this.field1815 > 256) { // L: 42 + this.field1815 = 256; // L: 43 + this.field1816 = (int)((long)var1 - (this.field1814 - this.field1817[this.field1819]) / 10L); // L: 44 } - if (this.field1768 > var1) { // L: 46 - this.field1768 = var1; + if (this.field1816 > var1) { // L: 46 + this.field1816 = var1; } - this.field1767[this.field1771] = this.field1766; // L: 47 - this.field1771 = (this.field1771 + 1) % 10; // L: 48 + this.field1817[this.field1819] = this.field1814; // L: 47 + this.field1819 = (this.field1819 + 1) % 10; // L: 48 int var5; - if (this.field1768 > 1) { // L: 49 + if (this.field1816 > 1) { // L: 49 for (var5 = 0; var5 < 10; ++var5) { // L: 50 - if (0L != this.field1767[var5]) { // L: 51 - this.field1767[var5] += (long)this.field1768; + if (0L != this.field1817[var5]) { // L: 51 + this.field1817[var5] += (long)this.field1816; } } } - if (this.field1768 < var2) { // L: 54 - this.field1768 = var2; + if (this.field1816 < var2) { // L: 54 + this.field1816 = var2; } - class93.method2384((long)this.field1768); // L: 55 + class241.method4815((long)this.field1816); // L: 55 - for (var5 = 0; this.field1770 < 256; this.field1770 += this.field1769) { // L: 56 - ++var5; + for (var5 = 0; this.field1818 < 256; this.field1818 += this.field1815) { // L: 56 57 59 + ++var5; // L: 58 } - this.field1770 &= 255; - return var5; + this.field1818 &= 255; // L: 61 + return var5; // L: 62 } - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lqo;" + descriptor = "(II)V", + garbageValue = "1996215175" ) - @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 - } + static void method3219(int var0) { + GrandExchangeOfferTotalQuantityComparator.field4069 = var0; // L: 21 + class388.field4402 = new class388[var0]; // L: 22 + class388.field4401 = 0; // L: 23 + } // L: 24 - return var2; // L: 62 + @ObfuscatedName("ey") + @ObfuscatedSignature( + descriptor = "(I)Lop;", + garbageValue = "-973548519" + ) + @Export("getWorldMap") + static WorldMap getWorldMap() { + return ServerPacket.worldMap; // L: 679 } } diff --git a/runescape-client/src/main/java/ModeWhere.java b/runescape-client/src/main/java/ModeWhere.java index 063c01b2ea..6b012ae586 100644 --- a/runescape-client/src/main/java/ModeWhere.java +++ b/runescape-client/src/main/java/ModeWhere.java @@ -1,5 +1,3 @@ -import java.io.File; -import java.io.IOException; import java.util.HashSet; import java.util.Set; import net.runelite.mapping.Export; @@ -8,247 +6,909 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lv") +@ObfuscatedName("lz") @Implements("ModeWhere") public enum ModeWhere implements MouseWheel { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Llv;" - ) - field4069("", 0, new class327[]{class327.field4042}), - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Llv;" - ) - field4062("", 1, new class327[]{class327.field4043, class327.field4042}), - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Llv;" - ) - field4071("", 2, new class327[]{class327.field4043, class327.field4044, class327.field4042}), - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Llv;" - ) - field4065("", 3, new class327[]{class327.field4043}), - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Llv;" - ) - field4064("", 4), - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Llv;" - ) - field4066("", 5, new class327[]{class327.field4043, class327.field4042}), - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Llv;" - ) - field4079("", 6, new class327[]{class327.field4042}), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Llv;" - ) - field4067("", 8, new class327[]{class327.field4043, class327.field4042}), - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Llv;" - ) - field4068("", 9, new class327[]{class327.field4043, class327.field4044}), @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Llv;" + descriptor = "Llz;" ) - field4061("", 10, new class327[]{class327.field4043}), - @ObfuscatedName("r") + field4125("", 0, new class327[]{class327.field4109}), + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Llv;" + descriptor = "Llz;" ) - field4070("", 11, new class327[]{class327.field4043}), + field4126("", 1, new class327[]{class327.field4108, class327.field4109}), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Llz;" + ) + field4127("", 2, new class327[]{class327.field4108, class327.field4110, class327.field4109}), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Llz;" + ) + field4130("", 3, new class327[]{class327.field4108}), + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Llz;" + ) + field4129("", 4), + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Llz;" + ) + field4138("", 5, new class327[]{class327.field4108, class327.field4109}), @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Llv;" + descriptor = "Llz;" ) - field4077("", 12, new class327[]{class327.field4043, class327.field4042}), + field4131("", 6, new class327[]{class327.field4109}), + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Llz;" + ) + field4132("", 8, new class327[]{class327.field4108, class327.field4109}), + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Llz;" + ) + field4128("", 9, new class327[]{class327.field4108, class327.field4110}), + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Llz;" + ) + field4134("", 10, new class327[]{class327.field4108}), + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Llz;" + ) + field4135("", 11, new class327[]{class327.field4108}), + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Llz;" + ) + field4136("", 12, new class327[]{class327.field4108, class327.field4109}), @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Llv;" + descriptor = "Llz;" ) - field4072("", 13, new class327[]{class327.field4043}); + field4133("", 13, new class327[]{class327.field4108}); - @ObfuscatedName("gy") - @ObfuscatedSignature( - descriptor = "Lny;" - ) - static AbstractSocket field4073; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 426345527 + intValue = 1167171757 ) @Export("id") final int id; - @ObfuscatedName("d") - final Set field4074; + @ObfuscatedName("t") + final Set field4137; static { - method6093(); // L: 28 + method5894(); // L: 28 } // L: 29 @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I[Llb;)V" + descriptor = "(Ljava/lang/String;I[Lls;)V" ) ModeWhere(String var3, int var4, class327[] var5) { - this.field4074 = new HashSet(); + this.field4137 = new HashSet(); this.id = var4; // L: 43 class327[] var6 = var5; // L: 45 for (int var7 = 0; var7 < var6.length; ++var7) { // L: 46 class327 var8 = var6[var7]; // L: 47 - this.field4074.add(var8); // L: 48 + this.field4137.add(var8); // L: 48 } } // L: 51 ModeWhere(String var3, int var4) { - this.field4074 = new HashSet(); // L: 32 + this.field4137 = new HashSet(); // L: 32 this.id = var4; // L: 39 } // L: 40 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 54 + return this.id; // L: 55 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)[Llv;", - garbageValue = "1573276751" + descriptor = "(I)[Llz;", + garbageValue = "-298356237" ) - static ModeWhere[] method6093() { - return new ModeWhere[]{field4079, field4068, field4070, field4061, field4064, field4069, field4072, field4066, field4065, field4067, field4077, field4071, field4062}; // L: 35 + static ModeWhere[] method5894() { + return new ModeWhere[]{field4126, field4138, field4127, field4130, field4129, field4136, field4133, field4132, field4128, field4135, field4134, field4131, field4125}; // L: 35 } - @ObfuscatedName("b") + @ObfuscatedName("iq") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;ZB)Lph;", - garbageValue = "-16" + descriptor = "(IIIILjava/lang/String;Ljava/lang/String;III)V", + garbageValue = "1808500640" ) - @Export("getPreferencesFile") - public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { - File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); // L: 247 - if (var3.exists()) { // L: 248 - try { - AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 250 - return var10; // L: 251 - } catch (IOException var9) { // L: 253 - } + @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: 8923 + var2 -= 2000; } - String var4 = ""; // L: 255 - if (WorldMapSection1.cacheGamebuild == 33) { // L: 256 - var4 = "_rc"; - } else if (WorldMapSection1.cacheGamebuild == 34) { // L: 257 - var4 = "_wip"; - } - - File var5 = new File(NetSocket.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 258 - AccessFile var6; - if (!var2 && var5.exists()) { // L: 259 - try { - var6 = new AccessFile(var5, "rw", 10000L); // L: 261 - return var6; // L: 262 - } catch (IOException var8) { // L: 264 - } - } - - try { - var6 = new AccessFile(var3, "rw", 10000L); // L: 267 - return var6; // L: 268 - } catch (IOException var7) { // L: 270 - throw new RuntimeException(); // L: 271 - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "610665702" - ) - static final void method6092() { - class149.method3138("Your ignore list is full. Max of 100 for free users, and 400 for members"); // L: 156 - } // L: 157 - - @ObfuscatedName("kh") - @ObfuscatedSignature( - descriptor = "(Lky;I)Z", - garbageValue = "1543146245" - ) - static final boolean method6100(Widget var0) { - int var1 = var0.contentType; // L: 12192 - if (var1 == 205) { // L: 12193 - Client.logoutTimer = 250; // L: 12194 - return true; // L: 12195 + PacketBufferNode var8; + if (var2 == 1) { // L: 8924 + Client.mouseCrossX = var6; // L: 9291 + Client.mouseCrossY = var7; // L: 9292 + Client.mouseCrossColor = 2; // L: 9293 + Client.mouseCrossState = 0; // L: 9294 + Client.destinationX = var0; // L: 9295 + Client.destinationY = var1; // L: 9296 + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2981, Client.packetWriter.isaacCipher); // L: 9298 + var8.packetBuffer.writeInt(class20.selectedItemWidget); // L: 9299 + var8.packetBuffer.method7550(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9300 + var8.packetBuffer.method7551(var0 + SecureRandomCallable.baseX); // L: 9301 + var8.packetBuffer.method7641(FloorUnderlayDefinition.selectedItemId); // L: 9302 + var8.packetBuffer.method7687(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9303 + var8.packetBuffer.method7641(var3); // L: 9304 + var8.packetBuffer.method7550(PcmPlayer.selectedItemSlot); // L: 9305 + Client.packetWriter.addNode(var8); // L: 9306 + } else if (var2 == 2) { + Client.mouseCrossX = var6; // L: 9100 + Client.mouseCrossY = var7; // L: 9101 + Client.mouseCrossColor = 2; // L: 9102 + Client.mouseCrossState = 0; // L: 9103 + Client.destinationX = var0; // L: 9104 + Client.destinationY = var1; // L: 9105 + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3057, Client.packetWriter.isaacCipher); // L: 9106 + var8.packetBuffer.method7551(var0 + SecureRandomCallable.baseX); // L: 9107 + var8.packetBuffer.writeShort(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9108 + var8.packetBuffer.method7551(Client.selectedSpellItemId); // L: 9109 + var8.packetBuffer.method7551(Client.selectedSpellChildIndex); // L: 9110 + var8.packetBuffer.method7641(var3); // L: 9111 + var8.packetBuffer.method7687(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9112 + var8.packetBuffer.writeIntME(ArchiveDiskActionHandler.selectedSpellWidget); // L: 9113 + Client.packetWriter.addNode(var8); // L: 9114 + } else if (var2 == 3) { + Client.mouseCrossX = var6; // L: 8938 + Client.mouseCrossY = var7; // L: 8939 + Client.mouseCrossColor = 2; // L: 8940 + Client.mouseCrossState = 0; // L: 8941 + Client.destinationX = var0; // L: 8942 + Client.destinationY = var1; // L: 8943 + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2990, Client.packetWriter.isaacCipher); // L: 8945 + var8.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8946 + var8.packetBuffer.method7550(var3); // L: 8947 + var8.packetBuffer.method7641(var0 + SecureRandomCallable.baseX); // L: 8948 + var8.packetBuffer.method7551(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 8949 + Client.packetWriter.addNode(var8); // L: 8950 + } else if (var2 == 4) { + Client.mouseCrossX = var6; // L: 9554 + Client.mouseCrossY = var7; // L: 9555 + Client.mouseCrossColor = 2; // L: 9556 + Client.mouseCrossState = 0; // L: 9557 + Client.destinationX = var0; // L: 9558 + Client.destinationY = var1; // L: 9559 + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3049, Client.packetWriter.isaacCipher); // L: 9561 + var8.packetBuffer.method7641(var3); // L: 9562 + var8.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9563 + var8.packetBuffer.method7550(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9564 + var8.packetBuffer.method7550(var0 + SecureRandomCallable.baseX); // L: 9565 + Client.packetWriter.addNode(var8); // L: 9566 + } else if (var2 == 5) { + Client.mouseCrossX = var6; // L: 9014 + Client.mouseCrossY = var7; // L: 9015 + Client.mouseCrossColor = 2; // L: 9016 + Client.mouseCrossState = 0; // L: 9017 + Client.destinationX = var0; // L: 9018 + Client.destinationY = var1; // L: 9019 + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3041, Client.packetWriter.isaacCipher); // L: 9021 + var8.packetBuffer.method7641(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9022 + var8.packetBuffer.method7687(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9023 + var8.packetBuffer.writeShort(var0 + SecureRandomCallable.baseX); // L: 9024 + var8.packetBuffer.method7550(var3); // L: 9025 + Client.packetWriter.addNode(var8); // L: 9026 + } else if (var2 == 6) { + Client.mouseCrossX = var6; // L: 9160 + Client.mouseCrossY = var7; // L: 9161 + Client.mouseCrossColor = 2; // L: 9162 + Client.mouseCrossState = 0; // L: 9163 + Client.destinationX = var0; // L: 9164 + Client.destinationY = var1; // L: 9165 + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2999, Client.packetWriter.isaacCipher); // L: 9167 + var8.packetBuffer.writeShort(var3); // L: 9168 + var8.packetBuffer.writeShort(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9169 + var8.packetBuffer.writeShort(var0 + SecureRandomCallable.baseX); // L: 9170 + var8.packetBuffer.method7542(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9171 + Client.packetWriter.addNode(var8); // L: 9172 } else { - int var2; - int var3; - if (var1 >= 300 && var1 <= 313) { // L: 12197 - var2 = (var1 - 300) / 2; // L: 12198 - var3 = var1 & 1; // L: 12199 - Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 12200 - } - - if (var1 >= 314 && var1 <= 323) { // L: 12202 - var2 = (var1 - 314) / 2; // L: 12203 - var3 = var1 & 1; // L: 12204 - Client.playerAppearance.method5594(var2, var3 == 1); // L: 12205 - } - - if (var1 == 324) { - Client.playerAppearance.changeSex(false); // L: 12207 - } - - if (var1 == 325) { // L: 12208 - Client.playerAppearance.changeSex(true); - } - - if (var1 == 326) { // L: 12209 - PacketBufferNode var4 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2984, Client.packetWriter.isaacCipher); // L: 12211 - Client.playerAppearance.write(var4.packetBuffer); // L: 12212 - Client.packetWriter.addNode(var4); // L: 12213 - return true; // L: 12214 + PacketBufferNode var9; + NPC var13; + if (var2 == 7) { + var13 = Client.npcs[var3]; // L: 9572 + if (var13 != null) { // L: 9573 + Client.mouseCrossX = var6; // L: 9574 + Client.mouseCrossY = var7; // L: 9575 + Client.mouseCrossColor = 2; // L: 9576 + Client.mouseCrossState = 0; // L: 9577 + Client.destinationX = var0; // L: 9578 + Client.destinationY = var1; // L: 9579 + var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2985, Client.packetWriter.isaacCipher); // L: 9581 + var9.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9582 + var9.packetBuffer.writeShort(FloorUnderlayDefinition.selectedItemId); // L: 9583 + var9.packetBuffer.writeInt(class20.selectedItemWidget); // L: 9584 + var9.packetBuffer.writeShort(var3); // L: 9585 + var9.packetBuffer.writeShort(PcmPlayer.selectedItemSlot); // L: 9586 + Client.packetWriter.addNode(var9); // L: 9587 + } + } else if (var2 == 8) { + var13 = Client.npcs[var3]; // L: 9635 + if (var13 != null) { // L: 9636 + Client.mouseCrossX = var6; // L: 9637 + Client.mouseCrossY = var7; // L: 9638 + Client.mouseCrossColor = 2; // L: 9639 + Client.mouseCrossState = 0; // L: 9640 + Client.destinationX = var0; // L: 9641 + Client.destinationY = var1; // L: 9642 + var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2984, Client.packetWriter.isaacCipher); // L: 9643 + var9.packetBuffer.method7641(var3); // L: 9644 + var9.packetBuffer.writeShort(Client.selectedSpellItemId); // L: 9645 + var9.packetBuffer.method7542(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9646 + var9.packetBuffer.method7551(Client.selectedSpellChildIndex); // L: 9647 + var9.packetBuffer.method7563(ArchiveDiskActionHandler.selectedSpellWidget); // L: 9648 + Client.packetWriter.addNode(var9); // L: 9649 + } + } else if (var2 == 9) { + var13 = Client.npcs[var3]; // L: 9591 + if (var13 != null) { // L: 9592 + Client.mouseCrossX = var6; // L: 9593 + Client.mouseCrossY = var7; // L: 9594 + Client.mouseCrossColor = 2; // L: 9595 + Client.mouseCrossState = 0; // L: 9596 + Client.destinationX = var0; // L: 9597 + Client.destinationY = var1; // L: 9598 + var9 = WallDecoration.getPacketBufferNode(ClientPacket.field3004, Client.packetWriter.isaacCipher); // L: 9600 + var9.packetBuffer.method7551(var3); // L: 9601 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9602 + Client.packetWriter.addNode(var9); // L: 9603 + } + } else if (var2 == 10) { + var13 = Client.npcs[var3]; // L: 9391 + if (var13 != null) { // L: 9392 + Client.mouseCrossX = var6; // L: 9393 + Client.mouseCrossY = var7; // L: 9394 + Client.mouseCrossColor = 2; // L: 9395 + Client.mouseCrossState = 0; // L: 9396 + Client.destinationX = var0; // L: 9397 + Client.destinationY = var1; // L: 9398 + var9 = WallDecoration.getPacketBufferNode(ClientPacket.field3030, Client.packetWriter.isaacCipher); // L: 9400 + var9.packetBuffer.method7550(var3); // L: 9401 + var9.packetBuffer.method7542(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9402 + Client.packetWriter.addNode(var9); // L: 9403 + } + } else if (var2 == 11) { + var13 = Client.npcs[var3]; // L: 9275 + if (var13 != null) { // L: 9276 + Client.mouseCrossX = var6; // L: 9277 + Client.mouseCrossY = var7; // L: 9278 + Client.mouseCrossColor = 2; // L: 9279 + Client.mouseCrossState = 0; // L: 9280 + Client.destinationX = var0; // L: 9281 + Client.destinationY = var1; // L: 9282 + var9 = WallDecoration.getPacketBufferNode(ClientPacket.field3036, Client.packetWriter.isaacCipher); // L: 9284 + var9.packetBuffer.method7542(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9285 + var9.packetBuffer.method7641(var3); // L: 9286 + Client.packetWriter.addNode(var9); // L: 9287 + } + } else if (var2 == 12) { + var13 = Client.npcs[var3]; // L: 8953 + if (var13 != null) { // L: 8954 + Client.mouseCrossX = var6; // L: 8955 + Client.mouseCrossY = var7; // L: 8956 + Client.mouseCrossColor = 2; // L: 8957 + Client.mouseCrossState = 0; // L: 8958 + Client.destinationX = var0; // L: 8959 + Client.destinationY = var1; // L: 8960 + var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2977, Client.packetWriter.isaacCipher); // L: 8962 + var9.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8963 + var9.packetBuffer.method7641(var3); // L: 8964 + Client.packetWriter.addNode(var9); // L: 8965 + } + } else if (var2 == 13) { + var13 = Client.npcs[var3]; // L: 9375 + if (var13 != null) { // L: 9376 + Client.mouseCrossX = var6; // L: 9377 + Client.mouseCrossY = var7; // L: 9378 + Client.mouseCrossColor = 2; // L: 9379 + Client.mouseCrossState = 0; // L: 9380 + Client.destinationX = var0; // L: 9381 + Client.destinationY = var1; // L: 9382 + var9 = WallDecoration.getPacketBufferNode(ClientPacket.field3046, Client.packetWriter.isaacCipher); // L: 9384 + var9.packetBuffer.method7550(var3); // L: 9385 + var9.packetBuffer.method7542(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9386 + Client.packetWriter.addNode(var9); // L: 9387 + } } else { - return false; // L: 12216 + Player var15; + if (var2 == 14) { + var15 = Client.players[var3]; // L: 9435 + if (var15 != null) { // L: 9436 + Client.mouseCrossX = var6; // L: 9437 + Client.mouseCrossY = var7; // L: 9438 + Client.mouseCrossColor = 2; // L: 9439 + Client.mouseCrossState = 0; // L: 9440 + Client.destinationX = var0; // L: 9441 + Client.destinationY = var1; // L: 9442 + var9 = WallDecoration.getPacketBufferNode(ClientPacket.field3007, Client.packetWriter.isaacCipher); // L: 9444 + var9.packetBuffer.method7551(PcmPlayer.selectedItemSlot); // L: 9445 + var9.packetBuffer.method7641(var3); // L: 9446 + var9.packetBuffer.writeInt(class20.selectedItemWidget); // L: 9447 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9448 + var9.packetBuffer.method7641(FloorUnderlayDefinition.selectedItemId); // L: 9449 + Client.packetWriter.addNode(var9); // L: 9450 + } + } else if (var2 == 15) { + var15 = Client.players[var3]; // L: 9479 + if (var15 != null) { // L: 9480 + Client.mouseCrossX = var6; // L: 9481 + Client.mouseCrossY = var7; // L: 9482 + Client.mouseCrossColor = 2; // L: 9483 + Client.mouseCrossState = 0; // L: 9484 + Client.destinationX = var0; // L: 9485 + Client.destinationY = var1; // L: 9486 + var9 = WallDecoration.getPacketBufferNode(ClientPacket.field3022, Client.packetWriter.isaacCipher); // L: 9487 + var9.packetBuffer.writeInt(ArchiveDiskActionHandler.selectedSpellWidget); // L: 9488 + var9.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9489 + var9.packetBuffer.method7550(Client.selectedSpellItemId); // L: 9490 + var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 9491 + var9.packetBuffer.method7641(var3); // L: 9492 + Client.packetWriter.addNode(var9); // L: 9493 + } + } else if (var2 == 16) { + Client.mouseCrossX = var6; // L: 9520 + Client.mouseCrossY = var7; // L: 9521 + Client.mouseCrossColor = 2; // L: 9522 + Client.mouseCrossState = 0; // L: 9523 + Client.destinationX = var0; // L: 9524 + Client.destinationY = var1; // L: 9525 + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2996, Client.packetWriter.isaacCipher); // L: 9527 + var8.packetBuffer.method7641(var0 + SecureRandomCallable.baseX); // L: 9528 + var8.packetBuffer.method7550(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9529 + var8.packetBuffer.method7641(FloorUnderlayDefinition.selectedItemId); // L: 9530 + var8.packetBuffer.method7563(class20.selectedItemWidget); // L: 9531 + var8.packetBuffer.method7687(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9532 + var8.packetBuffer.method7641(PcmPlayer.selectedItemSlot); // L: 9533 + var8.packetBuffer.method7551(var3); // L: 9534 + Client.packetWriter.addNode(var8); // L: 9535 + } else if (var2 == 17) { + Client.mouseCrossX = var6; // L: 9351 + Client.mouseCrossY = var7; // L: 9352 + Client.mouseCrossColor = 2; // L: 9353 + Client.mouseCrossState = 0; // L: 9354 + Client.destinationX = var0; // L: 9355 + Client.destinationY = var1; // L: 9356 + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3010, Client.packetWriter.isaacCipher); // L: 9357 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9358 + var8.packetBuffer.method7551(Client.selectedSpellItemId); // L: 9359 + var8.packetBuffer.method7641(Client.selectedSpellChildIndex); // L: 9360 + var8.packetBuffer.writeShort(var3); // L: 9361 + var8.packetBuffer.method7641(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9362 + var8.packetBuffer.writeInt(ArchiveDiskActionHandler.selectedSpellWidget); // L: 9363 + var8.packetBuffer.writeShort(var0 + SecureRandomCallable.baseX); // L: 9364 + Client.packetWriter.addNode(var8); // L: 9365 + } else if (var2 == 18) { + Client.mouseCrossX = var6; // L: 9056 + Client.mouseCrossY = var7; // L: 9057 + Client.mouseCrossColor = 2; // L: 9058 + Client.mouseCrossState = 0; // L: 9059 + Client.destinationX = var0; // L: 9060 + Client.destinationY = var1; // L: 9061 + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3013, Client.packetWriter.isaacCipher); // L: 9063 + var8.packetBuffer.method7550(var0 + SecureRandomCallable.baseX); // L: 9064 + var8.packetBuffer.method7551(var3); // L: 9065 + var8.packetBuffer.method7641(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9066 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9067 + Client.packetWriter.addNode(var8); // L: 9068 + } else if (var2 == 19) { + Client.mouseCrossX = var6; // L: 9688 + Client.mouseCrossY = var7; // L: 9689 + Client.mouseCrossColor = 2; // L: 9690 + Client.mouseCrossState = 0; // L: 9691 + Client.destinationX = var0; // L: 9692 + Client.destinationY = var1; // L: 9693 + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2987, Client.packetWriter.isaacCipher); // L: 9695 + var8.packetBuffer.method7542(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9696 + var8.packetBuffer.method7550(var0 + SecureRandomCallable.baseX); // L: 9697 + var8.packetBuffer.method7641(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9698 + var8.packetBuffer.method7551(var3); // L: 9699 + Client.packetWriter.addNode(var8); // L: 9700 + } else if (var2 == 20) { + Client.mouseCrossX = var6; // L: 9249 + Client.mouseCrossY = var7; // L: 9250 + Client.mouseCrossColor = 2; // L: 9251 + Client.mouseCrossState = 0; // L: 9252 + Client.destinationX = var0; // L: 9253 + Client.destinationY = var1; // L: 9254 + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2997, Client.packetWriter.isaacCipher); // L: 9256 + var8.packetBuffer.writeShort(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9257 + var8.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9258 + var8.packetBuffer.method7551(var0 + SecureRandomCallable.baseX); // L: 9259 + var8.packetBuffer.method7641(var3); // L: 9260 + Client.packetWriter.addNode(var8); // L: 9261 + } else if (var2 == 21) { + Client.mouseCrossX = var6; // L: 9188 + Client.mouseCrossY = var7; // L: 9189 + Client.mouseCrossColor = 2; // L: 9190 + Client.mouseCrossState = 0; // L: 9191 + Client.destinationX = var0; // L: 9192 + Client.destinationY = var1; // L: 9193 + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2976, Client.packetWriter.isaacCipher); // L: 9195 + var8.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9196 + var8.packetBuffer.method7550(var0 + SecureRandomCallable.baseX); // L: 9197 + var8.packetBuffer.writeShort(var3); // L: 9198 + var8.packetBuffer.writeShort(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9199 + Client.packetWriter.addNode(var8); // L: 9200 + } else if (var2 == 22) { + Client.mouseCrossX = var6; // L: 8983 + Client.mouseCrossY = var7; // L: 8984 + Client.mouseCrossColor = 2; // L: 8985 + Client.mouseCrossState = 0; // L: 8986 + Client.destinationX = var0; // L: 8987 + Client.destinationY = var1; // L: 8988 + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2978, Client.packetWriter.isaacCipher); // L: 8990 + var8.packetBuffer.method7687(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8991 + var8.packetBuffer.method7550(var3); // L: 8992 + var8.packetBuffer.method7551(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 8993 + var8.packetBuffer.method7641(var0 + SecureRandomCallable.baseX); // L: 8994 + Client.packetWriter.addNode(var8); // L: 8995 + } else if (var2 == 23) { + if (Client.isMenuOpen) { // L: 9664 + class175.scene.setViewportWalking(); // L: 9665 + } else { + class175.scene.menuOpen(class128.Client_plane, var0, var1, true); // L: 9668 + } + } else { + PacketBufferNode var11; + Widget var16; + if (var2 == 24) { + var16 = class92.getWidget(var1); // L: 9466 + if (var16 != null) { // L: 9467 + boolean var12 = true; // L: 9468 + if (var16.contentType > 0) { // L: 9469 + var12 = ReflectionCheck.method599(var16); + } + + if (var12) { // L: 9470 + var11 = WallDecoration.getPacketBufferNode(ClientPacket.field3014, Client.packetWriter.isaacCipher); // L: 9472 + var11.packetBuffer.writeInt(var1); // L: 9473 + Client.packetWriter.addNode(var11); // L: 9474 + } + } + } else { + if (var2 == 25) { + var16 = ApproximateRouteStrategy.getWidgetChild(var1, var0); // L: 9175 + if (var16 != null) { // L: 9176 + MusicPatchNode2.Widget_runOnTargetLeave(); // L: 9177 + class93.selectSpell(var1, var0, WorldMapSection1.Widget_unpackTargetMask(UrlRequester.getWidgetFlags(var16)), var16.itemId); // L: 9178 + Client.isItemSelected = 0; // L: 9179 + Client.selectedSpellActionName = TriBool.Widget_getSpellActionName(var16); // L: 9180 + if (Client.selectedSpellActionName == null) { // L: 9181 + Client.selectedSpellActionName = "null"; + } + + if (var16.isIf3) { // L: 9182 + Client.selectedSpellName = var16.dataText + class166.colorStartTag(16777215); + } else { + Client.selectedSpellName = class166.colorStartTag(65280) + var16.spellName + class166.colorStartTag(16777215); // L: 9183 + } + } + + return; // L: 9185 + } + + if (var2 == 26) { + Varps.method5366(); // L: 9569 + } else { + int var10; + Widget var14; + if (var2 == 28) { + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3014, Client.packetWriter.isaacCipher); // L: 9498 + var8.packetBuffer.writeInt(var1); // L: 9499 + Client.packetWriter.addNode(var8); // L: 9500 + var14 = class92.getWidget(var1); // L: 9501 + if (var14 != null && var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 9502 + var10 = var14.cs1Instructions[0][1]; // L: 9503 + Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; // L: 9504 + class321.changeGameOptions(var10); // L: 9505 + } + } else if (var2 == 29) { + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3014, Client.packetWriter.isaacCipher); // L: 9072 + var8.packetBuffer.writeInt(var1); // L: 9073 + Client.packetWriter.addNode(var8); // L: 9074 + var14 = class92.getWidget(var1); // L: 9075 + if (var14 != null && var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 9076 + var10 = var14.cs1Instructions[0][1]; // L: 9077 + if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { // L: 9078 + Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; // L: 9079 + class321.changeGameOptions(var10); // L: 9080 + } + } + } else if (var2 == 30) { + if (Client.meslayerContinueWidget == null) { // L: 9368 + Skills.resumePauseWidget(var1, var0); // L: 9369 + Client.meslayerContinueWidget = ApproximateRouteStrategy.getWidgetChild(var1, var0); // L: 9370 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(Client.meslayerContinueWidget); // L: 9371 + } + } else if (var2 == 31) { + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2992, Client.packetWriter.isaacCipher); // L: 8970 + var8.packetBuffer.method7563(var1); // L: 8971 + var8.packetBuffer.method7550(var3); // L: 8972 + var8.packetBuffer.method7641(PcmPlayer.selectedItemSlot); // L: 8973 + var8.packetBuffer.method7565(class20.selectedItemWidget); // L: 8974 + var8.packetBuffer.method7550(var0); // L: 8975 + var8.packetBuffer.method7551(FloorUnderlayDefinition.selectedItemId); // L: 8976 + Client.packetWriter.addNode(var8); // L: 8977 + Client.field598 = 0; // L: 8978 + NPCComposition.field1991 = class92.getWidget(var1); // L: 8979 + Client.field599 = var0; // L: 8980 + } else if (var2 == 32) { + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3025, Client.packetWriter.isaacCipher); // L: 9204 + var8.packetBuffer.method7550(var0); // L: 9205 + var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 9206 + var8.packetBuffer.writeIntME(var1); // L: 9207 + var8.packetBuffer.writeIntME(ArchiveDiskActionHandler.selectedSpellWidget); // L: 9208 + var8.packetBuffer.method7550(var3); // L: 9209 + Client.packetWriter.addNode(var8); // L: 9210 + Client.field598 = 0; // L: 9211 + NPCComposition.field1991 = class92.getWidget(var1); // L: 9212 + Client.field599 = var0; // L: 9213 + } else if (var2 == 33) { + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2971, Client.packetWriter.isaacCipher); // L: 9150 + var8.packetBuffer.writeShort(var0); // L: 9151 + var8.packetBuffer.writeShort(var3); // L: 9152 + var8.packetBuffer.writeIntME(var1); // L: 9153 + Client.packetWriter.addNode(var8); // L: 9154 + Client.field598 = 0; // L: 9155 + NPCComposition.field1991 = class92.getWidget(var1); // L: 9156 + Client.field599 = var0; // L: 9157 + } else if (var2 == 34) { + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3045, Client.packetWriter.isaacCipher); // L: 9510 + var8.packetBuffer.method7551(var3); // L: 9511 + var8.packetBuffer.writeInt(var1); // L: 9512 + var8.packetBuffer.method7641(var0); // L: 9513 + Client.packetWriter.addNode(var8); // L: 9514 + Client.field598 = 0; // L: 9515 + NPCComposition.field1991 = class92.getWidget(var1); // L: 9516 + Client.field599 = var0; // L: 9517 + } else if (var2 == 35) { + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3050, Client.packetWriter.isaacCipher); // L: 9408 + var8.packetBuffer.writeIntME(var1); // L: 9409 + var8.packetBuffer.method7551(var0); // L: 9410 + var8.packetBuffer.method7551(var3); // L: 9411 + Client.packetWriter.addNode(var8); // L: 9412 + Client.field598 = 0; // L: 9413 + NPCComposition.field1991 = class92.getWidget(var1); // L: 9414 + Client.field599 = var0; // L: 9415 + } else if (var2 == 36) { + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3028, Client.packetWriter.isaacCipher); // L: 9619 + var8.packetBuffer.method7641(var3); // L: 9620 + var8.packetBuffer.method7641(var0); // L: 9621 + var8.packetBuffer.writeInt(var1); // L: 9622 + Client.packetWriter.addNode(var8); // L: 9623 + Client.field598 = 0; // L: 9624 + NPCComposition.field1991 = class92.getWidget(var1); // L: 9625 + Client.field599 = var0; // L: 9626 + } else if (var2 == 37) { + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2979, Client.packetWriter.isaacCipher); // L: 9030 + var8.packetBuffer.method7550(var0); // L: 9031 + var8.packetBuffer.writeShort(var3); // L: 9032 + var8.packetBuffer.writeInt(var1); // L: 9033 + Client.packetWriter.addNode(var8); // L: 9034 + Client.field598 = 0; // L: 9035 + NPCComposition.field1991 = class92.getWidget(var1); // L: 9036 + Client.field599 = var0; // L: 9037 + } else { + if (var2 == 38) { + MusicPatchNode2.Widget_runOnTargetLeave(); // L: 9454 + var16 = class92.getWidget(var1); // L: 9455 + Client.isItemSelected = 1; // L: 9456 + PcmPlayer.selectedItemSlot = var0; // L: 9457 + class20.selectedItemWidget = var1; // L: 9458 + FloorUnderlayDefinition.selectedItemId = var3; // L: 9459 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var16); // L: 9460 + Client.selectedItemName = class166.colorStartTag(16748608) + FileSystem.ItemDefinition_get(var3).name + class166.colorStartTag(16777215); // L: 9461 + if (Client.selectedItemName == null) { // L: 9462 + Client.selectedItemName = "null"; + } + + return; // L: 9463 + } + + if (var2 == 39) { + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3024, Client.packetWriter.isaacCipher); // L: 9320 + var8.packetBuffer.writeShort(var3); // L: 9321 + var8.packetBuffer.method7551(var0); // L: 9322 + var8.packetBuffer.method7565(var1); // L: 9323 + Client.packetWriter.addNode(var8); // L: 9324 + Client.field598 = 0; // L: 9325 + NPCComposition.field1991 = class92.getWidget(var1); // L: 9326 + Client.field599 = var0; // L: 9327 + } else if (var2 == 40) { + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3008, Client.packetWriter.isaacCipher); // L: 9654 + var8.packetBuffer.method7551(var3); // L: 9655 + var8.packetBuffer.method7551(var0); // L: 9656 + var8.packetBuffer.method7565(var1); // L: 9657 + Client.packetWriter.addNode(var8); // L: 9658 + Client.field598 = 0; // L: 9659 + NPCComposition.field1991 = class92.getWidget(var1); // L: 9660 + Client.field599 = var0; // L: 9661 + } else if (var2 == 41) { + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3018, Client.packetWriter.isaacCipher); // L: 9608 + var8.packetBuffer.method7641(var0); // L: 9609 + var8.packetBuffer.method7551(var3); // L: 9610 + var8.packetBuffer.writeInt(var1); // L: 9611 + Client.packetWriter.addNode(var8); // L: 9612 + Client.field598 = 0; // L: 9613 + NPCComposition.field1991 = class92.getWidget(var1); // L: 9614 + Client.field599 = var0; // L: 9615 + } else if (var2 == 42) { + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2961, Client.packetWriter.isaacCipher); // L: 9265 + var8.packetBuffer.method7641(var0); // L: 9266 + var8.packetBuffer.method7563(var1); // L: 9267 + var8.packetBuffer.method7550(var3); // L: 9268 + Client.packetWriter.addNode(var8); // L: 9269 + Client.field598 = 0; // L: 9270 + NPCComposition.field1991 = class92.getWidget(var1); // L: 9271 + Client.field599 = var0; // L: 9272 + } else if (var2 == 43) { + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2966, Client.packetWriter.isaacCipher); // L: 9331 + var8.packetBuffer.method7641(var0); // L: 9332 + var8.packetBuffer.method7550(var3); // L: 9333 + var8.packetBuffer.writeInt(var1); // L: 9334 + Client.packetWriter.addNode(var8); // L: 9335 + Client.field598 = 0; // L: 9336 + NPCComposition.field1991 = class92.getWidget(var1); // L: 9337 + Client.field599 = var0; // L: 9338 + } else if (var2 == 44) { + var15 = Client.players[var3]; // L: 9672 + if (var15 != null) { // L: 9673 + Client.mouseCrossX = var6; // L: 9674 + Client.mouseCrossY = var7; // L: 9675 + Client.mouseCrossColor = 2; // L: 9676 + Client.mouseCrossState = 0; // L: 9677 + Client.destinationX = var0; // L: 9678 + Client.destinationY = var1; // L: 9679 + var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2965, Client.packetWriter.isaacCipher); // L: 9681 + var9.packetBuffer.writeShort(var3); // L: 9682 + var9.packetBuffer.method7687(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9683 + Client.packetWriter.addNode(var9); // L: 9684 + } + } else if (var2 == 45) { + var15 = Client.players[var3]; // L: 9133 + if (var15 != null) { // L: 9134 + Client.mouseCrossX = var6; // L: 9135 + Client.mouseCrossY = var7; // L: 9136 + Client.mouseCrossColor = 2; // L: 9137 + Client.mouseCrossState = 0; // L: 9138 + Client.destinationX = var0; // L: 9139 + Client.destinationY = var1; // L: 9140 + var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2975, Client.packetWriter.isaacCipher); // L: 9142 + var9.packetBuffer.method7550(var3); // L: 9143 + var9.packetBuffer.method7542(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9144 + Client.packetWriter.addNode(var9); // L: 9145 + } + } else if (var2 == 46) { + var15 = Client.players[var3]; // L: 8998 + if (var15 != null) { // L: 8999 + Client.mouseCrossX = var6; // L: 9000 + Client.mouseCrossY = var7; // L: 9001 + Client.mouseCrossColor = 2; // L: 9002 + Client.mouseCrossState = 0; // L: 9003 + Client.destinationX = var0; // L: 9004 + Client.destinationY = var1; // L: 9005 + var9 = WallDecoration.getPacketBufferNode(ClientPacket.field3003, Client.packetWriter.isaacCipher); // L: 9007 + var9.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9008 + var9.packetBuffer.writeShort(var3); // L: 9009 + Client.packetWriter.addNode(var9); // L: 9010 + } + } else if (var2 == 47) { + var15 = Client.players[var3]; // L: 9117 + if (var15 != null) { // L: 9118 + Client.mouseCrossX = var6; // L: 9119 + Client.mouseCrossY = var7; // L: 9120 + Client.mouseCrossColor = 2; // L: 9121 + Client.mouseCrossState = 0; // L: 9122 + Client.destinationX = var0; // L: 9123 + Client.destinationY = var1; // L: 9124 + var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2962, Client.packetWriter.isaacCipher); // L: 9126 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9127 + var9.packetBuffer.method7641(var3); // L: 9128 + Client.packetWriter.addNode(var9); // L: 9129 + } + } else if (var2 == 48) { + var15 = Client.players[var3]; // L: 9040 + if (var15 != null) { // L: 9041 + Client.mouseCrossX = var6; // L: 9042 + Client.mouseCrossY = var7; // L: 9043 + Client.mouseCrossColor = 2; // L: 9044 + Client.mouseCrossState = 0; // L: 9045 + Client.destinationX = var0; // L: 9046 + Client.destinationY = var1; // L: 9047 + var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2995, Client.packetWriter.isaacCipher); // L: 9049 + var9.packetBuffer.writeShort(var3); // L: 9050 + var9.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9051 + Client.packetWriter.addNode(var9); // L: 9052 + } + } else if (var2 == 49) { + var15 = Client.players[var3]; // L: 9703 + if (var15 != null) { // L: 9704 + Client.mouseCrossX = var6; // L: 9705 + Client.mouseCrossY = var7; // L: 9706 + Client.mouseCrossColor = 2; // L: 9707 + Client.mouseCrossState = 0; // L: 9708 + Client.destinationX = var0; // L: 9709 + Client.destinationY = var1; // L: 9710 + var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2969, Client.packetWriter.isaacCipher); // L: 9712 + var9.packetBuffer.method7641(var3); // L: 9713 + var9.packetBuffer.method7687(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9714 + Client.packetWriter.addNode(var9); // L: 9715 + } + } else if (var2 == 50) { + var15 = Client.players[var3]; // L: 9538 + if (var15 != null) { // L: 9539 + Client.mouseCrossX = var6; // L: 9540 + Client.mouseCrossY = var7; // L: 9541 + Client.mouseCrossColor = 2; // L: 9542 + Client.mouseCrossState = 0; // L: 9543 + Client.destinationX = var0; // L: 9544 + Client.destinationY = var1; // L: 9545 + var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2980, Client.packetWriter.isaacCipher); // L: 9547 + var9.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9548 + var9.packetBuffer.method7641(var3); // L: 9549 + Client.packetWriter.addNode(var9); // L: 9550 + } + } else if (var2 == 51) { + var15 = Client.players[var3]; // L: 9216 + if (var15 != null) { // L: 9217 + Client.mouseCrossX = var6; // L: 9218 + Client.mouseCrossY = var7; // L: 9219 + Client.mouseCrossColor = 2; // L: 9220 + Client.mouseCrossState = 0; // L: 9221 + Client.destinationX = var0; // L: 9222 + Client.destinationY = var1; // L: 9223 + var9 = WallDecoration.getPacketBufferNode(ClientPacket.field3019, Client.packetWriter.isaacCipher); // L: 9225 + var9.packetBuffer.method7542(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9226 + var9.packetBuffer.method7641(var3); // L: 9227 + Client.packetWriter.addNode(var9); // L: 9228 + } + } else { + label655: { + if (var2 != 57) { + if (var2 == 58) { + var16 = ApproximateRouteStrategy.getWidgetChild(var1, var0); // L: 9235 + if (var16 != null) { // L: 9236 + var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2963, Client.packetWriter.isaacCipher); // L: 9238 + var9.packetBuffer.method7565(ArchiveDiskActionHandler.selectedSpellWidget); // L: 9239 + var9.packetBuffer.method7563(var1); // L: 9240 + var9.packetBuffer.writeShort(var16.itemId); // L: 9241 + var9.packetBuffer.method7551(Client.selectedSpellChildIndex); // L: 9242 + var9.packetBuffer.method7550(var0); // L: 9243 + var9.packetBuffer.method7641(Client.selectedSpellItemId); // L: 9244 + Client.packetWriter.addNode(var9); // L: 9245 + } + break label655; + } + + if (var2 == 1001) { + Client.mouseCrossX = var6; // L: 9085 + Client.mouseCrossY = var7; // L: 9086 + Client.mouseCrossColor = 2; // L: 9087 + Client.mouseCrossState = 0; // L: 9088 + Client.destinationX = var0; // L: 9089 + Client.destinationY = var1; // L: 9090 + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2994, Client.packetWriter.isaacCipher); // L: 9092 + var8.packetBuffer.writeShort(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9093 + var8.packetBuffer.writeShort(var3); // L: 9094 + var8.packetBuffer.method7641(var0 + SecureRandomCallable.baseX); // L: 9095 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9096 + Client.packetWriter.addNode(var8); // L: 9097 + break label655; + } + + if (var2 == 1002) { + Client.mouseCrossX = var6; // L: 9309 + Client.mouseCrossY = var7; // L: 9310 + Client.mouseCrossColor = 2; // L: 9311 + Client.mouseCrossState = 0; // L: 9312 + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2950, Client.packetWriter.isaacCipher); // L: 9314 + var8.packetBuffer.writeShort(var3); // L: 9315 + Client.packetWriter.addNode(var8); // L: 9316 + break label655; + } + + if (var2 == 1003) { + Client.mouseCrossX = var6; // L: 9418 + Client.mouseCrossY = var7; // L: 9419 + Client.mouseCrossColor = 2; // L: 9420 + Client.mouseCrossState = 0; // L: 9421 + var13 = Client.npcs[var3]; // L: 9422 + if (var13 != null) { // L: 9423 + NPCComposition var17 = var13.definition; // L: 9424 + if (var17.transforms != null) { // L: 9425 + var17 = var17.transform(); + } + + if (var17 != null) { // L: 9426 + var11 = WallDecoration.getPacketBufferNode(ClientPacket.field3016, Client.packetWriter.isaacCipher); // L: 9428 + var11.packetBuffer.method7550(var17.id); // L: 9429 + Client.packetWriter.addNode(var11); // L: 9430 + } + } + break label655; + } + + if (var2 == 1004) { + Client.mouseCrossX = var6; // L: 9341 + Client.mouseCrossY = var7; // L: 9342 + Client.mouseCrossColor = 2; // L: 9343 + Client.mouseCrossState = 0; // L: 9344 + var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2986, Client.packetWriter.isaacCipher); // L: 9346 + var8.packetBuffer.writeShort(var3); // L: 9347 + Client.packetWriter.addNode(var8); // L: 9348 + break label655; + } + + if (var2 == 1005) { + var16 = class92.getWidget(var1); // L: 8925 + if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 8926 + WorldMapEvent.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + FileSystem.ItemDefinition_get(var3).name); + } else { + var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2986, Client.packetWriter.isaacCipher); // L: 8929 + var9.packetBuffer.writeShort(var3); // L: 8930 + Client.packetWriter.addNode(var9); // L: 8931 + } + + Client.field598 = 0; // L: 8933 + NPCComposition.field1991 = class92.getWidget(var1); // L: 8934 + Client.field599 = var0; // L: 8935 + break label655; + } + + if (var2 != 1007) { + if (var2 == 1009 || var2 == 1011 || var2 == 1008 || var2 == 1010 || var2 == 1012) { + ServerPacket.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 9232 + } + break label655; + } + } + + var16 = ApproximateRouteStrategy.getWidgetChild(var1, var0); // L: 9629 + if (var16 != null) { // L: 9630 + TaskHandler.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 9631 + } + } + } + } + } + } + } } } - } - @ObfuscatedName("ly") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1436846475" - ) - static final void method6102() { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 12368 - Player var1 = Client.players[Players.Players_indices[var0]]; // L: 12369 - var1.clearIsInFriendsChat(); // L: 12370 + if (Client.isItemSelected != 0) { // L: 9718 + Client.isItemSelected = 0; // L: 9719 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(class92.getWidget(class20.selectedItemWidget)); // L: 9720 } - } // L: 12372 - - @ObfuscatedName("md") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "126" - ) - static void method6099(int var0) { - if (var0 != Client.loginState) { // L: 12665 - Client.loginState = var0; // L: 12666 + if (Client.isSpellSelected) { // L: 9722 + MusicPatchNode2.Widget_runOnTargetLeave(); } - } // L: 12667 + + if (NPCComposition.field1991 != null && Client.field598 == 0) { // L: 9723 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(NPCComposition.field1991); + } + + } // L: 9724 } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index 74464a7d20..c95bf18c29 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -3,212 +3,212 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iq") +@ObfuscatedName("hv") @Implements("Model") public class Model extends Renderable { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lhv;" ) @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("Model_sharedSequenceModelFaceAlphas") static byte[] Model_sharedSequenceModelFaceAlphas; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lhv;" ) @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lnt;" + descriptor = "Lnw;" ) - static class387 field2723; - @ObfuscatedName("n") + static class388 field2550; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lnt;" + descriptor = "Lnw;" ) - static class387 field2724; - @ObfuscatedName("s") + static class388 field2606; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lnt;" + descriptor = "Lnw;" ) - static class387 field2749; - @ObfuscatedName("ad") - static boolean[] field2796; - @ObfuscatedName("ai") - static boolean[] field2764; - @ObfuscatedName("ax") + static class388 field2552; + @ObfuscatedName("ah") + static boolean[] field2597; + @ObfuscatedName("ao") + static boolean[] field2591; + @ObfuscatedName("av") @Export("modelViewportXs") static int[] modelViewportXs; - @ObfuscatedName("ar") + @ObfuscatedName("ai") @Export("modelViewportYs") static int[] modelViewportYs; - @ObfuscatedName("ap") - static int[] field2767; - @ObfuscatedName("az") - static int[] field2781; - @ObfuscatedName("as") - static int[] field2769; + @ObfuscatedName("ay") + static int[] field2548; @ObfuscatedName("aa") - static int[] field2727; - @ObfuscatedName("bm") - static int[] field2772; - @ObfuscatedName("br") - static int[][] field2773; + static int[] field2590; + @ObfuscatedName("ax") + static int[] field2596; + @ObfuscatedName("at") + static int[] field2602; + @ObfuscatedName("ba") + static int[] field2573; + @ObfuscatedName("bk") + static int[][] field2561; + @ObfuscatedName("bi") + static int[] field2601; + @ObfuscatedName("bc") + static int[][] field2547; @ObfuscatedName("bo") - static int[] field2719; + static int[] field2603; @ObfuscatedName("bl") - static int[][] field2775; - @ObfuscatedName("be") - static int[] field2789; - @ObfuscatedName("bh") - static int[] field2745; - @ObfuscatedName("bf") - static int[] field2776; - @ObfuscatedName("bb") - static int[] field2779; - @ObfuscatedName("bw") - static int[] field2765; + static int[] field2604; + @ObfuscatedName("bs") + static int[] field2605; @ObfuscatedName("bx") - static int[] field2784; - @ObfuscatedName("bg") + static int[] field2616; + @ObfuscatedName("bd") + static int[] field2607; + @ObfuscatedName("bj") + static int[] field2608; + @ObfuscatedName("be") @Export("Model_transformTempX") static int Model_transformTempX; - @ObfuscatedName("bn") + @ObfuscatedName("bf") @Export("Model_transformTempY") static int Model_transformTempY; - @ObfuscatedName("bq") + @ObfuscatedName("bz") @Export("Model_transformTempZ") static int Model_transformTempZ; - @ObfuscatedName("ba") - static boolean field2777; - @ObfuscatedName("by") + @ObfuscatedName("bv") + static boolean field2612; + @ObfuscatedName("bq") @Export("Model_sine") static int[] Model_sine; - @ObfuscatedName("bt") + @ObfuscatedName("bh") @Export("Model_cosine") static int[] Model_cosine; - @ObfuscatedName("bd") + @ObfuscatedName("bb") @Export("Model_colorPalette") static int[] Model_colorPalette; - @ObfuscatedName("bc") - static int[] field2791; - @ObfuscatedName("l") + @ObfuscatedName("bm") + static int[] field2560; + @ObfuscatedName("s") @Export("verticesCount") int verticesCount; - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("verticesX") int[] verticesX; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("verticesY") int[] verticesY; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("p") + @ObfuscatedName("c") @Export("indicesCount") int indicesCount; @ObfuscatedName("w") @Export("indices1") int[] indices1; - @ObfuscatedName("k") + @ObfuscatedName("b") @Export("indices2") int[] indices2; - @ObfuscatedName("d") + @ObfuscatedName("t") @Export("indices3") int[] indices3; - @ObfuscatedName("m") + @ObfuscatedName("g") @Export("faceColors1") int[] faceColors1; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("faceColors2") int[] faceColors2; - @ObfuscatedName("t") + @ObfuscatedName("n") @Export("faceColors3") int[] faceColors3; - @ObfuscatedName("g") + @ObfuscatedName("e") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("a") - byte[] field2739; - @ObfuscatedName("y") + @ObfuscatedName("f") + byte[] field2566; + @ObfuscatedName("d") @Export("faceTextures") short[] faceTextures; @ObfuscatedName("j") - byte field2741; - @ObfuscatedName("e") - int field2742; + byte field2568; @ObfuscatedName("z") - int[] field2743; - @ObfuscatedName("h") - int[] field2744; - @ObfuscatedName("ae") - int[] field2794; - @ObfuscatedName("aq") + int field2569; + @ObfuscatedName("i") + int[] field2570; + @ObfuscatedName("u") + int[] field2571; + @ObfuscatedName("ag") + int[] field2572; + @ObfuscatedName("ar") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("aw") + @ObfuscatedName("am") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("am") - int[][] field2748; - @ObfuscatedName("ak") - int[][] field2726; - @ObfuscatedName("ao") + @ObfuscatedName("ac") + int[][] field2575; + @ObfuscatedName("ab") + int[][] field2594; + @ObfuscatedName("aj") @Export("isSingleTile") public boolean isSingleTile; - @ObfuscatedName("aj") + @ObfuscatedName("ae") @Export("boundsType") int boundsType; - @ObfuscatedName("al") + @ObfuscatedName("az") @Export("bottomY") int bottomY; - @ObfuscatedName("av") + @ObfuscatedName("ap") @Export("xzRadius") int xzRadius; - @ObfuscatedName("at") + @ObfuscatedName("as") @Export("diameter") int diameter; - @ObfuscatedName("an") + @ObfuscatedName("au") @Export("radius") int radius; - @ObfuscatedName("ay") + @ObfuscatedName("ak") @Export("xMid") int xMid; - @ObfuscatedName("ag") + @ObfuscatedName("af") @Export("yMid") int yMid; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("zMid") int zMid; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @Export("xMidOffset") int xMidOffset; - @ObfuscatedName("ab") + @ObfuscatedName("ad") @Export("yMidOffset") int yMidOffset; - @ObfuscatedName("au") + @ObfuscatedName("an") @Export("zMidOffset") int zMidOffset; - @ObfuscatedName("bu") + @ObfuscatedName("bg") @Export("overrideHue") public byte overrideHue; - @ObfuscatedName("bz") + @ObfuscatedName("bp") @Export("overrideSaturation") public byte overrideSaturation; - @ObfuscatedName("bv") + @ObfuscatedName("bw") @Export("overrideLuminance") public byte overrideLuminance; - @ObfuscatedName("cm") + @ObfuscatedName("co") @Export("overrideAmount") public byte overrideAmount; @@ -217,39 +217,39 @@ public class Model extends Renderable { Model_sharedSequenceModelFaceAlphas = new byte[1]; // L: 12 Model_sharedSpotAnimationModel = new Model(); // L: 13 Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; // L: 14 - field2723 = new class387(); // L: 15 - field2724 = new class387(); // L: 16 - field2749 = new class387(); // L: 17 - field2796 = new boolean[6500]; // L: 55 - field2764 = new boolean[6500]; // L: 56 + field2550 = new class388(); // L: 15 + field2606 = new class388(); // L: 16 + field2552 = new class388(); // L: 17 + field2597 = new boolean[6500]; // L: 55 + field2591 = new boolean[6500]; // L: 56 modelViewportXs = new int[6500]; // L: 57 modelViewportYs = new int[6500]; // L: 58 - field2767 = new int[6500]; // L: 59 - field2781 = new int[6500]; // L: 60 - field2769 = new int[6500]; // L: 61 - field2727 = new int[6500]; // L: 62 - field2772 = new int[1600]; // L: 64 - field2773 = new int[1600][512]; // L: 65 - field2719 = new int[12]; // L: 66 - field2775 = new int[12][2000]; // L: 67 - field2789 = new int[2000]; // L: 68 - field2745 = new int[2000]; // L: 69 - field2776 = new int[12]; // L: 70 - field2779 = new int[10]; // L: 71 - field2765 = new int[10]; // L: 72 - field2784 = new int[10]; // L: 73 - field2777 = true; // L: 77 + field2548 = new int[6500]; // L: 59 + field2590 = new int[6500]; // L: 60 + field2596 = new int[6500]; // L: 61 + field2602 = new int[6500]; // L: 62 + field2573 = new int[1600]; // L: 64 + field2561 = new int[1600][512]; // L: 65 + field2601 = new int[12]; // L: 66 + field2547 = new int[12][2000]; // L: 67 + field2603 = new int[2000]; // L: 68 + field2604 = new int[2000]; // L: 69 + field2605 = new int[12]; // L: 70 + field2616 = new int[10]; // L: 71 + field2607 = new int[10]; // L: 72 + field2608 = new int[10]; // L: 73 + field2612 = true; // L: 77 Model_sine = Rasterizer3D.Rasterizer3D_sine; // L: 80 Model_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 81 Model_colorPalette = Rasterizer3D.Rasterizer3D_colorPalette; // L: 82 - field2791 = Rasterizer3D.field2571; // L: 83 + field2560 = Rasterizer3D.field2385; // L: 83 } Model() { this.verticesCount = 0; this.indicesCount = 0; - this.field2741 = 0; - this.field2742 = 0; + this.field2568 = 0; + this.field2569 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; @@ -257,13 +257,13 @@ public class Model extends Renderable { } // L: 91 @ObfuscatedSignature( - descriptor = "([Liq;I)V" + descriptor = "([Lhv;I)V" ) public Model(Model[] var1, int var2) { this.verticesCount = 0; // L: 18 this.indicesCount = 0; // L: 22 - this.field2741 = 0; // L: 33 - this.field2742 = 0; // L: 34 + this.field2568 = 0; // L: 33 + this.field2569 = 0; // L: 34 this.isSingleTile = false; // L: 42 this.xMidOffset = -1; // L: 51 this.yMidOffset = -1; // L: 52 @@ -274,8 +274,8 @@ public class Model extends Renderable { boolean var6 = false; // L: 97 this.verticesCount = 0; // L: 98 this.indicesCount = 0; // L: 99 - this.field2742 = 0; // L: 100 - this.field2741 = -1; // L: 101 + this.field2569 = 0; // L: 100 + this.field2568 = -1; // L: 101 int var7; Model var8; @@ -284,22 +284,22 @@ public class Model extends Renderable { if (var8 != null) { // L: 104 this.verticesCount += var8.verticesCount; // L: 105 this.indicesCount += var8.indicesCount; // L: 106 - this.field2742 += var8.field2742; // L: 107 + this.field2569 += var8.field2569; // L: 107 if (var8.faceRenderPriorities != null) { // L: 108 var3 = true; } else { - if (this.field2741 == -1) { // L: 110 - this.field2741 = var8.field2741; + if (this.field2568 == -1) { // L: 110 + this.field2568 = var8.field2568; } - if (this.field2741 != var8.field2741) { // L: 111 + if (this.field2568 != var8.field2568) { // L: 111 var3 = true; } } var4 |= var8.faceAlphas != null; // L: 113 var5 |= var8.faceTextures != null; // L: 114 - var6 |= var8.field2739 != null; // L: 115 + var6 |= var8.field2566 != null; // L: 115 } } @@ -325,18 +325,18 @@ public class Model extends Renderable { } if (var6) { // L: 130 - this.field2739 = new byte[this.indicesCount]; + this.field2566 = new byte[this.indicesCount]; } - if (this.field2742 > 0) { // L: 131 - this.field2743 = new int[this.field2742]; // L: 132 - this.field2744 = new int[this.field2742]; // L: 133 - this.field2794 = new int[this.field2742]; // L: 134 + if (this.field2569 > 0) { // L: 131 + this.field2570 = new int[this.field2569]; // L: 132 + this.field2571 = new int[this.field2569]; // L: 133 + this.field2572 = new int[this.field2569]; // L: 134 } this.verticesCount = 0; // L: 136 this.indicesCount = 0; // L: 137 - this.field2742 = 0; // L: 138 + this.field2569 = 0; // L: 138 for (var7 = 0; var7 < var2; ++var7) { // L: 139 var8 = var1[var7]; // L: 140 @@ -353,7 +353,7 @@ public class Model extends Renderable { if (var8.faceRenderPriorities != null) { // L: 150 this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9]; } else { - this.faceRenderPriorities[this.indicesCount] = var8.field2741; // L: 151 + this.faceRenderPriorities[this.indicesCount] = var8.field2568; // L: 151 } } @@ -370,21 +370,21 @@ public class Model extends Renderable { } if (var6) { // L: 160 - if (var8.field2739 != null && var8.field2739[var9] != -1) { // L: 161 - this.field2739[this.indicesCount] = (byte)(this.field2742 + var8.field2739[var9]); + if (var8.field2566 != null && var8.field2566[var9] != -1) { // L: 161 + this.field2566[this.indicesCount] = (byte)(this.field2569 + var8.field2566[var9]); } else { - this.field2739[this.indicesCount] = -1; // L: 162 + this.field2566[this.indicesCount] = -1; // L: 162 } } ++this.indicesCount; // L: 164 } - for (var9 = 0; var9 < var8.field2742; ++var9) { // L: 166 - this.field2743[this.field2742] = this.verticesCount + var8.field2743[var9]; // L: 167 - this.field2744[this.field2742] = this.verticesCount + var8.field2744[var9]; // L: 168 - this.field2794[this.field2742] = this.verticesCount + var8.field2794[var9]; // L: 169 - ++this.field2742; // L: 170 + for (var9 = 0; var9 < var8.field2569; ++var9) { // L: 166 + this.field2570[this.field2569] = this.verticesCount + var8.field2570[var9]; // L: 167 + this.field2571[this.field2569] = this.verticesCount + var8.field2571[var9]; // L: 168 + this.field2572[this.field2569] = this.verticesCount + var8.field2572[var9]; // L: 169 + ++this.field2569; // L: 170 } for (var9 = 0; var9 < var8.verticesCount; ++var9) { // L: 172 @@ -398,9 +398,9 @@ public class Model extends Renderable { } // L: 180 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Liq;" + descriptor = "([[IIIIZI)Lhv;" ) @Export("contourGround") public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { @@ -422,7 +422,7 @@ public class Model extends Renderable { var11 = new Model(); // L: 196 var11.verticesCount = this.verticesCount; // L: 197 var11.indicesCount = this.indicesCount; // L: 198 - var11.field2742 = this.field2742; // L: 199 + var11.field2569 = this.field2569; // L: 199 var11.verticesX = this.verticesX; // L: 200 var11.verticesZ = this.verticesZ; // L: 201 var11.indices1 = this.indices1; // L: 202 @@ -433,12 +433,12 @@ public class Model extends Renderable { var11.faceColors3 = this.faceColors3; // L: 207 var11.faceRenderPriorities = this.faceRenderPriorities; // L: 208 var11.faceAlphas = this.faceAlphas; // L: 209 - var11.field2739 = this.field2739; // L: 210 + var11.field2566 = this.field2566; // L: 210 var11.faceTextures = this.faceTextures; // L: 211 - var11.field2741 = this.field2741; // L: 212 - var11.field2743 = this.field2743; // L: 213 - var11.field2744 = this.field2744; // L: 214 - var11.field2794 = this.field2794; // L: 215 + var11.field2568 = this.field2568; // L: 212 + var11.field2570 = this.field2570; // L: 213 + var11.field2571 = this.field2571; // L: 214 + var11.field2572 = this.field2572; // L: 215 var11.vertexLabels = this.vertexLabels; // L: 216 var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 217 var11.isSingleTile = this.isSingleTile; // L: 218 @@ -496,9 +496,9 @@ public class Model extends Renderable { } } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Z)Liq;" + descriptor = "(Z)Lhv;" ) @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { @@ -509,9 +509,9 @@ public class Model extends Renderable { return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); // L: 261 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Z)Liq;" + descriptor = "(Z)Lhv;" ) @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { @@ -522,15 +522,15 @@ public class Model extends Renderable { return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); // L: 266 } - @ObfuscatedName("l") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(ZLiq;[B)Liq;" + descriptor = "(ZLhv;[B)Lhv;" ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.verticesCount = this.verticesCount; // L: 270 var2.indicesCount = this.indicesCount; // L: 271 - var2.field2742 = this.field2742; // L: 272 + var2.field2569 = this.field2569; // L: 272 if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { // L: 273 var2.verticesX = new int[this.verticesCount + 100]; // L: 274 var2.verticesY = new int[this.verticesCount + 100]; // L: 275 @@ -566,23 +566,23 @@ public class Model extends Renderable { var2.faceColors2 = this.faceColors2; // L: 297 var2.faceColors3 = this.faceColors3; // L: 298 var2.faceRenderPriorities = this.faceRenderPriorities; // L: 299 - var2.field2739 = this.field2739; // L: 300 + var2.field2566 = this.field2566; // L: 300 var2.faceTextures = this.faceTextures; // L: 301 - var2.field2741 = this.field2741; // L: 302 - var2.field2743 = this.field2743; // L: 303 - var2.field2744 = this.field2744; // L: 304 - var2.field2794 = this.field2794; // L: 305 + var2.field2568 = this.field2568; // L: 302 + var2.field2570 = this.field2570; // L: 303 + var2.field2571 = this.field2571; // L: 304 + var2.field2572 = this.field2572; // L: 305 var2.vertexLabels = this.vertexLabels; // L: 306 var2.faceLabelsAlpha = this.faceLabelsAlpha; // L: 307 - var2.field2748 = this.field2748; // L: 308 - var2.field2726 = this.field2726; // L: 309 + var2.field2575 = this.field2575; // L: 308 + var2.field2594 = this.field2594; // L: 309 var2.isSingleTile = this.isSingleTile; // L: 310 var2.resetBounds(); // L: 311 var2.overrideAmount = 0; // L: 312 return var2; // L: 313 } - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("calculateBoundingBox") void calculateBoundingBox(int var1) { if (this.xMidOffset == -1) { // L: 317 @@ -596,9 +596,9 @@ public class Model extends Renderable { int var9 = Model_sine[var1]; // L: 325 for (int var10 = 0; var10 < this.verticesCount; ++var10) { // L: 326 - int var11 = Rasterizer3D.method4626(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 327 + int var11 = Rasterizer3D.method3927(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 327 int var12 = this.verticesY[var10]; // L: 328 - int var13 = Rasterizer3D.method4663(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 329 + int var13 = Rasterizer3D.method3951(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 329 if (var11 < var2) { // L: 330 var2 = var11; } @@ -630,6 +630,7 @@ public class Model extends Renderable { this.xMidOffset = (var5 - var2 + 1) / 2; // L: 340 this.yMidOffset = (var6 - var3 + 1) / 2; // L: 341 this.zMidOffset = (var7 - var4 + 1) / 2; // L: 342 + boolean var14 = true; // L: 343 if (this.xMidOffset < 32) { // L: 344 this.xMidOffset = 32; } @@ -639,6 +640,7 @@ public class Model extends Renderable { } if (this.isSingleTile) { // L: 346 + boolean var15 = true; // L: 347 this.xMidOffset += 8; // L: 348 this.zMidOffset += 8; // L: 349 } @@ -646,7 +648,7 @@ public class Model extends Renderable { } } // L: 351 - @ObfuscatedName("o") + @ObfuscatedName("y") @Export("calculateBoundsCylinder") public void calculateBoundsCylinder() { if (this.boundsType != 1) { // L: 354 @@ -679,8 +681,8 @@ public class Model extends Renderable { } } // L: 371 - @ObfuscatedName("r") - void method4972() { + @ObfuscatedName("c") + void method4255() { if (this.boundsType != 2) { // L: 374 this.boundsType = 2; // L: 375 this.xzRadius = 0; // L: 376 @@ -701,22 +703,22 @@ public class Model extends Renderable { } } // L: 387 - @ObfuscatedName("p") - public int method5014() { + @ObfuscatedName("w") + public int method4277() { this.calculateBoundsCylinder(); // L: 390 return this.xzRadius; // L: 391 } - @ObfuscatedName("w") + @ObfuscatedName("b") @Export("resetBounds") public void resetBounds() { this.boundsType = 0; // L: 395 this.xMidOffset = -1; // L: 396 } // L: 397 - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lim;I)V" + descriptor = "(Lgt;I)V" ) @Export("animate") public void animate(Frames var1, int var2) { @@ -738,36 +740,36 @@ public class Model extends Renderable { } } // L: 412 - @ObfuscatedName("d") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Ldo;I)V" + descriptor = "(Lds;I)V" ) - public void method5000(class122 var1, int var2) { - Skeleton var3 = var1.field1472; // L: 415 - class231 var4 = var3.method4721(); // L: 416 + public void method4259(class122 var1, int var2) { + Skeleton var3 = var1.field1535; // L: 415 + class202 var4 = var3.method4023(); // L: 416 if (var4 != null) { // L: 417 - var3.method4721().method4717(var1, var2); // L: 418 - this.method4978(var3.method4721(), var1.method2766()); // L: 419 + var3.method4023().method4000(var1, var2); // L: 418 + this.method4313(var3.method4023(), var1.method2753()); // L: 419 } - if (var1.method2768()) { // L: 421 - this.method5017(var1, var2); // L: 422 + if (var1.method2755()) { // L: 421 + this.method4260(var1, var2); // L: 422 } this.resetBounds(); // L: 424 } // L: 425 - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Ldo;I)V" + descriptor = "(Lds;I)V" ) - void method5017(class122 var1, int var2) { - Skeleton var3 = var1.field1472; // L: 428 + void method4260(class122 var1, int var2) { + Skeleton var3 = var1.field1535; // L: 428 for (int var4 = 0; var4 < var3.count; ++var4) { // L: 429 int var5 = var3.transformTypes[var4]; // L: 430 - if (var5 == 5 && var1.field1474 != null && var1.field1474[var4] != null && var1.field1474[var4][0] != null && this.faceLabelsAlpha != null && this.faceAlphas != null) { // L: 431 432 - class117 var6 = var1.field1474[var4][0]; // L: 433 + if (var5 == 5 && var1.field1530 != null && var1.field1530[var4] != null && var1.field1530[var4][0] != null && this.faceLabelsAlpha != null && this.faceAlphas != null) { // L: 431 432 + class117 var6 = var1.field1530[var4][0]; // L: 433 int[] var7 = var3.labels[var4]; // L: 434 int var8 = var7.length; // L: 435 @@ -778,7 +780,7 @@ public class Model extends Renderable { for (int var12 = 0; var12 < var11.length; ++var12) { // L: 440 int var13 = var11[var12]; // L: 441 - int var14 = (int)((float)(this.faceAlphas[var13] & 255) + var6.method2709(var2) * 255.0F); // L: 442 + int var14 = (int)((float)(this.faceAlphas[var13] & 255) + var6.method2689(var2) * 255.0F); // L: 442 if (var14 < 0) { // L: 443 var14 = 0; } else if (var14 > 255) { // L: 444 @@ -794,17 +796,17 @@ public class Model extends Renderable { } // L: 452 - @ObfuscatedName("u") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lhk;I)V" + descriptor = "(Lgb;I)V" ) - void method4978(class231 var1, int var2) { - this.method5034(var1, var2); // L: 456 + void method4313(class202 var1, int var2) { + this.method4280(var1, var2); // L: 456 } // L: 458 - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lim;ILim;I[I)V" + descriptor = "(Lgt;ILgt;I[I)V" ) @Export("animate2") public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { @@ -854,29 +856,29 @@ public class Model extends Renderable { } } // L: 464 490 - @ObfuscatedName("g") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ldo;I[ZZ)V" + descriptor = "(Lds;I[ZZ)V" ) - public void method4965(class122 var1, int var2, boolean[] var3, boolean var4) { - Skeleton var5 = var1.field1472; // L: 493 - class231 var6 = var5.method4721(); // L: 494 + public void method4263(class122 var1, int var2, boolean[] var3, boolean var4) { + Skeleton var5 = var1.field1535; // L: 493 + class202 var6 = var5.method4023(); // L: 494 if (var6 != null) { // L: 495 - var6.method4701(var1, var2, var3, var4); // L: 496 - this.method4978(var6, var1.method2766()); // L: 497 + var6.method4014(var1, var2, var3, var4); // L: 496 + this.method4313(var6, var1.method2753()); // L: 497 } - if (var1.method2768()) { // L: 499 - this.method5017(var1, var2); // L: 500 + if (var1.method2755()) { // L: 499 + this.method4260(var1, var2); // L: 500 } } // L: 502 - @ObfuscatedName("x") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lim;I[IZ)V" + descriptor = "(Lgt;I[IZ)V" ) - public void method4981(Frames var1, int var2, int[] var3, boolean var4) { + public void method4264(Frames var1, int var2, int[] var3, boolean var4) { if (var3 == null) { // L: 505 this.animate(var1, var2); // L: 506 } else { @@ -906,7 +908,7 @@ public class Model extends Renderable { } } // L: 507 526 - @ObfuscatedName("a") + @ObfuscatedName("d") @Export("transform") void transform(int var1, int[] var2, int var3, int var4, int var5) { int var6 = var2.length; // L: 529 @@ -1074,7 +1076,7 @@ public class Model extends Renderable { } } // L: 558 573 615 636 654 656 - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("rotateY90Ccw") public void rotateY90Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 659 @@ -1086,7 +1088,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 664 } // L: 665 - @ObfuscatedName("j") + @ObfuscatedName("z") @Export("rotateY180") public void rotateY180() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 668 @@ -1097,7 +1099,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 672 } // L: 673 - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("rotateY270Ccw") public void rotateY270Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 676 @@ -1109,7 +1111,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 681 } // L: 682 - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("rotateZ") public void rotateZ(int var1) { int var2 = Model_sine[var1]; // L: 685 @@ -1124,7 +1126,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 692 } // L: 693 - @ObfuscatedName("h") + @ObfuscatedName("ag") @Export("offsetBy") public void offsetBy(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 696 @@ -1139,7 +1141,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 701 } // L: 702 - @ObfuscatedName("ae") + @ObfuscatedName("ar") @Export("scale") public void scale(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 705 @@ -1151,11 +1153,11 @@ public class Model extends Renderable { this.resetBounds(); // L: 710 } // L: 711 - @ObfuscatedName("aq") - public final void method5003(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - field2772[0] = -1; // L: 714 + @ObfuscatedName("am") + public final void method4272(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + field2573[0] = -1; // L: 714 if (this.boundsType != 2 && this.boundsType != 1) { // L: 715 - this.method4972(); + this.method4255(); } int var8 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 716 @@ -1198,13 +1200,13 @@ public class Model extends Renderable { var22 += var7; // L: 748 var23 = var21 * var17 - var22 * var16 >> 16; // L: 749 var22 = var21 * var16 + var22 * var17 >> 16; // L: 750 - field2767[var19] = var22 - var18; // L: 752 + field2548[var19] = var22 - var18; // L: 752 modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; // L: 753 modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; // L: 754 - if (this.field2742 > 0) { // L: 755 - field2781[var19] = var20; // L: 756 - field2769[var19] = var23; // L: 757 - field2727[var19] = var22; // L: 758 + if (this.field2569 > 0) { // L: 755 + field2590[var19] = var20; // L: 756 + field2596[var19] = var23; // L: 757 + field2602[var19] = var22; // L: 758 } } @@ -1215,11 +1217,11 @@ public class Model extends Renderable { } // L: 765 - @ObfuscatedName("aw") - public final void method5050(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - field2772[0] = -1; // L: 768 + @ObfuscatedName("ac") + public final void method4273(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + field2573[0] = -1; // L: 768 if (this.boundsType != 2 && this.boundsType != 1) { // L: 769 - this.method4972(); + this.method4255(); } int var9 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 770 @@ -1262,13 +1264,13 @@ public class Model extends Renderable { var23 += var7; // L: 802 var24 = var22 * var18 - var23 * var17 >> 16; // L: 803 var23 = var22 * var17 + var23 * var18 >> 16; // L: 804 - field2767[var20] = var23 - var19; // L: 806 + field2548[var20] = var23 - var19; // L: 806 modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 807 modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 808 - if (this.field2742 > 0) { // L: 809 - field2781[var20] = var21; // L: 810 - field2769[var20] = var24; // L: 811 - field2727[var20] = var23; // L: 812 + if (this.field2569 > 0) { // L: 809 + field2590[var20] = var21; // L: 810 + field2596[var20] = var24; // L: 811 + field2602[var20] = var23; // L: 812 } } @@ -1279,16 +1281,16 @@ public class Model extends Renderable { } // L: 819 - @ObfuscatedName("am") + @ObfuscatedName("ab") @Export("draw0") final void draw0(boolean var1, boolean var2, boolean var3, long var4) { - if (this.diameter < 1600) { // L: 1003 + if (this.diameter < 1600) { // L: 1026 int var6; - for (var6 = 0; var6 < this.diameter; ++var6) { // L: 1004 - field2772[var6] = 0; + for (var6 = 0; var6 < this.diameter; ++var6) { // L: 1027 + field2573[var6] = 0; } - var6 = var3 ? 20 : 5; // L: 1005 + var6 = var3 ? 20 : 5; // L: 1028 int var7; int var8; @@ -1300,464 +1302,493 @@ public class Model extends Renderable { int var16; int var18; int var28; - for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 1006 - if (this.faceColors3[var7] != -2) { // L: 1007 - var8 = this.indices1[var7]; // L: 1008 - var9 = this.indices2[var7]; // L: 1009 - var10 = this.indices3[var7]; // L: 1010 - var11 = modelViewportXs[var8]; // L: 1011 - var12 = modelViewportXs[var9]; // L: 1012 - var28 = modelViewportXs[var10]; // L: 1013 + for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 1029 + if (this.faceColors3[var7] != -2) { // L: 1030 + var8 = this.indices1[var7]; // L: 1031 + var9 = this.indices2[var7]; // L: 1032 + var10 = this.indices3[var7]; // L: 1033 + var11 = modelViewportXs[var8]; // L: 1034 + var12 = modelViewportXs[var9]; // L: 1035 + var28 = modelViewportXs[var10]; // L: 1036 int var29; - if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { // L: 1014 - if (var2 && class135.method2919(modelViewportYs[var8], modelViewportYs[var9], modelViewportYs[var10], var11, var12, var28, var6)) { // L: 1040 - KeyHandler.method350(var4); // L: 1041 - var2 = false; // L: 1042 - } - - if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 1044 - field2764[var7] = false; // L: 1045 - if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1046 - field2796[var7] = false; // L: 1047 + int var30; + if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { // L: 1037 + if (var2) { // L: 1063 + var15 = modelViewportYs[var8]; // L: 1065 + var16 = modelViewportYs[var9]; // L: 1066 + var30 = modelViewportYs[var10]; // L: 1067 + var18 = var6 + ViewportMouse.ViewportMouse_y; // L: 1069 + boolean var34; + if (var18 < var15 && var18 < var16 && var18 < var30) { // L: 1070 + var34 = false; // L: 1071 } else { - field2796[var7] = true; + var18 = ViewportMouse.ViewportMouse_y - var6; // L: 1074 + if (var18 > var15 && var18 > var16 && var18 > var30) { // L: 1075 + var34 = false; // L: 1076 + } else { + var18 = var6 + ViewportMouse.ViewportMouse_x; // L: 1079 + if (var18 < var11 && var18 < var12 && var18 < var28) { // L: 1080 + var34 = false; // L: 1081 + } else { + var18 = ViewportMouse.ViewportMouse_x - var6; // L: 1084 + if (var18 > var11 && var18 > var12 && var18 > var28) { // L: 1085 + var34 = false; // L: 1086 + } else { + var34 = true; // L: 1089 + } + } + } } - var29 = (field2767[var8] + field2767[var9] + field2767[var10]) / 3 + this.radius; // L: 1048 - field2773[var29][field2772[var29]++] = var7; // L: 1049 + if (var34) { // L: 1091 + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; // L: 1094 + var2 = false; // L: 1096 + } + } + + if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 1099 + field2591[var7] = false; // L: 1100 + if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1101 + field2597[var7] = false; // L: 1102 + } else { + field2597[var7] = true; + } + + var29 = (field2548[var8] + field2548[var9] + field2548[var10]) / 3 + this.radius; // L: 1103 + field2561[var29][field2573[var29]++] = var7; // L: 1104 } } else { - var29 = field2781[var8]; // L: 1015 - var15 = field2781[var9]; // L: 1016 - var16 = field2781[var10]; // L: 1017 - int var30 = field2769[var8]; // L: 1018 - var18 = field2769[var9]; // L: 1019 - int var19 = field2769[var10]; // L: 1020 - int var20 = field2727[var8]; // L: 1021 - int var21 = field2727[var9]; // L: 1022 - int var22 = field2727[var10]; // L: 1023 - var29 -= var15; // L: 1024 - var16 -= var15; // L: 1025 - var30 -= var18; // L: 1026 - var19 -= var18; // L: 1027 - var20 -= var21; // L: 1028 - var22 -= var21; // L: 1029 - int var23 = var30 * var22 - var20 * var19; // L: 1030 - int var24 = var20 * var16 - var29 * var22; // L: 1031 - int var25 = var29 * var19 - var30 * var16; // L: 1032 - if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 1033 - field2764[var7] = true; // L: 1034 - int var26 = (field2767[var8] + field2767[var9] + field2767[var10]) / 3 + this.radius; // L: 1035 - field2773[var26][field2772[var26]++] = var7; // L: 1036 + var29 = field2590[var8]; // L: 1038 + var15 = field2590[var9]; // L: 1039 + var16 = field2590[var10]; // L: 1040 + var30 = field2596[var8]; // L: 1041 + var18 = field2596[var9]; // L: 1042 + int var19 = field2596[var10]; // L: 1043 + int var20 = field2602[var8]; // L: 1044 + int var21 = field2602[var9]; // L: 1045 + int var22 = field2602[var10]; // L: 1046 + var29 -= var15; // L: 1047 + var16 -= var15; // L: 1048 + var30 -= var18; // L: 1049 + var19 -= var18; // L: 1050 + var20 -= var21; // L: 1051 + var22 -= var21; // L: 1052 + int var23 = var30 * var22 - var20 * var19; // L: 1053 + int var24 = var20 * var16 - var29 * var22; // L: 1054 + int var25 = var29 * var19 - var30 * var16; // L: 1055 + if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 1056 + field2591[var7] = true; // L: 1057 + int var26 = (field2548[var8] + field2548[var9] + field2548[var10]) / 3 + this.radius; // L: 1058 + field2561[var26][field2573[var26]++] = var7; // L: 1059 } } } } int[] var27; - if (this.faceRenderPriorities == null) { // L: 1053 - for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1054 - var8 = field2772[var7]; // L: 1055 - if (var8 > 0) { // L: 1056 - var27 = field2773[var7]; // L: 1057 + if (this.faceRenderPriorities == null) { // L: 1108 + for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1109 + var8 = field2573[var7]; // L: 1110 + if (var8 > 0) { // L: 1111 + var27 = field2561[var7]; // L: 1112 - for (var10 = 0; var10 < var8; ++var10) { // L: 1058 + for (var10 = 0; var10 < var8; ++var10) { // L: 1113 this.drawFace(var27[var10]); } } } } else { - for (var7 = 0; var7 < 12; ++var7) { // L: 1063 - field2719[var7] = 0; // L: 1064 - field2776[var7] = 0; // L: 1065 + for (var7 = 0; var7 < 12; ++var7) { // L: 1118 + field2601[var7] = 0; // L: 1119 + field2605[var7] = 0; // L: 1120 } - for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1067 - var8 = field2772[var7]; // L: 1068 - if (var8 > 0) { // L: 1069 - var27 = field2773[var7]; // L: 1070 + for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1122 + var8 = field2573[var7]; // L: 1123 + if (var8 > 0) { // L: 1124 + var27 = field2561[var7]; // L: 1125 - for (var10 = 0; var10 < var8; ++var10) { // L: 1071 - var11 = var27[var10]; // L: 1072 - byte var31 = this.faceRenderPriorities[var11]; // L: 1073 - var28 = field2719[var31]++; // L: 1074 - field2775[var31][var28] = var11; // L: 1075 - if (var31 < 10) { // L: 1076 - int[] var10000 = field2776; - var10000[var31] += var7; - } else if (var31 == 10) { // L: 1077 - field2789[var28] = var7; + for (var10 = 0; var10 < var8; ++var10) { // L: 1126 + var11 = var27[var10]; // L: 1127 + byte var33 = this.faceRenderPriorities[var11]; // L: 1128 + var28 = field2601[var33]++; // L: 1129 + field2547[var33][var28] = var11; // L: 1130 + if (var33 < 10) { // L: 1131 + int[] var10000 = field2605; + var10000[var33] += var7; + } else if (var33 == 10) { // L: 1132 + field2603[var28] = var7; } else { - field2745[var28] = var7; // L: 1078 + field2604[var28] = var7; // L: 1133 } } } } - var7 = 0; // L: 1082 - if (field2719[1] > 0 || field2719[2] > 0) { // L: 1083 - var7 = (field2776[1] + field2776[2]) / (field2719[1] + field2719[2]); + var7 = 0; // L: 1137 + if (field2601[1] > 0 || field2601[2] > 0) { // L: 1138 + var7 = (field2605[1] + field2605[2]) / (field2601[1] + field2601[2]); } - var8 = 0; // L: 1084 - if (field2719[3] > 0 || field2719[4] > 0) { // L: 1085 - var8 = (field2776[3] + field2776[4]) / (field2719[3] + field2719[4]); + var8 = 0; // L: 1139 + if (field2601[3] > 0 || field2601[4] > 0) { // L: 1140 + var8 = (field2605[3] + field2605[4]) / (field2601[3] + field2601[4]); } - var9 = 0; // L: 1086 - if (field2719[6] > 0 || field2719[8] > 0) { // L: 1087 - var9 = (field2776[8] + field2776[6]) / (field2719[8] + field2719[6]); + var9 = 0; // L: 1141 + if (field2601[6] > 0 || field2601[8] > 0) { // L: 1142 + var9 = (field2605[8] + field2605[6]) / (field2601[8] + field2601[6]); } - var11 = 0; // L: 1089 - var12 = field2719[10]; // L: 1090 - int[] var13 = field2775[10]; // L: 1091 - int[] var14 = field2789; // L: 1092 - if (var11 == var12) { // L: 1093 - var11 = 0; // L: 1094 - var12 = field2719[11]; // L: 1095 - var13 = field2775[11]; // L: 1096 - var14 = field2745; // L: 1097 + var11 = 0; // L: 1144 + var12 = field2601[10]; // L: 1145 + int[] var13 = field2547[10]; // L: 1146 + int[] var14 = field2603; // L: 1147 + if (var11 == var12) { // L: 1148 + var11 = 0; // L: 1149 + var12 = field2601[11]; // L: 1150 + var13 = field2547[11]; // L: 1151 + var14 = field2604; // L: 1152 } - if (var11 < var12) { // L: 1099 + if (var11 < var12) { // L: 1154 var10 = var14[var11]; } else { - var10 = -1000; // L: 1100 + var10 = -1000; // L: 1155 } - for (var15 = 0; var15 < 10; ++var15) { // L: 1101 - while (var15 == 0 && var10 > var7) { // L: 1102 - this.drawFace(var13[var11++]); // L: 1103 - if (var11 == var12 && var13 != field2775[11]) { // L: 1104 - var11 = 0; // L: 1105 - var12 = field2719[11]; // L: 1106 - var13 = field2775[11]; // L: 1107 - var14 = field2745; // L: 1108 + for (var15 = 0; var15 < 10; ++var15) { // L: 1156 + while (var15 == 0 && var10 > var7) { // L: 1157 + this.drawFace(var13[var11++]); // L: 1158 + if (var11 == var12 && var13 != field2547[11]) { // L: 1159 + var11 = 0; // L: 1160 + var12 = field2601[11]; // L: 1161 + var13 = field2547[11]; // L: 1162 + var14 = field2604; // L: 1163 } - if (var11 < var12) { // L: 1110 + if (var11 < var12) { // L: 1165 var10 = var14[var11]; } else { - var10 = -1000; // L: 1111 + var10 = -1000; // L: 1166 } } - while (var15 == 3 && var10 > var8) { // L: 1113 - this.drawFace(var13[var11++]); // L: 1114 - if (var11 == var12 && var13 != field2775[11]) { // L: 1115 - var11 = 0; // L: 1116 - var12 = field2719[11]; // L: 1117 - var13 = field2775[11]; // L: 1118 - var14 = field2745; // L: 1119 + while (var15 == 3 && var10 > var8) { // L: 1168 + this.drawFace(var13[var11++]); // L: 1169 + if (var11 == var12 && var13 != field2547[11]) { // L: 1170 + var11 = 0; // L: 1171 + var12 = field2601[11]; // L: 1172 + var13 = field2547[11]; // L: 1173 + var14 = field2604; // L: 1174 } - if (var11 < var12) { // L: 1121 + if (var11 < var12) { // L: 1176 var10 = var14[var11]; } else { - var10 = -1000; // L: 1122 + var10 = -1000; // L: 1177 } } - while (var15 == 5 && var10 > var9) { // L: 1124 - this.drawFace(var13[var11++]); // L: 1125 - if (var11 == var12 && var13 != field2775[11]) { // L: 1126 - var11 = 0; // L: 1127 - var12 = field2719[11]; // L: 1128 - var13 = field2775[11]; // L: 1129 - var14 = field2745; // L: 1130 + while (var15 == 5 && var10 > var9) { // L: 1179 + this.drawFace(var13[var11++]); // L: 1180 + if (var11 == var12 && var13 != field2547[11]) { // L: 1181 + var11 = 0; // L: 1182 + var12 = field2601[11]; // L: 1183 + var13 = field2547[11]; // L: 1184 + var14 = field2604; // L: 1185 } - if (var11 < var12) { // L: 1132 + if (var11 < var12) { // L: 1187 var10 = var14[var11]; } else { - var10 = -1000; // L: 1133 + var10 = -1000; // L: 1188 } } - var16 = field2719[var15]; // L: 1135 - int[] var17 = field2775[var15]; // L: 1136 + var16 = field2601[var15]; // L: 1190 + int[] var17 = field2547[var15]; // L: 1191 - for (var18 = 0; var18 < var16; ++var18) { // L: 1137 - this.drawFace(var17[var18]); // L: 1138 + for (var18 = 0; var18 < var16; ++var18) { // L: 1192 + this.drawFace(var17[var18]); // L: 1193 } } - while (var10 != -1000) { // L: 1141 - this.drawFace(var13[var11++]); // L: 1142 - if (var11 == var12 && var13 != field2775[11]) { // L: 1143 - var11 = 0; // L: 1144 - var13 = field2775[11]; // L: 1145 - var12 = field2719[11]; // L: 1146 - var14 = field2745; // L: 1147 + while (var10 != -1000) { // L: 1196 + this.drawFace(var13[var11++]); // L: 1197 + if (var11 == var12 && var13 != field2547[11]) { // L: 1198 + var11 = 0; // L: 1199 + var13 = field2547[11]; // L: 1200 + var12 = field2601[11]; // L: 1201 + var14 = field2604; // L: 1202 } - if (var11 < var12) { // L: 1149 + if (var11 < var12) { // L: 1204 var10 = var14[var11]; } else { - var10 = -1000; // L: 1150 + var10 = -1000; // L: 1205 } } } } - } // L: 1061 1152 + } // L: 1116 1207 - @ObfuscatedName("ak") + @ObfuscatedName("aj") @Export("drawFace") final void drawFace(int var1) { - if (field2764[var1]) { // L: 1155 - this.method5010(var1); // L: 1156 + if (field2591[var1]) { // L: 1210 + this.method4261(var1); // L: 1211 } else { - int var2 = this.indices1[var1]; // L: 1159 - int var3 = this.indices2[var1]; // L: 1160 - int var4 = this.indices3[var1]; // L: 1161 - Rasterizer3D.field2562 = field2796[var1]; // L: 1162 - if (this.faceAlphas == null) { // L: 1163 - Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1164 + int var2 = this.indices1[var1]; // L: 1214 + int var3 = this.indices2[var1]; // L: 1215 + int var4 = this.indices3[var1]; // L: 1216 + Rasterizer3D.field2395 = field2597[var1]; // L: 1217 + if (this.faceAlphas == null) { // L: 1218 + Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1219 } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1167 + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1222 } - this.method4994(var1, modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1169 + this.method4278(var1, modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1224 } - } // L: 1157 1170 + } // L: 1212 1225 - @ObfuscatedName("ao") - final void method4994(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1173 + @ObfuscatedName("ae") + final void method4278(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1228 int var11; int var12; int var13; - if (this.field2739 != null && this.field2739[var1] != -1) { // L: 1191 - int var14 = this.field2739[var1] & 255; // L: 1192 - var11 = this.field2743[var14]; // L: 1193 - var12 = this.field2744[var14]; // L: 1194 - var13 = this.field2794[var14]; // L: 1195 + if (this.field2566 != null && this.field2566[var1] != -1) { // L: 1246 + int var14 = this.field2566[var1] & 255; // L: 1247 + var11 = this.field2570[var14]; // L: 1248 + var12 = this.field2571[var14]; // L: 1249 + var13 = this.field2572[var14]; // L: 1250 } else { - var11 = this.indices1[var1]; // L: 1198 - var12 = this.indices2[var1]; // L: 1199 - var13 = this.indices3[var1]; // L: 1200 + var11 = this.indices1[var1]; // L: 1253 + var12 = this.indices2[var1]; // L: 1254 + var13 = this.indices3[var1]; // L: 1255 } - if (this.faceColors3[var1] == -1) { // L: 1202 - Rasterizer3D.method4620(var2, var3, var4, var5, var6, var7, var8, var8, var8, field2781[var11], field2781[var12], field2781[var13], field2769[var11], field2769[var12], field2769[var13], field2727[var11], field2727[var12], field2727[var13], this.faceTextures[var1]); // L: 1203 + if (this.faceColors3[var1] == -1) { // L: 1257 + Rasterizer3D.method3922(var2, var3, var4, var5, var6, var7, var8, var8, var8, field2590[var11], field2590[var12], field2590[var13], field2596[var11], field2596[var12], field2596[var13], field2602[var11], field2602[var12], field2602[var13], this.faceTextures[var1]); // L: 1258 } else { - Rasterizer3D.method4620(var2, var3, var4, var5, var6, var7, var8, var9, var10, field2781[var11], field2781[var12], field2781[var13], field2769[var11], field2769[var12], field2769[var13], field2727[var11], field2727[var12], field2727[var13], this.faceTextures[var1]); // L: 1206 + Rasterizer3D.method3922(var2, var3, var4, var5, var6, var7, var8, var9, var10, field2590[var11], field2590[var12], field2590[var13], field2596[var11], field2596[var12], field2596[var13], field2602[var11], field2602[var12], field2602[var13], this.faceTextures[var1]); // L: 1261 } - } else if (this.faceColors3[var1] == -1 && this.overrideAmount > 0) { // L: 1174 - Rasterizer3D.method4618(var2, var3, var4, var5, var6, var7, Model_colorPalette[this.faceColors1[var1]], this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1175 - } else if (this.faceColors3[var1] == -1) { // L: 1177 - Rasterizer3D.method4617(var2, var3, var4, var5, var6, var7, Model_colorPalette[this.faceColors1[var1]]); // L: 1178 - } else if (this.overrideAmount > 0) { // L: 1180 - Rasterizer3D.method4614(var2, var3, var4, var5, var6, var7, var8, var9, var10, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1181 + } else if (this.faceColors3[var1] == -1 && this.overrideAmount > 0) { // L: 1229 + Rasterizer3D.method3993(var2, var3, var4, var5, var6, var7, Model_colorPalette[this.faceColors1[var1]], this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1230 + } else if (this.faceColors3[var1] == -1) { // L: 1232 + Rasterizer3D.method3919(var2, var3, var4, var5, var6, var7, Model_colorPalette[this.faceColors1[var1]]); // L: 1233 + } else if (this.overrideAmount > 0) { // L: 1235 + Rasterizer3D.method3916(var2, var3, var4, var5, var6, var7, var8, var9, var10, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1236 } else { - Rasterizer3D.method4613(var2, var3, var4, var5, var6, var7, var8, var9, var10); // L: 1184 + Rasterizer3D.method3915(var2, var3, var4, var5, var6, var7, var8, var9, var10); // L: 1239 } - } // L: 1209 + } // L: 1264 - @ObfuscatedName("aj") - final void method5010(int var1) { - int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1212 - int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1213 - int var4 = 0; // L: 1214 - int var5 = this.indices1[var1]; // L: 1215 - int var6 = this.indices2[var1]; // L: 1216 - int var7 = this.indices3[var1]; // L: 1217 - int var8 = field2727[var5]; // L: 1218 - int var9 = field2727[var6]; // L: 1219 - int var10 = field2727[var7]; // L: 1220 - if (this.faceAlphas == null) { // L: 1221 + @ObfuscatedName("az") + final void method4261(int var1) { + int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1267 + int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1268 + int var4 = 0; // L: 1269 + int var5 = this.indices1[var1]; // L: 1270 + int var6 = this.indices2[var1]; // L: 1271 + int var7 = this.indices3[var1]; // L: 1272 + int var8 = field2602[var5]; // L: 1273 + int var9 = field2602[var6]; // L: 1274 + int var10 = field2602[var7]; // L: 1275 + if (this.faceAlphas == null) { // L: 1276 Rasterizer3D.Rasterizer3D_alpha = 0; } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1222 + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1277 } int var11; int var12; int var13; int var14; - if (var8 >= 50) { // L: 1223 - field2779[var4] = modelViewportXs[var5]; // L: 1224 - field2765[var4] = modelViewportYs[var5]; // L: 1225 - field2784[var4++] = this.faceColors1[var1]; // L: 1226 + if (var8 >= 50) { // L: 1278 + field2616[var4] = modelViewportXs[var5]; // L: 1279 + field2607[var4] = modelViewportYs[var5]; // L: 1280 + field2608[var4++] = this.faceColors1[var1]; // L: 1281 } else { - var11 = field2781[var5]; // L: 1229 - var12 = field2769[var5]; // L: 1230 - var13 = this.faceColors1[var1]; // L: 1231 - if (var10 >= 50) { // L: 1232 - var14 = field2791[var10 - var8] * (50 - var8); // L: 1233 - field2779[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2781[var7] - var11) * var14 >> 16)) / 50; // L: 1234 - field2765[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2769[var7] - var12) * var14 >> 16)) / 50; // L: 1235 - field2784[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1236 + var11 = field2590[var5]; // L: 1284 + var12 = field2596[var5]; // L: 1285 + var13 = this.faceColors1[var1]; // L: 1286 + if (var10 >= 50) { // L: 1287 + var14 = field2560[var10 - var8] * (50 - var8); // L: 1288 + field2616[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2590[var7] - var11) * var14 >> 16)) / 50; // L: 1289 + field2607[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2596[var7] - var12) * var14 >> 16)) / 50; // L: 1290 + field2608[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1291 } - if (var9 >= 50) { // L: 1238 - var14 = field2791[var9 - var8] * (50 - var8); // L: 1239 - field2779[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2781[var6] - var11) * var14 >> 16)) / 50; // L: 1240 - field2765[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2769[var6] - var12) * var14 >> 16)) / 50; // L: 1241 - field2784[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1242 + if (var9 >= 50) { // L: 1293 + var14 = field2560[var9 - var8] * (50 - var8); // L: 1294 + field2616[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2590[var6] - var11) * var14 >> 16)) / 50; // L: 1295 + field2607[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2596[var6] - var12) * var14 >> 16)) / 50; // L: 1296 + field2608[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1297 } } - if (var9 >= 50) { // L: 1245 - field2779[var4] = modelViewportXs[var6]; // L: 1246 - field2765[var4] = modelViewportYs[var6]; // L: 1247 - field2784[var4++] = this.faceColors2[var1]; // L: 1248 + if (var9 >= 50) { // L: 1300 + field2616[var4] = modelViewportXs[var6]; // L: 1301 + field2607[var4] = modelViewportYs[var6]; // L: 1302 + field2608[var4++] = this.faceColors2[var1]; // L: 1303 } else { - var11 = field2781[var6]; // L: 1251 - var12 = field2769[var6]; // L: 1252 - var13 = this.faceColors2[var1]; // L: 1253 - if (var8 >= 50) { // L: 1254 - var14 = field2791[var8 - var9] * (50 - var9); // L: 1255 - field2779[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2781[var5] - var11) * var14 >> 16)) / 50; // L: 1256 - field2765[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2769[var5] - var12) * var14 >> 16)) / 50; // L: 1257 - field2784[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1258 + var11 = field2590[var6]; // L: 1306 + var12 = field2596[var6]; // L: 1307 + var13 = this.faceColors2[var1]; // L: 1308 + if (var8 >= 50) { // L: 1309 + var14 = field2560[var8 - var9] * (50 - var9); // L: 1310 + field2616[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2590[var5] - var11) * var14 >> 16)) / 50; // L: 1311 + field2607[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2596[var5] - var12) * var14 >> 16)) / 50; // L: 1312 + field2608[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1313 } - if (var10 >= 50) { // L: 1260 - var14 = field2791[var10 - var9] * (50 - var9); // L: 1261 - field2779[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2781[var7] - var11) * var14 >> 16)) / 50; // L: 1262 - field2765[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2769[var7] - var12) * var14 >> 16)) / 50; // L: 1263 - field2784[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1264 + if (var10 >= 50) { // L: 1315 + var14 = field2560[var10 - var9] * (50 - var9); // L: 1316 + field2616[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2590[var7] - var11) * var14 >> 16)) / 50; // L: 1317 + field2607[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2596[var7] - var12) * var14 >> 16)) / 50; // L: 1318 + field2608[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1319 } } - if (var10 >= 50) { // L: 1267 - field2779[var4] = modelViewportXs[var7]; // L: 1268 - field2765[var4] = modelViewportYs[var7]; // L: 1269 - field2784[var4++] = this.faceColors3[var1]; // L: 1270 + if (var10 >= 50) { // L: 1322 + field2616[var4] = modelViewportXs[var7]; // L: 1323 + field2607[var4] = modelViewportYs[var7]; // L: 1324 + field2608[var4++] = this.faceColors3[var1]; // L: 1325 } else { - var11 = field2781[var7]; // L: 1273 - var12 = field2769[var7]; // L: 1274 - var13 = this.faceColors3[var1]; // L: 1275 - if (var9 >= 50) { // L: 1276 - var14 = field2791[var9 - var10] * (50 - var10); // L: 1277 - field2779[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2781[var6] - var11) * var14 >> 16)) / 50; // L: 1278 - field2765[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2769[var6] - var12) * var14 >> 16)) / 50; // L: 1279 - field2784[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1280 + var11 = field2590[var7]; // L: 1328 + var12 = field2596[var7]; // L: 1329 + var13 = this.faceColors3[var1]; // L: 1330 + if (var9 >= 50) { // L: 1331 + var14 = field2560[var9 - var10] * (50 - var10); // L: 1332 + field2616[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2590[var6] - var11) * var14 >> 16)) / 50; // L: 1333 + field2607[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2596[var6] - var12) * var14 >> 16)) / 50; // L: 1334 + field2608[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1335 } - if (var8 >= 50) { // L: 1282 - var14 = field2791[var8 - var10] * (50 - var10); // L: 1283 - field2779[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2781[var5] - var11) * var14 >> 16)) / 50; // L: 1284 - field2765[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2769[var5] - var12) * var14 >> 16)) / 50; // L: 1285 - field2784[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1286 + if (var8 >= 50) { // L: 1337 + var14 = field2560[var8 - var10] * (50 - var10); // L: 1338 + field2616[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2590[var5] - var11) * var14 >> 16)) / 50; // L: 1339 + field2607[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2596[var5] - var12) * var14 >> 16)) / 50; // L: 1340 + field2608[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1341 } } - var11 = field2779[0]; // L: 1289 - var12 = field2779[1]; // L: 1290 - var13 = field2779[2]; // L: 1291 - var14 = field2765[0]; // L: 1292 - int var15 = field2765[1]; // L: 1293 - int var16 = field2765[2]; // L: 1294 - Rasterizer3D.field2562 = false; // L: 1295 - if (var4 == 3) { // L: 1296 - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1297 - Rasterizer3D.field2562 = true; + var11 = field2616[0]; // L: 1344 + var12 = field2616[1]; // L: 1345 + var13 = field2616[2]; // L: 1346 + var14 = field2607[0]; // L: 1347 + int var15 = field2607[1]; // L: 1348 + int var16 = field2607[2]; // L: 1349 + Rasterizer3D.field2395 = false; // L: 1350 + if (var4 == 3) { // L: 1351 + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1352 + Rasterizer3D.field2395 = true; } - this.method4994(var1, var14, var15, var16, var11, var12, var13, field2784[0], field2784[1], field2784[2]); // L: 1298 + this.method4278(var1, var14, var15, var16, var11, var12, var13, field2608[0], field2608[1], field2608[2]); // L: 1353 } - if (var4 == 4) { // L: 1300 - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2779[3] < 0 || field2779[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1301 - Rasterizer3D.field2562 = true; + if (var4 == 4) { // L: 1355 + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2616[3] < 0 || field2616[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1356 + Rasterizer3D.field2395 = true; } int var17; - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1302 + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1357 int var18; int var19; - if (this.field2739 != null && this.field2739[var1] != -1) { // L: 1326 - int var20 = this.field2739[var1] & 255; // L: 1327 - var17 = this.field2743[var20]; // L: 1328 - var18 = this.field2744[var20]; // L: 1329 - var19 = this.field2794[var20]; // L: 1330 + if (this.field2566 != null && this.field2566[var1] != -1) { // L: 1381 + int var20 = this.field2566[var1] & 255; // L: 1382 + var17 = this.field2570[var20]; // L: 1383 + var18 = this.field2571[var20]; // L: 1384 + var19 = this.field2572[var20]; // L: 1385 } else { - var17 = var5; // L: 1333 - var18 = var6; // L: 1334 - var19 = var7; // L: 1335 + var17 = var5; // L: 1388 + var18 = var6; // L: 1389 + var19 = var7; // L: 1390 } - short var21 = this.faceTextures[var1]; // L: 1337 - if (this.faceColors3[var1] == -1) { // L: 1338 - Rasterizer3D.method4620(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2781[var17], field2781[var18], field2781[var19], field2769[var17], field2769[var18], field2769[var19], field2727[var17], field2727[var18], field2727[var19], var21); // L: 1339 - Rasterizer3D.method4620(var14, var16, field2765[3], var11, var13, field2779[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2781[var17], field2781[var18], field2781[var19], field2769[var17], field2769[var18], field2769[var19], field2727[var17], field2727[var18], field2727[var19], var21); // L: 1340 + short var21 = this.faceTextures[var1]; // L: 1392 + if (this.faceColors3[var1] == -1) { // L: 1393 + Rasterizer3D.method3922(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2590[var17], field2590[var18], field2590[var19], field2596[var17], field2596[var18], field2596[var19], field2602[var17], field2602[var18], field2602[var19], var21); // L: 1394 + Rasterizer3D.method3922(var14, var16, field2607[3], var11, var13, field2616[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2590[var17], field2590[var18], field2590[var19], field2596[var17], field2596[var18], field2596[var19], field2602[var17], field2602[var18], field2602[var19], var21); // L: 1395 } else { - Rasterizer3D.method4620(var14, var15, var16, var11, var12, var13, field2784[0], field2784[1], field2784[2], field2781[var17], field2781[var18], field2781[var19], field2769[var17], field2769[var18], field2769[var19], field2727[var17], field2727[var18], field2727[var19], var21); // L: 1343 - Rasterizer3D.method4620(var14, var16, field2765[3], var11, var13, field2779[3], field2784[0], field2784[2], field2784[3], field2781[var17], field2781[var18], field2781[var19], field2769[var17], field2769[var18], field2769[var19], field2727[var17], field2727[var18], field2727[var19], var21); // L: 1344 + Rasterizer3D.method3922(var14, var15, var16, var11, var12, var13, field2608[0], field2608[1], field2608[2], field2590[var17], field2590[var18], field2590[var19], field2596[var17], field2596[var18], field2596[var19], field2602[var17], field2602[var18], field2602[var19], var21); // L: 1398 + Rasterizer3D.method3922(var14, var16, field2607[3], var11, var13, field2616[3], field2608[0], field2608[2], field2608[3], field2590[var17], field2590[var18], field2590[var19], field2596[var17], field2596[var18], field2596[var19], field2602[var17], field2602[var18], field2602[var19], var21); // L: 1399 } - } else if (this.faceColors3[var1] == -1 && this.overrideAmount > 0) { // L: 1303 - var17 = Model_colorPalette[this.faceColors1[var1]]; // L: 1304 - Rasterizer3D.method4618(var14, var15, var16, var11, var12, var13, var17, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1305 - Rasterizer3D.method4618(var14, var16, field2765[3], var11, var13, field2779[3], var17, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1306 - } else if (this.faceColors3[var1] == -1) { // L: 1308 - var17 = Model_colorPalette[this.faceColors1[var1]]; // L: 1309 - Rasterizer3D.method4617(var14, var15, var16, var11, var12, var13, var17); // L: 1310 - Rasterizer3D.method4617(var14, var16, field2765[3], var11, var13, field2779[3], var17); // L: 1311 - } else if (this.overrideAmount > 0) { // L: 1313 - Rasterizer3D.method4614(var14, var15, var16, var11, var12, var13, field2784[0], field2784[1], field2784[2], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); // L: 1314 - Rasterizer3D.method4614(var14, var16, field2765[3], var11, var13, field2779[3], field2784[0], field2784[2], field2784[3], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); // L: 1315 + } else if (this.faceColors3[var1] == -1 && this.overrideAmount > 0) { // L: 1358 + var17 = Model_colorPalette[this.faceColors1[var1]]; // L: 1359 + Rasterizer3D.method3993(var14, var15, var16, var11, var12, var13, var17, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1360 + Rasterizer3D.method3993(var14, var16, field2607[3], var11, var13, field2616[3], var17, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1361 + } else if (this.faceColors3[var1] == -1) { // L: 1363 + var17 = Model_colorPalette[this.faceColors1[var1]]; // L: 1364 + Rasterizer3D.method3919(var14, var15, var16, var11, var12, var13, var17); // L: 1365 + Rasterizer3D.method3919(var14, var16, field2607[3], var11, var13, field2616[3], var17); // L: 1366 + } else if (this.overrideAmount > 0) { // L: 1368 + Rasterizer3D.method3916(var14, var15, var16, var11, var12, var13, field2608[0], field2608[1], field2608[2], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); // L: 1369 + Rasterizer3D.method3916(var14, var16, field2607[3], var11, var13, field2616[3], field2608[0], field2608[2], field2608[3], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); // L: 1370 } else { - Rasterizer3D.method4613(var14, var15, var16, var11, var12, var13, field2784[0], field2784[1], field2784[2]); // L: 1318 - Rasterizer3D.method4613(var14, var16, field2765[3], var11, var13, field2779[3], field2784[0], field2784[2], field2784[3]); // L: 1319 + Rasterizer3D.method3915(var14, var15, var16, var11, var12, var13, field2608[0], field2608[1], field2608[2]); // L: 1373 + Rasterizer3D.method3915(var14, var16, field2607[3], var11, var13, field2616[3], field2608[0], field2608[2], field2608[3]); // L: 1374 } } - } // L: 1348 + } // L: 1403 - @ObfuscatedName("al") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(ILnt;)V" + descriptor = "(ILnw;)V" ) - void method4996(int var1, class387 var2) { - float var3 = (float)this.verticesX[var1]; // L: 1351 - float var4 = (float)(-this.verticesY[var1]); // L: 1352 - float var5 = (float)(-this.verticesZ[var1]); // L: 1353 - float var6 = 1.0F; // L: 1354 - this.verticesX[var1] = (int)(var2.field4348[0] * var3 + var2.field4348[4] * var4 + var2.field4348[8] * var5 + var2.field4348[12] * var6); // L: 1355 - this.verticesY[var1] = -((int)(var2.field4348[1] * var3 + var2.field4348[5] * var4 + var2.field4348[9] * var5 + var2.field4348[13] * var6)); // L: 1356 - this.verticesZ[var1] = -((int)(var2.field4348[2] * var3 + var2.field4348[6] * var4 + var2.field4348[10] * var5 + var2.field4348[14] * var6)); // L: 1357 - } // L: 1358 + void method4302(int var1, class388 var2) { + float var3 = (float)this.verticesX[var1]; // L: 1406 + float var4 = (float)(-this.verticesY[var1]); // L: 1407 + float var5 = (float)(-this.verticesZ[var1]); // L: 1408 + float var6 = 1.0F; // L: 1409 + this.verticesX[var1] = (int)(var2.field4400[0] * var3 + var2.field4400[4] * var4 + var2.field4400[8] * var5 + var2.field4400[12] * var6); // L: 1410 + this.verticesY[var1] = -((int)(var2.field4400[1] * var3 + var2.field4400[5] * var4 + var2.field4400[9] * var5 + var2.field4400[13] * var6)); // L: 1411 + this.verticesZ[var1] = -((int)(var2.field4400[2] * var3 + var2.field4400[6] * var4 + var2.field4400[10] * var5 + var2.field4400[14] * var6)); // L: 1412 + } // L: 1413 - @ObfuscatedName("av") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Lhk;I)V" + descriptor = "(Lgb;I)V" ) - void method5034(class231 var1, int var2) { - if (this.field2748 != null) { // L: 1361 - for (int var3 = 0; var3 < this.verticesCount; ++var3) { // L: 1362 - int[] var4 = this.field2748[var3]; // L: 1363 - if (var4 != null && var4.length != 0) { // L: 1364 - int[] var5 = this.field2726[var3]; // L: 1365 - field2723.method7064(); // L: 1366 + void method4280(class202 var1, int var2) { + if (this.field2575 != null) { // L: 1416 + for (int var3 = 0; var3 < this.verticesCount; ++var3) { // L: 1417 + int[] var4 = this.field2575[var3]; // L: 1418 + if (var4 != null && var4.length != 0) { // L: 1419 + int[] var5 = this.field2594[var3]; // L: 1420 + field2550.method6829(); // L: 1421 - for (int var6 = 0; var6 < var4.length; ++var6) { // L: 1367 - int var7 = var4[var6]; // L: 1368 - class115 var8 = var1.method4718(var7); // L: 1369 - if (var8 != null) { // L: 1370 - field2724.method7043((float)var5[var6] / 255.0F); // L: 1371 - field2749.method7032(var8.method2671(var2)); // L: 1372 - field2749.method7017(field2724); // L: 1373 - field2723.method7016(field2749); // L: 1374 + for (int var6 = 0; var6 < var4.length; ++var6) { // L: 1422 + int var7 = var4[var6]; // L: 1423 + class115 var8 = var1.method3997(var7); // L: 1424 + if (var8 != null) { // L: 1425 + field2606.method6806((float)var5[var6] / 255.0F); // L: 1426 + field2552.method6868(var8.method2666(var2)); // L: 1427 + field2552.method6816(field2606); // L: 1428 + field2550.method6815(field2552); // L: 1429 } } - this.method4996(var3, field2723); // L: 1376 + this.method4302(var3, field2550); // L: 1431 } } } - } // L: 1378 + } // L: 1433 - @ObfuscatedName("co") + @ObfuscatedName("cd") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - field2772[0] = -1; // L: 822 + field2573[0] = -1; // L: 822 if (this.boundsType != 1) { // L: 823 this.calculateBoundsCylinder(); } @@ -1788,146 +1819,176 @@ public class Model extends Renderable { var26 = true; } - boolean var27 = var26 || this.field2742 > 0; // L: 847 - int var28 = ViewportMouse.ViewportMouse_x; // L: 850 - int var30 = class118.method2747(); // L: 853 - boolean var31 = ViewportMouse.ViewportMouse_isInViewport; // L: 856 - boolean var34 = 0L != var9; // L: 861 - boolean var35; - if (var34) { // L: 862 - var35 = (int)(var9 >>> 16 & 1L) == 1; // L: 865 - var34 = !var35; // L: 867 - } - - var35 = false; // L: 872 + boolean var27 = var26 || this.field2569 > 0; // L: 847 + int var28 = class146.method2993(); // L: 848 + int var29 = WallDecoration.method4391(); // L: 849 + boolean var30 = ViewportMouse.ViewportMouse_isInViewport; // L: 852 + boolean var32 = LoginPacket.method5022(var9); // L: 855 + boolean var33 = false; // L: 856 + int var38; + int var39; int var40; int var41; - int var42; - int var43; - int var44; int var49; - int var53; - int var54; - if (var34 && var31) { // L: 873 - boolean var36 = false; // L: 874 - if (field2777) { // L: 875 - boolean var39 = ViewportMouse.ViewportMouse_isInViewport; // L: 881 - boolean var37; - if (!var39) { // L: 883 - var37 = false; // L: 884 + int var55; + int var56; + int var57; + if (var32 && var30) { // L: 857 + boolean var34 = false; // L: 858 + if (field2612) { // L: 859 + boolean var37 = ViewportMouse.ViewportMouse_isInViewport; // L: 865 + boolean var35; + if (!var37) { // L: 867 + var35 = false; // L: 868 } else { - WorldMapSection0.method4283(); // L: 887 - var40 = this.xMid + var6; // L: 888 - var41 = var7 + this.yMid; // L: 889 - var42 = var8 + this.zMid; // L: 890 - var43 = this.xMidOffset; // L: 891 - var44 = this.yMidOffset; // L: 892 - int var45 = this.zMidOffset; // L: 893 - int var46 = FaceNormal.field2664 - var40; // L: 894 - int var47 = ItemComposition.field2076 - var41; // L: 895 - int var48 = ViewportMouse.field2802 - var42; // L: 896 - if (Math.abs(var46) > var43 + class9.field35) { // L: 897 - var37 = false; // L: 898 - } else if (Math.abs(var47) > var44 + ViewportMouse.field2808) { // L: 901 - var37 = false; // L: 902 - } else if (Math.abs(var48) > var45 + class196.field2204) { // L: 905 - var37 = false; // L: 906 - } else if (Math.abs(var48 * ViewportMouse.field2804 - var47 * class18.field95) > var44 * class196.field2204 + var45 * ViewportMouse.field2808) { // L: 909 - var37 = false; // L: 910 - } else if (Math.abs(var46 * class18.field95 - var48 * ViewportMouse.field2805) > var45 * class9.field35 + var43 * class196.field2204) { // L: 913 - var37 = false; // L: 914 - } else if (Math.abs(var47 * ViewportMouse.field2805 - var46 * ViewportMouse.field2804) > var44 * class9.field35 + var43 * ViewportMouse.field2808) { // L: 917 - var37 = false; // L: 918 + int var44; + int var45; + int var46; + int var58; + if (!ViewportMouse.ViewportMouse_false0) { // L: 872 + var38 = Scene.Scene_cameraPitchSine; // L: 873 + var39 = Scene.Scene_cameraPitchCosine; // L: 874 + var40 = Scene.Scene_cameraYawSine; // L: 875 + var41 = Scene.Scene_cameraYawCosine; // L: 876 + byte var42 = 50; // L: 877 + short var43 = 3500; // L: 878 + var44 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var42 / Rasterizer3D.Rasterizer3D_zoom; // L: 879 + var45 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var42 / Rasterizer3D.Rasterizer3D_zoom; // L: 880 + var46 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var43 / Rasterizer3D.Rasterizer3D_zoom; // L: 881 + int var47 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var43 / Rasterizer3D.Rasterizer3D_zoom; // L: 882 + int var48 = Rasterizer3D.method3930(var45, var42, var39, var38); // L: 884 + var57 = Rasterizer3D.method3931(var45, var42, var39, var38); // L: 885 + var45 = var48; // L: 886 + var48 = Rasterizer3D.method3930(var47, var43, var39, var38); // L: 887 + var58 = Rasterizer3D.method3931(var47, var43, var39, var38); // L: 888 + var47 = var48; // L: 889 + var48 = Rasterizer3D.method3929(var44, var57, var41, var40); // L: 890 + var57 = Rasterizer3D.method3980(var44, var57, var41, var40); // L: 891 + var44 = var48; // L: 892 + var48 = Rasterizer3D.method3929(var46, var58, var41, var40); // L: 893 + var58 = Rasterizer3D.method3980(var46, var58, var41, var40); // L: 894 + ViewportMouse.field2635 = (var44 + var48) / 2; // L: 896 + ArchiveDisk.field4363 = (var45 + var47) / 2; // L: 897 + InvDefinition.field1853 = (var58 + var57) / 2; // L: 898 + ViewportMouse.field2630 = (var48 - var44) / 2; // L: 899 + class342.field4162 = (var47 - var45) / 2; // L: 900 + RouteStrategy.field2242 = (var58 - var57) / 2; // L: 901 + class113.field1421 = Math.abs(ViewportMouse.field2630); // L: 902 + ChatChannel.field973 = Math.abs(class342.field4162); // L: 903 + TriBool.field4339 = Math.abs(RouteStrategy.field2242); // L: 904 + } + + var38 = this.xMid + var6; // L: 906 + var39 = var7 + this.yMid; // L: 907 + var40 = var8 + this.zMid; // L: 908 + var41 = this.xMidOffset; // L: 909 + var57 = this.yMidOffset; // L: 910 + var58 = this.zMidOffset; // L: 911 + var44 = ViewportMouse.field2635 - var38; // L: 912 + var45 = ArchiveDisk.field4363 - var39; // L: 913 + var46 = InvDefinition.field1853 - var40; // L: 914 + if (Math.abs(var44) > var41 + class113.field1421) { // L: 915 + var35 = false; // L: 916 + } else if (Math.abs(var45) > var57 + ChatChannel.field973) { // L: 919 + var35 = false; // L: 920 + } else if (Math.abs(var46) > var58 + TriBool.field4339) { // L: 923 + var35 = false; // L: 924 + } else if (Math.abs(var46 * class342.field4162 - var45 * RouteStrategy.field2242) > var57 * TriBool.field4339 + var58 * ChatChannel.field973) { // L: 927 + var35 = false; // L: 928 + } else if (Math.abs(var44 * RouteStrategy.field2242 - var46 * ViewportMouse.field2630) > var41 * TriBool.field4339 + var58 * class113.field1421) { // L: 931 + var35 = false; // L: 932 + } else if (Math.abs(var45 * ViewportMouse.field2630 - var44 * class342.field4162) > var57 * class113.field1421 + var41 * ChatChannel.field973) { // L: 935 + var35 = false; // L: 936 } else { - var37 = true; // L: 921 + var35 = true; // L: 939 } } - var36 = var37; // L: 923 + var34 = var35; // L: 941 } else { - var54 = var12 - var13; // L: 926 - if (var54 <= 50) { // L: 927 - var54 = 50; + var56 = var12 - var13; // L: 944 + if (var56 <= 50) { // L: 945 + var56 = 50; } - if (var15 > 0) { // L: 928 - var16 /= var14; // L: 929 - var17 /= var54; // L: 930 + if (var15 > 0) { // L: 946 + var16 /= var14; // L: 947 + var17 /= var56; // L: 948 } else { - var17 /= var14; // L: 933 - var16 /= var54; // L: 934 + var17 /= var14; // L: 951 + var16 /= var56; // L: 952 } - if (var18 > 0) { // L: 936 - var23 /= var14; // L: 937 - var21 /= var54; // L: 938 + if (var18 > 0) { // L: 954 + var23 /= var14; // L: 955 + var21 /= var56; // L: 956 } else { - var21 /= var14; // L: 941 - var23 /= var54; // L: 942 + var21 /= var14; // L: 959 + var23 /= var56; // L: 960 } - var49 = var28 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 944 - var53 = var30 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 945 - if (var49 > var16 && var49 < var17 && var53 > var23 && var53 < var21) { // L: 946 - var36 = true; // L: 947 + var49 = var28 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 962 + var55 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 963 + if (var49 > var16 && var49 < var17 && var55 > var23 && var55 < var21) { // L: 964 + var34 = true; // L: 965 } } - if (var36) { // L: 950 - if (this.isSingleTile) { // L: 951 - KeyHandler.method350(var9); + if (var34) { // L: 968 + if (this.isSingleTile) { // L: 969 + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; // L: 972 } else { - var35 = true; // L: 952 + var33 = true; // L: 975 } } } - int var52 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 955 - var54 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 956 - var49 = 0; // L: 957 - var53 = 0; // L: 958 - if (var1 != 0) { // L: 959 - var49 = Model_sine[var1]; // L: 960 - var53 = Model_cosine[var1]; // L: 961 + int var54 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 978 + var56 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 979 + var49 = 0; // L: 980 + var55 = 0; // L: 981 + if (var1 != 0) { // L: 982 + var49 = Model_sine[var1]; // L: 983 + var55 = Model_cosine[var1]; // L: 984 } - for (var40 = 0; var40 < this.verticesCount; ++var40) { // L: 963 - var41 = this.verticesX[var40]; // L: 964 - var42 = this.verticesY[var40]; // L: 965 - var43 = this.verticesZ[var40]; // L: 966 - if (var1 != 0) { // L: 967 - var44 = var43 * var49 + var41 * var53 >> 16; // L: 968 - var43 = var43 * var53 - var41 * var49 >> 16; // L: 969 - var41 = var44; // L: 970 + for (var38 = 0; var38 < this.verticesCount; ++var38) { // L: 986 + var39 = this.verticesX[var38]; // L: 987 + var40 = this.verticesY[var38]; // L: 988 + var41 = this.verticesZ[var38]; // L: 989 + if (var1 != 0) { // L: 990 + var57 = var41 * var49 + var39 * var55 >> 16; // L: 991 + var41 = var41 * var55 - var39 * var49 >> 16; // L: 992 + var39 = var57; // L: 993 } - var41 += var6; // L: 972 - var42 += var7; // L: 973 - var43 += var8; // L: 974 - var44 = var43 * var4 + var5 * var41 >> 16; // L: 975 - var43 = var5 * var43 - var41 * var4 >> 16; // L: 976 - var41 = var44; // L: 977 - var44 = var3 * var42 - var43 * var2 >> 16; // L: 978 - var43 = var42 * var2 + var3 * var43 >> 16; // L: 979 - field2767[var40] = var43 - var12; // L: 981 - if (var43 >= 50) { // L: 982 - modelViewportXs[var40] = var41 * Rasterizer3D.Rasterizer3D_zoom / var43 + var52; // L: 983 - modelViewportYs[var40] = var44 * Rasterizer3D.Rasterizer3D_zoom / var43 + var54; // L: 984 + var39 += var6; // L: 995 + var40 += var7; // L: 996 + var41 += var8; // L: 997 + var57 = var41 * var4 + var5 * var39 >> 16; // L: 998 + var41 = var5 * var41 - var39 * var4 >> 16; // L: 999 + var39 = var57; // L: 1000 + var57 = var3 * var40 - var41 * var2 >> 16; // L: 1001 + var41 = var40 * var2 + var3 * var41 >> 16; // L: 1002 + field2548[var38] = var41 - var12; // L: 1004 + if (var41 >= 50) { // L: 1005 + modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var41 + var54; // L: 1006 + modelViewportYs[var38] = var57 * Rasterizer3D.Rasterizer3D_zoom / var41 + var56; // L: 1007 } else { - modelViewportXs[var40] = -5000; // L: 987 - var25 = true; // L: 988 + modelViewportXs[var38] = -5000; // L: 1010 + var25 = true; // L: 1011 } - if (var27) { // L: 990 - field2781[var40] = var41; // L: 991 - field2769[var40] = var44; // L: 992 - field2727[var40] = var43; // L: 993 + if (var27) { // L: 1013 + field2590[var38] = var39; // L: 1014 + field2596[var38] = var57; // L: 1015 + field2602[var38] = var41; // L: 1016 } } try { - this.draw0(var25, var35, this.isSingleTile, var9); // L: 997 - } catch (Exception var51) { // L: 999 + this.draw0(var25, var33, this.isSingleTile, var9); // L: 1020 + } catch (Exception var53) { // L: 1022 } } @@ -1935,5 +1996,5 @@ public class Model extends Renderable { } } } - } // L: 1000 + } // L: 1023 } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index 01154809c8..c462b3133e 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -3,139 +3,139 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hc") +@ObfuscatedName("gs") @Implements("ModelData") public class ModelData extends Renderable { - @ObfuscatedName("ac") - static int[] field2485; - @ObfuscatedName("ab") - static int[] field2486; - @ObfuscatedName("au") - static int field2487; - @ObfuscatedName("af") + @ObfuscatedName("aq") + static int[] field2314; + @ObfuscatedName("ad") + static int[] field2290; + @ObfuscatedName("an") + static int field2308; + @ObfuscatedName("aw") @Export("ModelData_sine") static int[] ModelData_sine; - @ObfuscatedName("ad") + @ObfuscatedName("ah") @Export("ModelData_cosine") static int[] ModelData_cosine; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("verticesCount") int verticesCount; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("verticesX") int[] verticesX; - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("verticesY") int[] verticesY; - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("faceCount") int faceCount; - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("indices1") int[] indices1; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("indices2") int[] indices2; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("indices3") int[] indices3; - @ObfuscatedName("p") + @ObfuscatedName("c") @Export("faceRenderTypes") byte[] faceRenderTypes; @ObfuscatedName("w") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("k") + @ObfuscatedName("b") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("d") + @ObfuscatedName("t") @Export("textureCoords") byte[] textureCoords; - @ObfuscatedName("m") + @ObfuscatedName("g") @Export("faceColors") short[] faceColors; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("t") + @ObfuscatedName("n") @Export("priority") byte priority; - @ObfuscatedName("g") + @ObfuscatedName("e") @Export("textureTriangleCount") int textureTriangleCount; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("textureRenderTypes") byte[] textureRenderTypes; - @ObfuscatedName("a") + @ObfuscatedName("f") @Export("texTriangleX") short[] texTriangleX; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("texTriangleY") short[] texTriangleY; @ObfuscatedName("j") @Export("texTriangleZ") short[] texTriangleZ; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("vertexSkins") int[] vertexSkins; - @ObfuscatedName("z") + @ObfuscatedName("i") @Export("faceSkins") int[] faceSkins; - @ObfuscatedName("h") + @ObfuscatedName("u") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("aq") - int[][] field2464; - @ObfuscatedName("aw") - int[][] field2476; + @ObfuscatedName("ar") + int[][] field2301; @ObfuscatedName("am") + int[][] field2302; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "[Lia;" + descriptor = "[Lgg;" ) @Export("faceNormals") FaceNormal[] faceNormals; - @ObfuscatedName("ak") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "[Lil;" + descriptor = "[Lhq;" ) @Export("vertexNormals") VertexNormal[] vertexNormals; - @ObfuscatedName("ao") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "[Lil;" + descriptor = "[Lhq;" ) @Export("vertexVertices") VertexNormal[] vertexVertices; - @ObfuscatedName("aj") + @ObfuscatedName("ae") @Export("ambient") public short ambient; - @ObfuscatedName("al") + @ObfuscatedName("az") @Export("contrast") public short contrast; - @ObfuscatedName("av") + @ObfuscatedName("ap") @Export("isBoundsCalculated") boolean isBoundsCalculated; - @ObfuscatedName("at") - int field2445; - @ObfuscatedName("an") - int field2480; - @ObfuscatedName("ay") - int field2482; - @ObfuscatedName("ag") - int field2483; - @ObfuscatedName("ah") - int field2489; + @ObfuscatedName("as") + int field2309; + @ObfuscatedName("au") + int field2310; + @ObfuscatedName("ak") + int field2315; + @ObfuscatedName("af") + int field2312; + @ObfuscatedName("al") + int field2313; static { - field2485 = new int[10000]; // L: 49 - field2486 = new int[10000]; // L: 50 - field2487 = 0; // L: 51 + field2314 = new int[10000]; // L: 49 + field2290 = new int[10000]; // L: 50 + field2308 = 0; // L: 51 ModelData_sine = Rasterizer3D.Rasterizer3D_sine; // L: 52 ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 53 } @@ -148,7 +148,7 @@ public class ModelData extends Renderable { } // L: 55 @ObfuscatedSignature( - descriptor = "([Lhc;I)V" + descriptor = "([Lgs;I)V" ) public ModelData(ModelData[] var1, int var2) { this.verticesCount = 0; @@ -192,7 +192,7 @@ public class ModelData extends Renderable { var6 |= var11.faceSkins != null; // L: 945 var7 |= var11.faceTextures != null; // L: 946 var8 |= var11.textureCoords != null; // L: 947 - var9 |= var11.field2464 != null; // L: 948 + var9 |= var11.field2301 != null; // L: 948 } } @@ -228,8 +228,8 @@ public class ModelData extends Renderable { } if (var9) { // L: 964 - this.field2464 = new int[this.verticesCount][]; // L: 965 - this.field2476 = new int[this.verticesCount][]; // L: 966 + this.field2301 = new int[this.verticesCount][]; // L: 965 + this.field2302 = new int[this.verticesCount][]; // L: 966 } this.faceColors = new short[this.faceCount]; // L: 968 @@ -286,18 +286,18 @@ public class ModelData extends Renderable { } this.faceColors[this.faceCount] = var11.faceColors[var12]; // L: 1003 - this.indices1[this.faceCount] = this.method4522(var11, var11.indices1[var12]); // L: 1004 - this.indices2[this.faceCount] = this.method4522(var11, var11.indices2[var12]); // L: 1005 - this.indices3[this.faceCount] = this.method4522(var11, var11.indices3[var12]); // L: 1006 + this.indices1[this.faceCount] = this.method3811(var11, var11.indices1[var12]); // L: 1004 + this.indices2[this.faceCount] = this.method3811(var11, var11.indices2[var12]); // L: 1005 + this.indices3[this.faceCount] = this.method3811(var11, var11.indices3[var12]); // L: 1006 ++this.faceCount; // L: 1007 } for (var12 = 0; var12 < var11.textureTriangleCount; ++var12) { // L: 1009 byte var13 = this.textureRenderTypes[this.textureTriangleCount] = var11.textureRenderTypes[var12]; // L: 1010 if (var13 == 0) { // L: 1011 - this.texTriangleX[this.textureTriangleCount] = (short)this.method4522(var11, var11.texTriangleX[var12]); // L: 1012 - this.texTriangleY[this.textureTriangleCount] = (short)this.method4522(var11, var11.texTriangleY[var12]); // L: 1013 - this.texTriangleZ[this.textureTriangleCount] = (short)this.method4522(var11, var11.texTriangleZ[var12]); // L: 1014 + this.texTriangleX[this.textureTriangleCount] = (short)this.method3811(var11, var11.texTriangleX[var12]); // L: 1012 + this.texTriangleY[this.textureTriangleCount] = (short)this.method3811(var11, var11.texTriangleY[var12]); // L: 1013 + this.texTriangleZ[this.textureTriangleCount] = (short)this.method3811(var11, var11.texTriangleZ[var12]); // L: 1014 } ++this.textureTriangleCount; // L: 1016 @@ -315,19 +315,19 @@ public class ModelData extends Renderable { Buffer var2 = new Buffer(10); // L: 64 var2.writeShort(-2); // L: 65 if (var1[var1.length - 1] == -3 && var1[var1.length - 2] == -1) { // L: 66 - this.method4511(var1); + this.method3812(var1); } else if (var1[var1.length - 1] == -2 && var1[var1.length - 2] == -1) { // L: 67 - this.method4527(var1); + this.method3889(var1); } else if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { // L: 68 - this.method4513(var1); + this.method3814(var1); } else { - this.method4514(var1); // L: 69 + this.method3815(var1); // L: 69 } } // L: 70 @ObfuscatedSignature( - descriptor = "(Lhc;ZZZZ)V", + descriptor = "(Lgs;ZZZZ)V", garbageValue = "1" ) public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) { @@ -394,14 +394,14 @@ public class ModelData extends Renderable { this.vertexNormals = var1.vertexNormals; // L: 1101 this.faceNormals = var1.faceNormals; // L: 1102 this.vertexVertices = var1.vertexVertices; // L: 1103 - this.field2464 = var1.field2464; // L: 1104 - this.field2476 = var1.field2476; // L: 1105 + this.field2301 = var1.field2301; // L: 1104 + this.field2302 = var1.field2302; // L: 1105 this.ambient = var1.ambient; // L: 1106 this.contrast = var1.contrast; // L: 1107 } - @ObfuscatedName("i") - void method4511(byte[] var1) { + @ObfuscatedName("l") + void method3812(byte[] var1) { Buffer var2 = new Buffer(var1); // L: 73 Buffer var3 = new Buffer(var1); // L: 74 Buffer var4 = new Buffer(var1); // L: 75 @@ -544,8 +544,8 @@ public class ModelData extends Renderable { } if (var18 == 1) { // L: 169 - this.field2464 = new int[var9][]; // L: 170 - this.field2476 = new int[var9][]; // L: 171 + this.field2301 = new int[var9][]; // L: 170 + this.field2302 = new int[var9][]; // L: 171 } this.faceColors = new short[var10]; // L: 173 @@ -600,12 +600,12 @@ public class ModelData extends Renderable { if (var18 == 1) { // L: 203 for (var53 = 0; var53 < var9; ++var53) { // L: 204 var54 = var6.readUnsignedByte(); // L: 205 - this.field2464[var53] = new int[var54]; // L: 206 - this.field2476[var53] = new int[var54]; // L: 207 + this.field2301[var53] = new int[var54]; // L: 206 + this.field2302[var53] = new int[var54]; // L: 207 for (var55 = 0; var55 < var54; ++var55) { // L: 208 - this.field2464[var53][var55] = var6.readUnsignedByte(); // L: 209 - this.field2476[var53][var55] = var6.readUnsignedByte(); // L: 210 + this.field2301[var53][var55] = var6.readUnsignedByte(); // L: 209 + this.field2302[var53][var55] = var6.readUnsignedByte(); // L: 210 } } } @@ -723,8 +723,8 @@ public class ModelData extends Renderable { } // L: 299 - @ObfuscatedName("f") - void method4527(byte[] var1) { + @ObfuscatedName("k") + void method3889(byte[] var1) { boolean var2 = false; // L: 302 boolean var3 = false; // L: 303 Buffer var4 = new Buffer(var1); // L: 304 @@ -825,8 +825,8 @@ public class ModelData extends Renderable { } if (var17 == 1) { // L: 376 - this.field2464 = new int[var9][]; // L: 377 - this.field2476 = new int[var9][]; // L: 378 + this.field2301 = new int[var9][]; // L: 377 + this.field2302 = new int[var9][]; // L: 378 } this.faceColors = new short[var10]; // L: 380 @@ -875,12 +875,12 @@ public class ModelData extends Renderable { if (var17 == 1) { // L: 405 for (var40 = 0; var40 < var9; ++var40) { // L: 406 var41 = var8.readUnsignedByte(); // L: 407 - this.field2464[var40] = new int[var41]; // L: 408 - this.field2476[var40] = new int[var41]; // L: 409 + this.field2301[var40] = new int[var41]; // L: 408 + this.field2302[var40] = new int[var41]; // L: 409 for (var42 = 0; var42 < var41; ++var42) { // L: 410 - this.field2464[var40][var42] = var8.readUnsignedByte(); // L: 411 - this.field2476[var40][var42] = var8.readUnsignedByte(); // L: 412 + this.field2301[var40][var42] = var8.readUnsignedByte(); // L: 411 + this.field2302[var40][var42] = var8.readUnsignedByte(); // L: 412 } } } @@ -1017,8 +1017,8 @@ public class ModelData extends Renderable { } // L: 511 - @ObfuscatedName("l") - void method4513(byte[] var1) { + @ObfuscatedName("r") + void method3814(byte[] var1) { Buffer var2 = new Buffer(var1); // L: 514 Buffer var3 = new Buffer(var1); // L: 515 Buffer var4 = new Buffer(var1); // L: 516 @@ -1323,8 +1323,8 @@ public class ModelData extends Renderable { } // L: 723 - @ObfuscatedName("q") - void method4514(byte[] var1) { + @ObfuscatedName("v") + void method3815(byte[] var1) { boolean var2 = false; // L: 726 boolean var3 = false; // L: 727 Buffer var4 = new Buffer(var1); // L: 728 @@ -1600,11 +1600,11 @@ public class ModelData extends Renderable { } // L: 918 - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lhc;I)I" + descriptor = "(Lgs;I)I" ) - final int method4522(ModelData var1, int var2) { + final int method3811(ModelData var1, int var2) { int var3 = -1; // L: 1023 int var4 = var1.verticesX[var2]; // L: 1024 int var5 = var1.verticesY[var2]; // L: 1025 @@ -1625,9 +1625,9 @@ public class ModelData extends Renderable { this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2]; // L: 1037 } - if (var1.field2464 != null) { // L: 1038 - this.field2464[this.verticesCount] = var1.field2464[var2]; // L: 1039 - this.field2476[this.verticesCount] = var1.field2476[var2]; // L: 1040 + if (var1.field2301 != null) { // L: 1038 + this.field2301[this.verticesCount] = var1.field2301[var2]; // L: 1039 + this.field2302[this.verticesCount] = var1.field2302[var2]; // L: 1040 } var3 = this.verticesCount++; // L: 1042 @@ -1636,9 +1636,9 @@ public class ModelData extends Renderable { return var3; // L: 1044 } - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "()Lhc;" + descriptor = "()Lgs;" ) @Export("copyModelData") public ModelData copyModelData() { @@ -1681,16 +1681,16 @@ public class ModelData extends Renderable { return var1; // L: 1144 } - @ObfuscatedName("p") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lhc;" + descriptor = "([[IIIIZI)Lgs;" ) - public ModelData method4517(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + public ModelData method3847(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { this.calculateBounds(); // L: 1148 - int var7 = var2 + this.field2480; // L: 1149 - int var8 = var2 + this.field2482; // L: 1150 - int var9 = var4 + this.field2489; // L: 1151 - int var10 = var4 + this.field2483; // L: 1152 + int var7 = var2 + this.field2310; // L: 1149 + int var8 = var2 + this.field2315; // L: 1150 + int var9 = var4 + this.field2313; // L: 1151 + int var10 = var4 + this.field2312; // L: 1152 if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { // L: 1153 var7 >>= 7; // L: 1154 var8 = var8 + 127 >> 7; // L: 1155 @@ -1775,8 +1775,8 @@ public class ModelData extends Renderable { } } - @ObfuscatedName("w") - void method4518() { + @ObfuscatedName("b") + void method3859() { int[] var1; int var2; int var10002; @@ -1836,8 +1836,8 @@ public class ModelData extends Renderable { } // L: 1266 - @ObfuscatedName("k") - public void method4553() { + @ObfuscatedName("t") + public void method3820() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1269 int var2 = this.verticesX[var1]; // L: 1270 this.verticesX[var1] = this.verticesZ[var1]; // L: 1271 @@ -1847,8 +1847,8 @@ public class ModelData extends Renderable { this.invalidate(); // L: 1274 } // L: 1275 - @ObfuscatedName("d") - public void method4520() { + @ObfuscatedName("g") + public void method3854() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1278 this.verticesX[var1] = -this.verticesX[var1]; // L: 1279 this.verticesZ[var1] = -this.verticesZ[var1]; // L: 1280 @@ -1857,8 +1857,8 @@ public class ModelData extends Renderable { this.invalidate(); // L: 1282 } // L: 1283 - @ObfuscatedName("m") - public void method4521() { + @ObfuscatedName("x") + public void method3822() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1286 int var2 = this.verticesZ[var1]; // L: 1287 this.verticesZ[var1] = this.verticesX[var1]; // L: 1288 @@ -1868,8 +1868,8 @@ public class ModelData extends Renderable { this.invalidate(); // L: 1291 } // L: 1292 - @ObfuscatedName("u") - public void method4512(int var1) { + @ObfuscatedName("n") + public void method3823(int var1) { int var2 = ModelData_sine[var1]; // L: 1295 int var3 = ModelData_cosine[var1]; // L: 1296 @@ -1882,7 +1882,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 1302 } // L: 1303 - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("changeOffset") public void changeOffset(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 1306 @@ -1897,7 +1897,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 1311 } // L: 1312 - @ObfuscatedName("g") + @ObfuscatedName("h") @Export("recolor") public void recolor(short var1, short var2) { for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 1315 @@ -1908,7 +1908,7 @@ public class ModelData extends Renderable { } // L: 1318 - @ObfuscatedName("x") + @ObfuscatedName("f") @Export("retexture") public void retexture(short var1, short var2) { if (this.faceTextures != null) { // L: 1321 @@ -1921,8 +1921,8 @@ public class ModelData extends Renderable { } } // L: 1325 - @ObfuscatedName("a") - public void method4526() { + @ObfuscatedName("d") + public void method3841() { int var1; for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1328 this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1937,7 +1937,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 1334 } // L: 1335 - @ObfuscatedName("y") + @ObfuscatedName("j") @Export("resize") public void resize(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 1338 @@ -1949,7 +1949,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 1343 } // L: 1344 - @ObfuscatedName("j") + @ObfuscatedName("z") @Export("calculateVertexNormals") public void calculateVertexNormals() { if (this.vertexNormals == null) { // L: 1347 @@ -2025,7 +2025,7 @@ public class ModelData extends Renderable { } } // L: 1402 - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("invalidate") void invalidate() { this.vertexNormals = null; // L: 1405 @@ -2034,43 +2034,43 @@ public class ModelData extends Renderable { this.isBoundsCalculated = false; // L: 1408 } // L: 1409 - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("calculateBounds") void calculateBounds() { if (!this.isBoundsCalculated) { // L: 1412 super.height = 0; // L: 1413 - this.field2445 = 0; // L: 1414 - this.field2480 = 999999; // L: 1415 - this.field2482 = -999999; // L: 1416 - this.field2483 = -99999; // L: 1417 - this.field2489 = 99999; // L: 1418 + this.field2309 = 0; // L: 1414 + this.field2310 = 999999; // L: 1415 + this.field2315 = -999999; // L: 1416 + this.field2312 = -99999; // L: 1417 + this.field2313 = 99999; // L: 1418 for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1419 int var2 = this.verticesX[var1]; // L: 1420 int var3 = this.verticesY[var1]; // L: 1421 int var4 = this.verticesZ[var1]; // L: 1422 - if (var2 < this.field2480) { // L: 1423 - this.field2480 = var2; + if (var2 < this.field2310) { // L: 1423 + this.field2310 = var2; } - if (var2 > this.field2482) { // L: 1424 - this.field2482 = var2; + if (var2 > this.field2315) { // L: 1424 + this.field2315 = var2; } - if (var4 < this.field2489) { // L: 1425 - this.field2489 = var4; + if (var4 < this.field2313) { // L: 1425 + this.field2313 = var4; } - if (var4 > this.field2483) { // L: 1426 - this.field2483 = var4; + if (var4 > this.field2312) { // L: 1426 + this.field2312 = var4; } if (-var3 > super.height) { // L: 1427 super.height = -var3; } - if (var3 > this.field2445) { // L: 1428 - this.field2445 = var3; + if (var3 > this.field2309) { // L: 1428 + this.field2309 = var3; } } @@ -2078,9 +2078,9 @@ public class ModelData extends Renderable { } } // L: 1431 - @ObfuscatedName("ae") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IIIII)Liq;" + descriptor = "(IIIII)Lhv;" ) @Export("toModel") public final Model toModel(int var1, int var2, int var3, int var4, int var5) { @@ -2101,38 +2101,38 @@ public class ModelData extends Renderable { } } - var8.field2742 = 0; // L: 1502 + var8.field2569 = 0; // L: 1502 for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { // L: 1503 if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { // L: 1504 - ++var8.field2742; + ++var8.field2569; } } - var8.field2743 = new int[var8.field2742]; // L: 1506 - var8.field2744 = new int[var8.field2742]; // L: 1507 - var8.field2794 = new int[var8.field2742]; // L: 1508 + var8.field2570 = new int[var8.field2569]; // L: 1506 + var8.field2571 = new int[var8.field2569]; // L: 1507 + var8.field2572 = new int[var8.field2569]; // L: 1508 var10 = 0; // L: 1509 int var11; for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { // L: 1510 if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { // L: 1511 - var8.field2743[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1512 - var8.field2744[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1513 - var8.field2794[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1514 + var8.field2570[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1512 + var8.field2571[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1513 + var8.field2572[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1514 var9[var11] = var10++; // L: 1515 } else { var9[var11] = -1; // L: 1517 } } - var8.field2739 = new byte[this.faceCount]; // L: 1519 + var8.field2566 = new byte[this.faceCount]; // L: 1519 for (var11 = 0; var11 < this.faceCount; ++var11) { // L: 1520 if (this.textureCoords[var11] != -1) { // L: 1521 - var8.field2739[var11] = (byte)var9[this.textureCoords[var11] & 255]; + var8.field2566[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field2739[var11] = -1; // L: 1522 + var8.field2566[var11] = -1; // L: 1522 } } } @@ -2175,7 +2175,7 @@ public class ModelData extends Renderable { if (var17 == 1) { // L: 1555 var19 = this.faceNormals[var16]; // L: 1556 var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1557 - var8.faceColors1[var16] = method4535(this.faceColors[var16] & '\uffff', var14); // L: 1558 + var8.faceColors1[var16] = method3834(this.faceColors[var16] & '\uffff', var14); // L: 1558 var8.faceColors3[var16] = -1; // L: 1559 } else if (var17 == 3) { // L: 1561 var8.faceColors1[var16] = 128; // L: 1562 @@ -2192,7 +2192,7 @@ public class ModelData extends Renderable { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1544 - var8.faceColors1[var16] = method4535(var15, var14); // L: 1545 + var8.faceColors1[var16] = method3834(var15, var14); // L: 1545 if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { // L: 1546 var13 = this.vertexVertices[this.indices2[var16]]; } else { @@ -2200,7 +2200,7 @@ public class ModelData extends Renderable { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1548 - var8.faceColors2[var16] = method4535(var15, var14); // L: 1549 + var8.faceColors2[var16] = method3834(var15, var14); // L: 1549 if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { // L: 1550 var13 = this.vertexVertices[this.indices3[var16]]; } else { @@ -2208,13 +2208,13 @@ public class ModelData extends Renderable { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1552 - var8.faceColors3[var16] = method4535(var15, var14); // L: 1553 + var8.faceColors3[var16] = method3834(var15, var14); // L: 1553 } } else if (var17 != 0) { // L: 1570 if (var17 == 1) { // L: 1586 var19 = this.faceNormals[var16]; // L: 1587 var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1588 - var8.faceColors1[var16] = method4534(var14); // L: 1589 + var8.faceColors1[var16] = method3817(var14); // L: 1589 var8.faceColors3[var16] = -1; // L: 1590 } else { var8.faceColors3[var16] = -2; // L: 1593 @@ -2227,7 +2227,7 @@ public class ModelData extends Renderable { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1575 - var8.faceColors1[var16] = method4534(var14); // L: 1576 + var8.faceColors1[var16] = method3817(var14); // L: 1576 if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { // L: 1577 var13 = this.vertexVertices[this.indices2[var16]]; } else { @@ -2235,7 +2235,7 @@ public class ModelData extends Renderable { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1579 - var8.faceColors2[var16] = method4534(var14); // L: 1580 + var8.faceColors2[var16] = method3817(var14); // L: 1580 if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { var13 = this.vertexVertices[this.indices3[var16]]; // L: 1581 } else { @@ -2243,11 +2243,11 @@ public class ModelData extends Renderable { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1583 - var8.faceColors3[var16] = method4534(var14); // L: 1584 + var8.faceColors3[var16] = method3817(var14); // L: 1584 } } - this.method4518(); // L: 1597 + this.method3859(); // L: 1597 var8.verticesCount = this.verticesCount; // L: 1598 var8.verticesX = this.verticesX; // L: 1599 var8.verticesY = this.verticesY; // L: 1600 @@ -2258,18 +2258,18 @@ public class ModelData extends Renderable { var8.indices3 = this.indices3; // L: 1605 var8.faceRenderPriorities = this.faceRenderPriorities; // L: 1606 var8.faceAlphas = this.faceAlphas; // L: 1607 - var8.field2741 = this.priority; // L: 1608 + var8.field2568 = this.priority; // L: 1608 var8.vertexLabels = this.vertexLabels; // L: 1609 var8.faceLabelsAlpha = this.faceLabelsAlpha; // L: 1610 var8.faceTextures = this.faceTextures; // L: 1611 - var8.field2748 = this.field2464; // L: 1612 - var8.field2726 = this.field2476; // L: 1613 + var8.field2575 = this.field2301; // L: 1612 + var8.field2594 = this.field2302; // L: 1613 return var8; // L: 1614 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lln;II)Lhc;" + descriptor = "(Llp;II)Lgs;" ) @Export("ModelData_get") public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) { @@ -2277,16 +2277,16 @@ public class ModelData extends Renderable { return var3 == null ? null : new ModelData(var3); // L: 59 } - @ObfuscatedName("h") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Lhc;Lhc;IIIZ)V" + descriptor = "(Lgs;Lgs;IIIZ)V" ) - static void method4531(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { + static void method3862(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { var0.calculateBounds(); // L: 1434 var0.calculateVertexNormals(); // L: 1435 var1.calculateBounds(); // L: 1436 var1.calculateVertexNormals(); // L: 1437 - ++field2487; // L: 1438 + ++field2308; // L: 1438 int var6 = 0; // L: 1439 int[] var7 = var1.verticesX; // L: 1440 int var8 = var1.verticesCount; // L: 1441 @@ -2296,11 +2296,11 @@ public class ModelData extends Renderable { VertexNormal var10 = var0.vertexNormals[var9]; // L: 1443 if (var10.magnitude != 0) { // L: 1444 int var11 = var0.verticesY[var9] - var3; // L: 1445 - if (var11 <= var1.field2445) { // L: 1446 + if (var11 <= var1.field2309) { // L: 1446 int var12 = var0.verticesX[var9] - var2; // L: 1447 - if (var12 >= var1.field2480 && var12 <= var1.field2482) { // L: 1448 + if (var12 >= var1.field2310 && var12 <= var1.field2315) { // L: 1448 int var13 = var0.verticesZ[var9] - var4; // L: 1449 - if (var13 >= var1.field2489 && var13 <= var1.field2483) { // L: 1450 + if (var13 >= var1.field2313 && var13 <= var1.field2312) { // L: 1450 for (int var14 = 0; var14 < var8; ++var14) { // L: 1451 VertexNormal var15 = var1.vertexNormals[var14]; // L: 1452 if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.magnitude != 0) { // L: 1453 @@ -2331,8 +2331,8 @@ public class ModelData extends Renderable { var17.z += var10.z; // L: 1466 var17.magnitude += var10.magnitude; // L: 1467 ++var6; // L: 1468 - field2485[var9] = field2487; // L: 1469 - field2486[var14] = field2487; // L: 1470 + field2314[var9] = field2308; // L: 1469 + field2290[var14] = field2308; // L: 1470 } } } @@ -2343,7 +2343,7 @@ public class ModelData extends Renderable { if (var6 >= 3 && var5) { // L: 1474 for (var9 = 0; var9 < var0.faceCount; ++var9) { // L: 1475 - if (field2485[var0.indices1[var9]] == field2487 && field2485[var0.indices2[var9]] == field2487 && field2485[var0.indices3[var9]] == field2487) { // L: 1476 + if (field2314[var0.indices1[var9]] == field2308 && field2314[var0.indices2[var9]] == field2308 && field2314[var0.indices3[var9]] == field2308) { // L: 1476 if (var0.faceRenderTypes == null) { // L: 1477 var0.faceRenderTypes = new byte[var0.faceCount]; } @@ -2353,7 +2353,7 @@ public class ModelData extends Renderable { } for (var9 = 0; var9 < var1.faceCount; ++var9) { // L: 1481 - if (field2487 == field2486[var1.indices1[var9]] && field2487 == field2486[var1.indices2[var9]] && field2487 == field2486[var1.indices3[var9]]) { // L: 1482 + if (field2308 == field2290[var1.indices1[var9]] && field2308 == field2290[var1.indices2[var9]] && field2308 == field2290[var1.indices3[var9]]) { // L: 1482 if (var1.faceRenderTypes == null) { // L: 1483 var1.faceRenderTypes = new byte[var1.faceCount]; } @@ -2365,8 +2365,8 @@ public class ModelData extends Renderable { } } // L: 1487 - @ObfuscatedName("aq") - static final int method4535(int var0, int var1) { + @ObfuscatedName("am") + static final int method3834(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; // L: 1618 if (var1 < 2) { // L: 1619 var1 = 2; @@ -2377,8 +2377,8 @@ public class ModelData extends Renderable { return (var0 & 65408) + var1; // L: 1621 } - @ObfuscatedName("aw") - static final int method4534(int var0) { + @ObfuscatedName("ac") + static final int method3817(int var0) { if (var0 < 2) { // L: 1625 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 d1590a6bea..26d6155a8f 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -1,73 +1,49 @@ -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("ic") +@ObfuscatedName("hl") @Implements("ModelData0") public class ModelData0 { + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Llp;" + ) + static AbstractArchive field2654; + @ObfuscatedName("fi") + static String field2661; + @ObfuscatedName("gb") + @ObfuscatedGetter( + longValue = 2783986170892939363L + ) + static long field2658; + @ObfuscatedName("lu") + @ObfuscatedSignature( + descriptor = "Lca;" + ) + @Export("localPlayer") + static Player localPlayer; + ModelData0() { } // L: 4 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", - garbageValue = "-1428405987" + descriptor = "(I[BLnc;I)V", + garbageValue = "709536384" ) - public static void method5093(Applet var0, String var1) { - class29.field176 = var0; // L: 22 - if (var1 != null) { // L: 23 - class29.field175 = var1; - } + static void method4378(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 - } // L: 24 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-1801328016" - ) - public static int method5091(int var0, int var1, int var2) { - int var3 = class54.method1078(var2 - var1 + 1); // L: 43 - var3 <<= var1; // L: 44 - var0 |= var3; // L: 45 - return var0; // L: 46 - } - - @ObfuscatedName("jf") - @ObfuscatedSignature( - descriptor = "([Lky;IIIZI)V", - garbageValue = "1997359276" - ) - @Export("resizeInterface") - static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { - for (int var5 = 0; var5 < var0.length; ++var5) { // L: 10805 - Widget var6 = var0[var5]; // L: 10806 - if (var6 != null && var6.parentId == var1) { // L: 10807 10808 - ApproximateRouteStrategy.alignWidgetSize(var6, var2, var3, var4); // L: 10809 - HealthBarUpdate.alignWidgetPosition(var6, var2, var3); // L: 10810 - if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 10811 - var6.scrollX = var6.scrollWidth - var6.width; - } - - if (var6.scrollX < 0) { // L: 10812 - var6.scrollX = 0; - } - - if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 10813 - var6.scrollY = var6.scrollHeight - var6.height; - } - - if (var6.scrollY < 0) { // L: 10814 - var6.scrollY = 0; - } - - if (var6.type == 0) { // L: 10815 - AbstractByteArrayCopier.revalidateWidgetScroll(var0, var6, var4); - } - } - } - - } // L: 10817 + class306.method5595(); // L: 26 + } // L: 27 } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index 8ba97fabc7..4e4597ee91 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -9,117 +9,129 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aj") +@ObfuscatedName("ae") @Implements("MouseHandler") public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { - @ObfuscatedName("f") + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1681939429 + ) + @Export("MouseHandler_x") + public static int MouseHandler_x; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Laj;" + descriptor = "Lae;" ) @Export("MouseHandler_instance") - static MouseHandler MouseHandler_instance; - @ObfuscatedName("b") + public static MouseHandler MouseHandler_instance; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1215511241 + intValue = -1954795539 ) @Export("MouseHandler_idleCycles") - static volatile int MouseHandler_idleCycles; - @ObfuscatedName("n") + public static volatile int MouseHandler_idleCycles; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1775726367 + intValue = -990713497 ) @Export("MouseHandler_currentButtonVolatile") static volatile int MouseHandler_currentButtonVolatile; @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 85689575 + intValue = -2068251699 ) @Export("MouseHandler_xVolatile") static volatile int MouseHandler_xVolatile; - @ObfuscatedName("l") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1306099979 + intValue = -1733497125 ) @Export("MouseHandler_yVolatile") static volatile int MouseHandler_yVolatile; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - longValue = -4643079622769248037L + longValue = 8288662778520390807L ) @Export("MouseHandler_lastMovedVolatile") static volatile long MouseHandler_lastMovedVolatile; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1731887577 - ) - @Export("MouseHandler_currentButton") - public static int MouseHandler_currentButton; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 945035617 - ) - @Export("MouseHandler_x") - public static int MouseHandler_x; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -785295255 - ) - @Export("MouseHandler_y") - public static int MouseHandler_y; - @ObfuscatedName("w") - @ObfuscatedGetter( - longValue = 4725999527355171863L + longValue = -7279409155159127695L ) @Export("MouseHandler_millis") public static long MouseHandler_millis; - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1519434749 + intValue = 86476017 + ) + @Export("MouseHandler_currentButton") + public static int MouseHandler_currentButton; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1263316171 + ) + @Export("MouseHandler_y") + public static int MouseHandler_y; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 14622161 ) @Export("MouseHandler_lastButtonVolatile") static volatile int MouseHandler_lastButtonVolatile; - @ObfuscatedName("d") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -981711317 + intValue = 1442175051 ) @Export("MouseHandler_lastPressedXVolatile") static volatile int MouseHandler_lastPressedXVolatile; - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1147584293 + intValue = 844374905 ) @Export("MouseHandler_lastPressedYVolatile") static volatile int MouseHandler_lastPressedYVolatile; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - longValue = 1021935901074327701L + longValue = 6423114043985559653L ) @Export("MouseHandler_lastPressedTimeMillisVolatile") static volatile long MouseHandler_lastPressedTimeMillisVolatile; - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -192789509 + intValue = 265860113 ) @Export("MouseHandler_lastButton") public static int MouseHandler_lastButton; - @ObfuscatedName("g") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 647045439 + intValue = 1874338505 ) @Export("MouseHandler_lastPressedX") public static int MouseHandler_lastPressedX; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1945736255 + intValue = 797268567 ) @Export("MouseHandler_lastPressedY") public static int MouseHandler_lastPressedY; - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedGetter( - longValue = -2565305597523014613L + longValue = 1079896650509100317L ) @Export("MouseHandler_lastPressedTimeMillis") public static long MouseHandler_lastPressedTimeMillis; + @ObfuscatedName("eo") + @ObfuscatedSignature( + descriptor = "Lle;" + ) + @Export("archive4") + static Archive archive4; + @ObfuscatedName("hi") + @ObfuscatedSignature( + descriptor = "Lpo;" + ) + @Export("WorldMapElement_fonts") + static Fonts WorldMapElement_fonts; static { MouseHandler_instance = new MouseHandler(); // L: 15 @@ -145,413 +157,124 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler() { } // L: 34 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Ljava/awt/event/MouseEvent;B)I", - garbageValue = "-6" + descriptor = "(Ljava/awt/event/MouseEvent;I)I", + garbageValue = "-845105013" ) @Export("getButton") final int getButton(MouseEvent var1) { - int var2 = var1.getButton(); // L: 67 - if (!var1.isAltDown() && var2 != 2) { // L: 68 - return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 69 70 + int var2 = var1.getButton(); // L: 68 + if (!var1.isAltDown() && var2 != 2) { // L: 69 + return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 70 71 } else { return 4; } } public final synchronized void mouseMoved(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 115 - MouseHandler_idleCycles = 0; // L: 116 - MouseHandler_xVolatile = var1.getX(); // L: 117 - MouseHandler_yVolatile = var1.getY(); // L: 118 - MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 119 + if (MouseHandler_instance != null) { // L: 116 + MouseHandler_idleCycles = 0; // L: 117 + MouseHandler_xVolatile = var1.getX(); // L: 118 + MouseHandler_yVolatile = var1.getY(); // L: 119 + MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 120 } - } // L: 121 - - public final synchronized void mouseExited(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 102 - MouseHandler_idleCycles = 0; // L: 103 - MouseHandler_xVolatile = -1; // L: 104 - MouseHandler_yVolatile = -1; // L: 105 - MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 106 - } - - } // L: 108 - - public final synchronized void mouseDragged(MouseEvent var1) { - this.mouseMoved(var1); // L: 111 - } // L: 112 - - public final synchronized void mouseReleased(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 86 - MouseHandler_idleCycles = 0; // L: 87 - MouseHandler_currentButtonVolatile = 0; // L: 88 - } - - if (var1.isPopupTrigger()) { // L: 90 - var1.consume(); - } - - } // L: 91 - - public final synchronized void mouseEntered(MouseEvent var1) { - this.mouseMoved(var1); // L: 98 - } // L: 99 + } // L: 122 public final synchronized void focusLost(FocusEvent var1) { - if (MouseHandler_instance != null) { // L: 126 + if (MouseHandler_instance != null) { // L: 127 MouseHandler_currentButtonVolatile = 0; } - } // L: 127 + } // L: 128 - public final void mouseClicked(MouseEvent var1) { - if (var1.isPopupTrigger()) { // L: 94 + public final synchronized void mouseReleased(MouseEvent var1) { + if (MouseHandler_instance != null) { // L: 87 + MouseHandler_idleCycles = 0; // L: 88 + MouseHandler_currentButtonVolatile = 0; // L: 89 + } + + if (var1.isPopupTrigger()) { // L: 91 var1.consume(); } - } // L: 95 + } // L: 92 + + public final void mouseClicked(MouseEvent var1) { + if (var1.isPopupTrigger()) { // L: 95 + var1.consume(); + } + + } // L: 96 + + public final synchronized void mouseEntered(MouseEvent var1) { + this.mouseMoved(var1); // L: 99 + } // L: 100 public final void focusGained(FocusEvent var1) { - } // L: 123 + } // L: 124 + + public final synchronized void mouseDragged(MouseEvent var1) { + this.mouseMoved(var1); // L: 112 + } // L: 113 public final synchronized void mousePressed(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 74 - MouseHandler_idleCycles = 0; // L: 75 - MouseHandler_lastPressedXVolatile = var1.getX(); // L: 76 - MouseHandler_lastPressedYVolatile = var1.getY(); // L: 77 - MouseHandler_lastPressedTimeMillisVolatile = class136.method2931(); // L: 78 - MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 79 - if (MouseHandler_lastButtonVolatile != 0) { // L: 80 + if (MouseHandler_instance != null) { // L: 75 + MouseHandler_idleCycles = 0; // L: 76 + MouseHandler_lastPressedXVolatile = var1.getX(); // L: 77 + MouseHandler_lastPressedYVolatile = var1.getY(); // L: 78 + MouseHandler_lastPressedTimeMillisVolatile = class113.method2624(); // L: 79 + MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 80 + if (MouseHandler_lastButtonVolatile != 0) { // L: 81 MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; } } - if (var1.isPopupTrigger()) { // L: 82 + if (var1.isPopupTrigger()) { // L: 83 var1.consume(); } - } // L: 83 + } // L: 84 - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-1283526589" - ) - static int method613(int var0, Script var1, boolean var2) { - if (var0 < 1000) { // L: 427 - return class168.method3353(var0, var1, var2); - } else if (var0 < 1100) { // L: 428 - return class7.method54(var0, var1, var2); - } else if (var0 < 1200) { // L: 429 - return UserComparator9.method2621(var0, var1, var2); - } else if (var0 < 1300) { // L: 430 - return class134.method2906(var0, var1, var2); - } else if (var0 < 1400) { // L: 431 - return UserComparator3.method2607(var0, var1, var2); - } else if (var0 < 1500) { // L: 432 - return Language.method6079(var0, var1, var2); - } else if (var0 < 1600) { // L: 433 - return class296.method5749(var0, var1, var2); - } else if (var0 < 1700) { // L: 434 - return SoundSystem.method761(var0, var1, var2); - } else if (var0 < 1800) { // L: 435 - return class135.method2922(var0, var1, var2); - } else if (var0 < 1900) { // L: 436 - return NPC.method2361(var0, var1, var2); - } else if (var0 < 2000) { // L: 437 - return HealthBarUpdate.method2186(var0, var1, var2); - } else if (var0 < 2100) { // L: 438 - return class7.method54(var0, var1, var2); - } else if (var0 < 2200) { // L: 439 - return UserComparator9.method2621(var0, var1, var2); - } else if (var0 < 2300) { // L: 440 - return class134.method2906(var0, var1, var2); - } else if (var0 < 2400) { // L: 441 - return UserComparator3.method2607(var0, var1, var2); - } else if (var0 < 2500) { - return Language.method6079(var0, var1, var2); // L: 442 - } else if (var0 < 2600) { // L: 443 - return ApproximateRouteStrategy.method1124(var0, var1, var2); - } else if (var0 < 2700) { // L: 444 - return class135.method2921(var0, var1, var2); - } else if (var0 < 2800) { // L: 445 - return class271.method5220(var0, var1, var2); - } else if (var0 < 2900) { // L: 446 - return class127.method2840(var0, var1, var2); - } else if (var0 < 3000) { // L: 447 - return HealthBarUpdate.method2186(var0, var1, var2); - } else if (var0 < 3200) { // L: 448 - return Projectile.method1976(var0, var1, var2); - } else if (var0 < 3300) { // L: 449 - return PlayerType.method5803(var0, var1, var2); - } else if (var0 < 3400) { // L: 450 - return ViewportMouse.method5089(var0, var1, var2); - } else if (var0 < 3500) { // L: 451 - return SecureRandomFuture.method1985(var0, var1, var2); - } else if (var0 < 3600) { // L: 452 - return class356.method6582(var0, var1, var2); - } else if (var0 < 3700) { // L: 453 - return AbstractByteArrayCopier.method5506(var0, var1, var2); - } else if (var0 < 3800) { // L: 454 - return GameObject.method5111(var0, var1, var2); - } else if (var0 < 3900) { // L: 455 - return WorldMapSectionType.method4310(var0, var1, var2); - } else if (var0 < 4000) { // L: 456 - return Player.method2112(var0, var1, var2); - } else if (var0 < 4100) { // L: 457 - return Strings.method5790(var0, var1, var2); - } else if (var0 < 4200) { - return WorldMapLabel.method4354(var0, var1, var2); // L: 458 - } else if (var0 < 4300) { // L: 459 - return NetCache.method5965(var0, var1, var2); - } else if (var0 < 5100) { // L: 460 - return class151.method3159(var0, var1, var2); - } else if (var0 < 5400) { // L: 461 - return class160.method3279(var0, var1, var2); - } else if (var0 < 5600) { // L: 462 - return Language.method6091(var0, var1, var2); - } else if (var0 < 5700) { // L: 463 - return BufferedSink.method6911(var0, var1, var2); - } else if (var0 < 6300) { // L: 464 - return SecureRandomFuture.method1984(var0, var1, var2); - } else if (var0 < 6600) { // L: 465 - return ScriptFrame.method1085(var0, var1, var2); - } else if (var0 < 6700) { // L: 466 - return class11.method100(var0, var1, var2); - } else if (var0 < 6800) { // L: 467 - return class271.method5221(var0, var1, var2); - } else if (var0 < 6900) { // L: 468 - return HealthBar.method2343(var0, var1, var2); - } else if (var0 < 7000) { // L: 469 - return class10.method87(var0, var1, var2); - } else if (var0 < 7100) { // L: 470 - return MouseRecorder.method2094(var0, var1, var2); - } else if (var0 < 7200) { // L: 471 - return Skeleton.method4729(var0, var1, var2); - } else if (var0 < 7300) { // L: 472 - return class19.method286(var0, var1, var2); - } else { - return var0 < 7500 ? ApproximateRouteStrategy.method1123(var0, var1, var2) : 2; // L: 473 474 - } - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-76237077" - ) - public static String method584(String var0) { - int var1 = var0.length(); // L: 150 - char[] var2 = new char[var1]; // L: 151 - byte var3 = 2; // L: 152 - - for (int var4 = 0; var4 < var1; ++var4) { // L: 153 - char var5 = var0.charAt(var4); // L: 154 - if (var3 == 0) { // L: 155 - var5 = Character.toLowerCase(var5); - } else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 156 - var5 = class129.method2863(var5); - } - - if (Character.isLetter(var5)) { // L: 157 - var3 = 0; - } else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 158 - if (Character.isSpaceChar(var5)) { // L: 159 - if (var3 != 2) { // L: 160 - var3 = 1; - } - } else { - var3 = 1; // L: 162 - } - } else { - var3 = 2; - } - - var2[var4] = var5; // L: 163 + public final synchronized void mouseExited(MouseEvent var1) { + if (MouseHandler_instance != null) { // L: 103 + MouseHandler_idleCycles = 0; // L: 104 + MouseHandler_xVolatile = -1; // L: 105 + MouseHandler_yVolatile = -1; // L: 106 + MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 107 } - return new String(var2); // L: 165 - } + } // L: 109 - @ObfuscatedName("ia") + @ObfuscatedName("fw") @ObfuscatedSignature( - descriptor = "(Lpz;B)V", - garbageValue = "2" + descriptor = "(IIII)V", + garbageValue = "1658227237" ) - static final void method593(PacketBuffer var0) { - for (int var1 = 0; var1 < Client.field547; ++var1) { // L: 8207 - int var2 = Client.field548[var1]; // L: 8208 - NPC var3 = Client.npcs[var2]; // L: 8209 - int var4 = var0.readUnsignedByte(); // L: 8210 - int var5; - if (class431.field4602 && (var4 & 64) != 0) { // L: 8211 - var5 = var0.readUnsignedByte(); // L: 8212 - var4 += var5 << 8; // L: 8213 - } - - int var6; - int var7; - int var8; - if ((var4 & 1) != 0) { // L: 8215 - var5 = var0.readUnsignedShort(); // L: 8216 - var6 = var0.method7715(); // L: 8217 - if (class431.field4602) { // L: 8218 - var3.field1144 = var0.method7875() == 1; // L: 8219 - } - - var7 = var3.x - (var5 - GrandExchangeOfferOwnWorldComparator.baseX - GrandExchangeOfferOwnWorldComparator.baseX) * 64; // L: 8221 - var8 = var3.y - (var6 - VarcInt.baseY - VarcInt.baseY) * 64; // L: 8222 - if (var7 != 0 || var8 != 0) { // L: 8223 - var3.field1121 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; - } - } - - if ((var4 & 1024) != 0) { // L: 8225 - var3.field1182 = var0.readInt(); // L: 8226 - } - - if ((var4 & 16) != 0) { // L: 8228 - var3.spotAnimation = var0.readUnsignedShort(); // L: 8229 - var5 = var0.readInt(); // L: 8230 - var3.spotAnimationHeight = var5 >> 16; // L: 8231 - var3.field1134 = (var5 & 65535) + Client.cycle; // L: 8232 - var3.spotAnimationFrame = 0; // L: 8233 - var3.spotAnimationFrameCycle = 0; // L: 8234 - if (var3.field1134 > Client.cycle) { // L: 8235 - var3.spotAnimationFrame = -1; - } - - if (var3.spotAnimation == 65535) { // L: 8236 - var3.spotAnimation = -1; - } - } - - if ((var4 & 128) != 0) { // L: 8238 - var5 = var0.readUnsignedByte(); // L: 8239 - int var9; - int var10; - int var11; - if (var5 > 0) { // L: 8240 - for (var6 = 0; var6 < var5; ++var6) { // L: 8241 - var8 = -1; // L: 8243 - var9 = -1; // L: 8244 - var10 = -1; // L: 8245 - var7 = var0.readUShortSmart(); // L: 8246 - if (var7 == 32767) { // L: 8247 - var7 = var0.readUShortSmart(); // L: 8248 - var9 = var0.readUShortSmart(); // L: 8249 - var8 = var0.readUShortSmart(); // L: 8250 - var10 = var0.readUShortSmart(); // L: 8251 - } else if (var7 != 32766) { // L: 8253 - var9 = var0.readUShortSmart(); // L: 8254 - } else { - var7 = -1; // L: 8256 - } - - var11 = var0.readUShortSmart(); // L: 8257 - var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); // L: 8258 - } - } - - var6 = var0.method7773(); // L: 8261 - if (var6 > 0) { // L: 8262 - for (var7 = 0; var7 < var6; ++var7) { // L: 8263 - var8 = var0.readUShortSmart(); // L: 8264 - var9 = var0.readUShortSmart(); // L: 8265 - if (var9 != 32767) { // L: 8266 - var10 = var0.readUShortSmart(); // L: 8267 - var11 = var0.readUnsignedByte(); // L: 8268 - int var12 = var9 > 0 ? var0.method7875() : var11; // L: 8269 - var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); // L: 8270 - } else { - var3.removeHealthBar(var8); // L: 8272 - } - } - } - } - - if (class431.field4602 && (var4 & 256) != 0 || !class431.field4602 && (var4 & 64) != 0) { // L: 8276 - var3.field1129 = var0.method7885(); // L: 8277 - var3.field1160 = var0.method7707(); // L: 8278 - var3.field1132 = var0.readByte(); // L: 8279 - var3.field1161 = var0.readByte(); // L: 8280 - var3.field1143 = var0.method7715() + Client.cycle; // L: 8281 - var3.field1163 = var0.readUnsignedShort() + Client.cycle; // L: 8282 - var3.field1135 = var0.method7715(); // L: 8283 - var3.pathLength = 1; // L: 8284 - var3.field1170 = 0; // L: 8285 - var3.field1129 += var3.pathX[0]; // L: 8286 - var3.field1160 += var3.pathY[0]; // L: 8287 - var3.field1132 += var3.pathX[0]; // L: 8288 - var3.field1161 += var3.pathY[0]; // L: 8289 - } - - if ((var4 & 512) != 0) { // L: 8291 - var3.field1167 = Client.cycle + var0.method7713(); // L: 8292 - var3.field1168 = Client.cycle + var0.method7714(); // L: 8293 - var3.field1169 = var0.readByte(); // L: 8294 - var3.field1114 = var0.method7707(); // L: 8295 - var3.field1171 = var0.method7707(); // L: 8296 - var3.field1122 = (byte)var0.method7742(); // L: 8297 - } - - if ((var4 & 2) != 0) { // L: 8299 - var3.overheadText = var0.readStringCp1252NullTerminated(); // L: 8300 - var3.overheadTextCyclesRemaining = 100; // L: 8301 - } - - if ((var4 & 4) != 0) { // L: 8303 - var3.targetIndex = var0.method7714(); // L: 8304 - if (var3.targetIndex == 65535) { // L: 8305 - var3.targetIndex = -1; - } - } - - if ((var4 & 32) != 0) { // L: 8307 - var3.definition = KeyHandler.getNpcDefinition(var0.method7715()); // L: 8308 - var3.field1150 = var3.definition.size; // L: 8309 - var3.field1175 = var3.definition.rotation; // L: 8310 - var3.walkSequence = var3.definition.walkSequence; // L: 8311 - var3.walkBackSequence = var3.definition.walkBackSequence; // L: 8312 - var3.walkLeftSequence = var3.definition.walkLeftSequence; // L: 8313 - var3.walkRightSequence = var3.definition.walkRightSequence; // L: 8314 - var3.idleSequence = var3.definition.idleSequence; // L: 8315 - var3.turnLeftSequence = var3.definition.turnLeftSequence; // L: 8316 - var3.turnRightSequence = var3.definition.turnRightSequence; // L: 8317 - } - - if ((var4 & 8) != 0) { // L: 8319 - var5 = var0.method7713(); // L: 8320 - if (var5 == 65535) { // L: 8321 - var5 = -1; // L: 8322 - } - - var6 = var0.method7875(); // L: 8324 - if (var5 == var3.sequence && var5 != -1) { // L: 8325 - var7 = class163.SequenceDefinition_get(var5).field2161; // L: 8326 - if (var7 == 1) { // L: 8327 - var3.sequenceFrame = 0; // L: 8328 - var3.sequenceFrameCycle = 0; // L: 8329 - var3.sequenceDelay = var6; // L: 8330 - var3.field1152 = 0; // L: 8331 - } - - if (var7 == 2) { // L: 8333 - var3.field1152 = 0; // L: 8334 - } - } else if (var5 == -1 || var3.sequence == -1 || class163.SequenceDefinition_get(var5).field2155 >= class163.SequenceDefinition_get(var3.sequence).field2155) { // L: 8337 - var3.sequence = var5; // L: 8338 - var3.sequenceFrame = 0; // L: 8339 - var3.sequenceFrameCycle = 0; // L: 8340 - var3.sequenceDelay = var6; // L: 8341 - var3.field1152 = 0; // L: 8342 - var3.field1170 = var3.pathLength; // L: 8343 - } - } + static void method588(int var0, int var1, int var2) { + if (var0 != 0) { // L: 3774 + int var3 = var0 >> 8; // L: 3775 + int var4 = var0 >> 4 & 7; // L: 3776 + int var5 = var0 & 15; // L: 3777 + Client.soundEffectIds[Client.soundEffectCount] = var3; // L: 3778 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; // L: 3779 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3780 + Client.soundEffects[Client.soundEffectCount] = null; // L: 3781 + int var6 = (var1 - 64) / 128; // L: 3782 + int var7 = (var2 - 64) / 128; // L: 3783 + Client.soundLocations[Client.soundEffectCount] = var5 + (var7 << 8) + (var6 << 16); // L: 3784 + ++Client.soundEffectCount; // L: 3785 } + } // L: 3786 - } // L: 8348 + @ObfuscatedName("kv") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1845150784" + ) + static final void method591(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); // L: 12078 + class12.clientPreferences.method2278(var0); // L: 12079 + } // L: 12080 } diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index b7107e1b25..4706380998 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -1,31 +1,32 @@ +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("cf") +@ObfuscatedName("cv") @Implements("MouseRecorder") public class MouseRecorder implements Runnable { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("isRunning") boolean isRunning; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("lock") Object lock; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1040654815 + intValue = 1556283769 ) @Export("index") int index; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("xs") int[] xs; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("ys") int[] ys; - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("millis") long[] millis; @@ -36,269 +37,44 @@ public class MouseRecorder implements Runnable { this.xs = new int[500]; // L: 10 this.ys = new int[500]; // L: 11 this.millis = new long[500]; // L: 12 - } + } // L: 14 public void run() { - for (; this.isRunning; class93.method2384(50L)) { // L: 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.index; // L: 23 + for (; this.isRunning; class241.method4815(50L)) { // L: 18 27 + synchronized(this.lock) { // L: 19 + if (this.index < 500) { // L: 20 + this.xs[this.index] = MouseHandler.MouseHandler_x; // L: 21 + this.ys[this.index] = MouseHandler.MouseHandler_y; // L: 22 + this.millis[this.index] = MouseHandler.MouseHandler_millis; // L: 23 + ++this.index; // L: 24 } } } - } // L: 28 + } // L: 29 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1730658434" + descriptor = "(ZB)V", + garbageValue = "-105" ) - static int method2093(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14 - if (var2 == null) { // L: 15 - return -1; - } else { - return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17 - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2109167375" - ) - public static void method2098() { - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 82 - } // L: 83 - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "1423538345" - ) - static int method2094(int var0, Script var1, boolean var2) { - if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { // L: 4547 - if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { // L: 4551 - if (var0 != 7003 && var0 != 7013 && var0 != 7023) { // L: 4555 - if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { // L: 4559 - if (var0 != 7008 && var0 != 7018 && var0 != 7028) { // L: 4563 - if (var0 != 7031 && var0 != 7032) { // L: 4567 - if (var0 == 7033) { // L: 4572 - --class122.Interpreter_stringStackSize; // L: 4573 - return 1; // L: 4574 - } else if (var0 != 7036 && var0 != 7037) { // L: 4576 - if (var0 == 7038) { // L: 4580 - --Interpreter.Interpreter_intStackSize; // L: 4581 - return 1; // L: 4582 - } else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { // L: 4584 - return 2; // L: 4588 - } else { - --Interpreter.Interpreter_intStackSize; // L: 4585 - return 1; // L: 4586 - } - } else { - Interpreter.Interpreter_intStackSize -= 2; // L: 4577 - return 1; // L: 4578 - } - } else { - --class122.Interpreter_stringStackSize; // L: 4568 - --Interpreter.Interpreter_intStackSize; // L: 4569 - return 1; // L: 4570 - } - } else { - --Interpreter.Interpreter_intStackSize; // L: 4564 - return 1; // L: 4565 - } - } else { - Interpreter.Interpreter_intStackSize -= 2; // L: 4560 - return 1; // L: 4561 - } - } else { - Interpreter.Interpreter_intStackSize -= 2; // L: 4556 - return 1; // L: 4557 - } - } else { - Interpreter.Interpreter_intStackSize -= 3; // L: 4552 - return 1; // L: 4553 - } - } else { - Interpreter.Interpreter_intStackSize -= 5; // L: 4548 - return 1; // L: 4549 - } - } - - @ObfuscatedName("hm") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1147144850" - ) - static final void method2096(int var0, int var1, int var2, int var3) { - Client.overheadTextCount = 0; // L: 5289 - boolean var4 = false; // L: 5290 - int var5 = -1; // L: 5291 - int var6 = -1; // L: 5292 - int var7 = Players.Players_count; // L: 5293 - int[] var8 = Players.Players_indices; // L: 5294 - - int var9; - for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) { // L: 5295 - Object var20; - if (var9 < var7) { // L: 5297 - var20 = Client.players[var8[var9]]; // L: 5298 - if (var8[var9] == Client.combatTargetPlayerIndex) { // L: 5299 - var4 = true; // L: 5300 - var5 = var9; // L: 5301 - continue; + public static void method2088(boolean var0) { + if (NetCache.NetCache_socket != null) { // L: 42 + try { + Buffer var1 = new Buffer(4); // L: 44 + var1.writeByte(var0 ? 2 : 3); // L: 45 + var1.writeMedium(0); // L: 46 + NetCache.NetCache_socket.write(var1.array, 0, 4); // L: 47 + } catch (IOException var4) { + try { + NetCache.NetCache_socket.close(); // L: 51 + } catch (Exception var3) { // L: 53 } - if (var20 == GrandExchangeEvents.localPlayer) { // L: 5304 - var6 = var9; // L: 5305 - continue; // L: 5306 - } - } else { - var20 = Client.npcs[Client.npcIndices[var9 - var7]]; // L: 5309 + ++NetCache.NetCache_ioExceptions; // L: 54 + NetCache.NetCache_socket = null; // L: 55 } - ScriptFrame.drawActor2d((Actor)var20, var9, var0, var1, var2, var3); // L: 5310 } - - if (Client.renderSelf && var6 != -1) { // L: 5312 - ScriptFrame.drawActor2d(GrandExchangeEvents.localPlayer, var6, var0, var1, var2, var3); // L: 5313 - } - - if (var4) { // L: 5315 - ScriptFrame.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3); // L: 5316 - } - - for (var9 = 0; var9 < Client.overheadTextCount; ++var9) { // L: 5318 - int var10 = Client.overheadTextXs[var9]; // L: 5319 - int var11 = Client.overheadTextYs[var9]; // L: 5320 - int var12 = Client.overheadTextXOffsets[var9]; // L: 5321 - int var13 = Client.overheadTextAscents[var9]; // L: 5322 - boolean var14 = true; // L: 5323 - - while (var14) { - var14 = false; // L: 5325 - - for (int var19 = 0; var19 < var9; ++var19) { // L: 5326 - if (var11 + 2 > Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] && var11 - var13 < Client.overheadTextYs[var19] + 2 && var10 - var12 < Client.overheadTextXs[var19] + Client.overheadTextXOffsets[var19] && var10 + var12 > Client.overheadTextXs[var19] - Client.overheadTextXOffsets[var19] && Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] < var11) { // L: 5327 5328 - var11 = Client.overheadTextYs[var19] - Client.overheadTextAscents[var19]; // L: 5329 - var14 = true; // L: 5330 - } - } - } - - Client.viewportTempX = Client.overheadTextXs[var9]; // L: 5335 - Client.viewportTempY = Client.overheadTextYs[var9] = var11; // L: 5336 - String var15 = Client.overheadText[var9]; // L: 5337 - if (Client.chatEffects == 0) { // L: 5338 - int var16 = 16776960; // L: 5339 - if (Client.overheadTextColors[var9] < 6) { // L: 5340 - var16 = Client.field725[Client.overheadTextColors[var9]]; - } - - if (Client.overheadTextColors[var9] == 6) { // L: 5341 - var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; - } - - if (Client.overheadTextColors[var9] == 7) { // L: 5342 - var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; - } - - if (Client.overheadTextColors[var9] == 8) { // L: 5343 - var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; - } - - int var17; - if (Client.overheadTextColors[var9] == 9) { // L: 5344 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5345 - if (var17 < 50) { // L: 5346 - var16 = var17 * 1280 + 16711680; - } else if (var17 < 100) { // L: 5347 - var16 = 16776960 - (var17 - 50) * 327680; - } else if (var17 < 150) { // L: 5348 - var16 = (var17 - 100) * 5 + 65280; - } - } - - if (Client.overheadTextColors[var9] == 10) { // L: 5350 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5351 - if (var17 < 50) { // L: 5352 - var16 = var17 * 5 + 16711680; - } else if (var17 < 100) { // L: 5353 - var16 = 16711935 - (var17 - 50) * 327680; - } else if (var17 < 150) { // L: 5354 - var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5; - } - } - - if (Client.overheadTextColors[var9] == 11) { // L: 5356 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5357 - if (var17 < 50) { // L: 5358 - var16 = 16777215 - var17 * 327685; - } else if (var17 < 100) { // L: 5359 - var16 = (var17 - 50) * 327685 + 65280; - } else if (var17 < 150) { // L: 5360 - var16 = 16777215 - (var17 - 100) * 327680; - } - } - - if (Client.overheadTextEffects[var9] == 0) { // L: 5362 - RouteStrategy.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0); - } - - if (Client.overheadTextEffects[var9] == 1) { // L: 5363 - RouteStrategy.fontBold12.drawCenteredWave(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var9] == 2) { // L: 5364 - RouteStrategy.fontBold12.drawCenteredWave2(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var9] == 3) { // L: 5365 - RouteStrategy.fontBold12.drawCenteredShake(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]); - } - - if (Client.overheadTextEffects[var9] == 4) { // L: 5366 - var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (RouteStrategy.fontBold12.stringWidth(var15) + 100) / 150; // L: 5367 - Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 5368 - RouteStrategy.fontBold12.draw(var15, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0); // L: 5369 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 5370 - } - - if (Client.overheadTextEffects[var9] == 5) { // L: 5372 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5373 - int var18 = 0; // L: 5374 - if (var17 < 25) { // L: 5375 - var18 = var17 - 25; - } else if (var17 > 125) { // L: 5376 - var18 = var17 - 125; - } - - Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - RouteStrategy.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 5377 - RouteStrategy.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0); // L: 5378 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 5379 - } - } else { - RouteStrategy.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 5383 - } - } - - } // L: 5386 - - @ObfuscatedName("js") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "551926222" - ) - @Export("runIntfCloseListeners") - static final void runIntfCloseListeners(int var0, int var1) { - if (class155.loadInterface(var0)) { // L: 11718 - class155.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); // L: 11719 - } - } // L: 11720 + } // L: 57 } diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java index a868106f72..39a33b38ea 100644 --- a/runescape-client/src/main/java/MouseWheel.java +++ b/runescape-client/src/main/java/MouseWheel.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ls") +@ObfuscatedName("lk") @Implements("MouseWheel") public interface MouseWheel { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") int rsOrdinal(); diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index 7b3142ea4f..437fea4e0b 100644 --- a/runescape-client/src/main/java/MouseWheelHandler.java +++ b/runescape-client/src/main/java/MouseWheelHandler.java @@ -10,9 +10,9 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("j") @Implements("MouseWheelHandler") public final class MouseWheelHandler implements class158, MouseWheelListener { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1835748205 + intValue = -1405253987 ) @Export("rotation") int rotation; @@ -21,30 +21,30 @@ public final class MouseWheelHandler implements class158, MouseWheelListener { this.rotation = 0; // L: 8 } // L: 10 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-577945862" + garbageValue = "-1767860580" ) @Export("addTo") void addTo(Component var1) { var1.addMouseWheelListener(this); // L: 13 } // L: 14 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "1462071319" + garbageValue = "-1913817294" ) @Export("removeFrom") void removeFrom(Component var1) { var1.removeMouseWheelListener(this); // L: 17 } // L: 18 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "34380601" + garbageValue = "-479610962" ) @Export("useRotation") public synchronized int useRotation() { diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java index 474cc63e66..66e4671717 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -4,44 +4,47 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jb") +@ObfuscatedName("jt") @Implements("MusicPatch") public class MusicPatch extends Node { - @ObfuscatedName("v") + @ObfuscatedName("y") + @Export("Tiles_saturation") + static int[] Tiles_saturation; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1242230189 + intValue = -690673201 ) - int field3228; - @ObfuscatedName("c") + int field3288; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "[Lat;" + descriptor = "[Lak;" ) @Export("rawSounds") RawSound[] rawSounds; - @ObfuscatedName("i") - short[] field3227; - @ObfuscatedName("f") - byte[] field3223; - @ObfuscatedName("b") - byte[] field3222; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "[Ljy;" - ) - MusicPatchNode2[] field3224; - @ObfuscatedName("s") - byte[] field3220; @ObfuscatedName("l") - int[] field3226; + short[] field3287; + @ObfuscatedName("k") + byte[] field3290; + @ObfuscatedName("a") + byte[] field3289; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "[Ljp;" + ) + MusicPatchNode2[] field3291; + @ObfuscatedName("p") + byte[] field3285; + @ObfuscatedName("s") + int[] field3292; MusicPatch(byte[] var1) { this.rawSounds = new RawSound[128]; // L: 21 - this.field3227 = new short[128]; // L: 22 - this.field3223 = new byte[128]; // L: 23 - this.field3222 = new byte[128]; // L: 24 - this.field3224 = new MusicPatchNode2[128]; // L: 25 - this.field3220 = new byte[128]; // L: 26 - this.field3226 = new int[128]; // L: 27 + this.field3287 = new short[128]; // L: 22 + this.field3290 = new byte[128]; // L: 23 + this.field3289 = new byte[128]; // L: 24 + this.field3291 = new MusicPatchNode2[128]; // L: 25 + this.field3285 = new byte[128]; // L: 26 + this.field3292 = new int[128]; // L: 27 Buffer var2 = new Buffer(var1); // L: 28 int var3; @@ -121,13 +124,13 @@ public class MusicPatch extends Node { var15 = var37[var14] = new MusicPatchNode2(); // L: 70 int var40 = var2.readUnsignedByte(); // L: 71 if (var40 > 0) { // L: 72 - var15.field3160 = new byte[var40 * 2]; + var15.field3232 = new byte[var40 * 2]; } var40 = var2.readUnsignedByte(); // L: 73 if (var40 > 0) { // L: 74 - var15.field3165 = new byte[var40 * 2 + 2]; // L: 75 - var15.field3165[1] = 64; // L: 76 + var15.field3223 = new byte[var40 * 2 + 2]; // L: 75 + var15.field3223[1] = 64; // L: 76 } } @@ -154,7 +157,7 @@ public class MusicPatch extends Node { int var20; for (var20 = 0; var20 < 128; ++var20) { // L: 90 var19 += var2.readUnsignedByte(); // L: 91 - this.field3227[var20] = (short)var19; // L: 92 + this.field3287[var20] = (short)var19; // L: 92 } var19 = 0; // L: 94 @@ -162,7 +165,7 @@ public class MusicPatch extends Node { short[] var48; for (var20 = 0; var20 < 128; ++var20) { // L: 95 var19 += var2.readUnsignedByte(); // L: 96 - var48 = this.field3227; // L: 97 + var48 = this.field3287; // L: 97 var48[var20] = (short)(var48[var20] + (var19 << 8)); } @@ -182,9 +185,9 @@ public class MusicPatch extends Node { var22 = var2.readVarInt(); // L: 106 } - var48 = this.field3227; // L: 108 + var48 = this.field3287; // L: 108 var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14)); - this.field3226[var23] = var22; // L: 109 + this.field3292[var23] = var22; // L: 109 --var20; // L: 110 } @@ -194,7 +197,7 @@ public class MusicPatch extends Node { int var24; for (var24 = 0; var24 < 128; ++var24) { // L: 115 - if (this.field3226[var24] != 0) { // L: 116 + if (this.field3292[var24] != 0) { // L: 116 if (var20 == 0) { // L: 117 if (var21 < var4.length) { // L: 118 var20 = var4[var21++]; @@ -205,7 +208,7 @@ public class MusicPatch extends Node { var23 = var2.array[var5++] - 1; // L: 120 } - this.field3220[var24] = (byte)var23; // L: 122 + this.field3285[var24] = (byte)var23; // L: 122 --var20; // L: 123 } } @@ -215,7 +218,7 @@ public class MusicPatch extends Node { var24 = 0; // L: 127 for (int var25 = 0; var25 < 128; ++var25) { // L: 128 - if (this.field3226[var25] != 0) { // L: 129 + if (this.field3292[var25] != 0) { // L: 129 if (var20 == 0) { // L: 130 if (var21 < var7.length) { // L: 131 var20 = var7[var21++]; @@ -226,7 +229,7 @@ public class MusicPatch extends Node { var24 = var2.array[var8++] + 16 << 2; // L: 133 } - this.field3222[var25] = (byte)var24; // L: 135 + this.field3289[var25] = (byte)var24; // L: 135 --var20; // L: 136 } } @@ -237,7 +240,7 @@ public class MusicPatch extends Node { int var26; for (var26 = 0; var26 < 128; ++var26) { // L: 141 - if (this.field3226[var26] != 0) { // L: 142 + if (this.field3292[var26] != 0) { // L: 142 if (var20 == 0) { // L: 143 var38 = var37[var36[var21]]; // L: 144 if (var21 < var10.length) { // L: 145 @@ -247,7 +250,7 @@ public class MusicPatch extends Node { } } - this.field3224[var26] = var38; // L: 148 + this.field3291[var26] = var38; // L: 148 --var20; // L: 149 } } @@ -265,30 +268,30 @@ public class MusicPatch extends Node { var20 = -1; // L: 157 } - if (this.field3226[var27] > 0) { // L: 158 + if (this.field3292[var27] > 0) { // L: 158 var26 = var2.readUnsignedByte() + 1; } } - this.field3223[var27] = (byte)var26; // L: 160 + this.field3290[var27] = (byte)var26; // L: 160 --var20; // L: 161 } - this.field3228 = var2.readUnsignedByte() + 1; // L: 163 + this.field3288 = var2.readUnsignedByte() + 1; // L: 163 int var29; MusicPatchNode2 var39; for (var27 = 0; var27 < var12; ++var27) { // L: 164 var39 = var37[var27]; // L: 165 - if (var39.field3160 != null) { // L: 166 - for (var29 = 1; var29 < var39.field3160.length; var29 += 2) { // L: 167 - var39.field3160[var29] = var2.readByte(); + if (var39.field3232 != null) { // L: 166 + for (var29 = 1; var29 < var39.field3232.length; var29 += 2) { // L: 167 + var39.field3232[var29] = var2.readByte(); } } - if (var39.field3165 != null) { // L: 169 - for (var29 = 3; var29 < var39.field3165.length - 2; var29 += 2) { // L: 170 - var39.field3165[var29] = var2.readByte(); + if (var39.field3223 != null) { // L: 169 + for (var29 = 3; var29 < var39.field3223.length - 2; var29 += 2) { // L: 170 + var39.field3223[var29] = var2.readByte(); } } } @@ -307,24 +310,24 @@ public class MusicPatch extends Node { for (var27 = 0; var27 < var12; ++var27) { // L: 179 var39 = var37[var27]; // L: 180 - if (var39.field3165 != null) { // L: 181 + if (var39.field3223 != null) { // L: 181 var19 = 0; // L: 182 - for (var29 = 2; var29 < var39.field3165.length; var29 += 2) { // L: 183 - var19 = 1 + var19 + var2.readUnsignedByte(); // L: 184 - var39.field3165[var29] = (byte)var19; // L: 185 + for (var29 = 2; var29 < var39.field3223.length; var29 += 2) { // L: 183 + var19 = var19 + 1 + var2.readUnsignedByte(); // L: 184 + var39.field3223[var29] = (byte)var19; // L: 185 } } } for (var27 = 0; var27 < var12; ++var27) { // L: 189 var39 = var37[var27]; // L: 190 - if (var39.field3160 != null) { // L: 191 + if (var39.field3232 != null) { // L: 191 var19 = 0; // L: 192 - for (var29 = 2; var29 < var39.field3160.length; var29 += 2) { // L: 193 + for (var29 = 2; var29 < var39.field3232.length; var29 += 2) { // L: 193 var19 = var19 + 1 + var2.readUnsignedByte(); // L: 194 - var39.field3160[var29] = (byte)var19; // L: 195 + var39.field3232[var29] = (byte)var19; // L: 195 } } } @@ -348,7 +351,7 @@ public class MusicPatch extends Node { byte var28 = var42[1]; // L: 207 for (var29 = 0; var29 < var47; ++var29) { // L: 208 - this.field3223[var29] = (byte)(var28 * this.field3223[var29] + 32 >> 6); + this.field3290[var29] = (byte)(var28 * this.field3290[var29] + 32 >> 6); } for (var29 = 2; var29 < var42.length; var29 += 2) { // L: 209 210 221 @@ -357,8 +360,8 @@ public class MusicPatch extends Node { var32 = var28 * (var30 - var47) + (var30 - var47) / 2; // L: 213 for (var33 = var47; var33 < var30; ++var33) { // L: 214 - var34 = class82.method2102(var32, var30 - var47); // L: 215 - this.field3223[var33] = (byte)(var34 * this.field3223[var33] + 32 >> 6); // L: 216 + var34 = class134.method2841(var32, var30 - var47); // L: 215 + this.field3290[var33] = (byte)(var34 * this.field3290[var33] + 32 >> 6); // L: 216 var32 += var31 - var28; // L: 217 } @@ -367,7 +370,7 @@ public class MusicPatch extends Node { } for (var45 = var47; var45 < 128; ++var45) { // L: 223 - this.field3223[var45] = (byte)(var28 * this.field3223[var45] + 32 >> 6); + this.field3290[var45] = (byte)(var28 * this.field3290[var45] + 32 >> 6); } var15 = null; // L: 224 @@ -386,7 +389,7 @@ public class MusicPatch extends Node { int var44 = var16[1] << 1; // L: 234 for (var29 = 0; var29 < var47; ++var29) { // L: 235 - var45 = var44 + (this.field3222[var29] & 255); // L: 236 + var45 = var44 + (this.field3289[var29] & 255); // L: 236 if (var45 < 0) { // L: 237 var45 = 0; } @@ -395,7 +398,7 @@ public class MusicPatch extends Node { var45 = 128; } - this.field3222[var29] = (byte)var45; // L: 239 + this.field3289[var29] = (byte)var45; // L: 239 } int var46; @@ -405,8 +408,8 @@ public class MusicPatch extends Node { var32 = var44 * (var30 - var47) + (var30 - var47) / 2; // L: 245 for (var33 = var47; var33 < var30; ++var33) { // L: 246 - var34 = class82.method2102(var32, var30 - var47); // L: 247 - int var35 = var34 + (this.field3222[var33] & 255); // L: 248 + var34 = class134.method2841(var32, var30 - var47); // L: 247 + int var35 = var34 + (this.field3289[var33] & 255); // L: 248 if (var35 < 0) { // L: 249 var35 = 0; } @@ -415,7 +418,7 @@ public class MusicPatch extends Node { var35 = 128; } - this.field3222[var33] = (byte)var35; // L: 251 + this.field3289[var33] = (byte)var35; // L: 251 var32 += var46 - var44; // L: 252 } @@ -424,7 +427,7 @@ public class MusicPatch extends Node { } for (var45 = var47; var45 < 128; ++var45) { // L: 258 - var46 = var44 + (this.field3222[var45] & 255); // L: 259 + var46 = var44 + (this.field3289[var45] & 255); // L: 259 if (var46 < 0) { // L: 260 var46 = 0; } @@ -433,64 +436,64 @@ public class MusicPatch extends Node { var46 = 128; } - this.field3222[var45] = (byte)var46; // L: 262 + this.field3289[var45] = (byte)var46; // L: 262 } Object var43 = null; // L: 264 } for (var27 = 0; var27 < var12; ++var27) { // L: 266 - var37[var27].field3162 = var2.readUnsignedByte(); + var37[var27].field3226 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { // L: 267 var39 = var37[var27]; // L: 268 - if (var39.field3160 != null) { // L: 269 - var39.field3159 = var2.readUnsignedByte(); + if (var39.field3232 != null) { // L: 269 + var39.field3225 = var2.readUnsignedByte(); } - if (var39.field3165 != null) { // L: 270 - var39.field3163 = var2.readUnsignedByte(); + if (var39.field3223 != null) { // L: 270 + var39.field3224 = var2.readUnsignedByte(); } - if (var39.field3162 > 0) { // L: 271 - var39.field3164 = var2.readUnsignedByte(); + if (var39.field3226 > 0) { // L: 271 + var39.field3227 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { // L: 273 - var37[var27].field3166 = var2.readUnsignedByte(); + var37[var27].field3229 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { // L: 274 var39 = var37[var27]; // L: 275 - if (var39.field3166 > 0) { // L: 276 - var39.field3161 = var2.readUnsignedByte(); + if (var39.field3229 > 0) { // L: 276 + var39.field3228 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { // L: 278 var39 = var37[var27]; // L: 279 - if (var39.field3161 > 0) { // L: 280 - var39.field3167 = var2.readUnsignedByte(); + if (var39.field3228 > 0) { // L: 280 + var39.field3222 = var2.readUnsignedByte(); } } } // L: 282 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lac;[B[IB)Z", - garbageValue = "-3" + descriptor = "(Lan;[B[II)Z", + garbageValue = "-489821860" ) - boolean method5427(SoundCache var1, byte[] var2, int[] var3) { + boolean method5272(SoundCache var1, byte[] var2, int[] var3) { boolean var4 = true; // L: 285 int var5 = 0; // L: 286 RawSound var6 = null; // L: 287 for (int var7 = 0; var7 < 128; ++var7) { // L: 288 if (var2 == null || var2[var7] != 0) { // L: 289 - int var8 = this.field3226[var7]; // L: 290 + int var8 = this.field3292[var7]; // L: 290 if (var8 != 0) { // L: 291 if (var8 != var5) { // L: 292 var5 = var8--; // L: 293 294 @@ -507,7 +510,7 @@ public class MusicPatch extends Node { if (var6 != null) { // L: 299 this.rawSounds[var7] = var6; // L: 300 - this.field3226[var7] = 0; // L: 301 + this.field3292[var7] = 0; // L: 301 } } } @@ -516,69 +519,62 @@ public class MusicPatch extends Node { return var4; // L: 305 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1421286153" + descriptor = "(B)V", + garbageValue = "75" ) @Export("clear") void clear() { - this.field3226 = null; // L: 309 + this.field3292 = null; // L: 309 } // L: 310 - @ObfuscatedName("gd") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "2078599773" + descriptor = "(ILbb;ZI)I", + garbageValue = "-879482214" ) - @Export("drawLoadingMessage") - static final void drawLoadingMessage(String var0, boolean var1) { - if (Client.showLoadingMessages) { // L: 4411 - byte var2 = 4; // L: 4412 - int var3 = var2 + 6; // L: 4413 - int var4 = var2 + 6; // L: 4414 - int var5 = class13.fontPlain12.lineWidth(var0, 250); // L: 4415 - int var6 = class13.fontPlain12.lineCount(var0, 250) * 13; // L: 4416 - Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 0); // L: 4417 - Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var6 + var2, 16777215); // L: 4418 - class13.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 4419 - HealthBar.method2330(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var6 + var2); // L: 4420 - if (var1) { // L: 4421 - FontName.rasterProvider.drawFull(0, 0); // L: 4422 - } else { - ScriptEvent.method2092(var3, var4, var5, var6); // L: 4425 - } - + static int method5277(int var0, Script var1, boolean var2) { + if (var0 == 7400) { // L: 4670 + --class12.Interpreter_intStackSize; // L: 4671 + --class9.Interpreter_stringStackSize; // L: 4672 + return 1; // L: 4673 + } else if (var0 == 7401) { // L: 4675 + --class12.Interpreter_intStackSize; // L: 4676 + --class9.Interpreter_stringStackSize; // L: 4677 + return 1; // L: 4678 + } else if (var0 == 7402) { // L: 4680 + class12.Interpreter_intStackSize -= 2; // L: 4681 + --class9.Interpreter_stringStackSize; // L: 4682 + return 1; // L: 4683 + } else if (var0 == 7403) { // L: 4685 + class12.Interpreter_intStackSize -= 2; // L: 4686 + --class9.Interpreter_stringStackSize; // L: 4687 + return 1; // L: 4688 + } else if (var0 == 7404) { // L: 4690 + --class12.Interpreter_intStackSize; // L: 4691 + --class9.Interpreter_stringStackSize; // L: 4692 + return 1; // L: 4693 + } else if (var0 == 7405) { // L: 4695 + class12.Interpreter_intStackSize -= 2; // L: 4696 + return 1; // L: 4697 + } else if (var0 == 7406) { // L: 4699 + --class12.Interpreter_intStackSize; // L: 4700 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 4701 + return 1; // L: 4702 + } else if (var0 == 7407) { // L: 4704 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4705 + return 1; // L: 4706 + } else if (var0 == 7408) { // L: 4708 + class12.Interpreter_intStackSize -= 2; // L: 4709 + --class9.Interpreter_stringStackSize; // L: 4710 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4711 + return 1; // L: 4712 + } else if (var0 == 7409) { // L: 4714 + --class12.Interpreter_intStackSize; // L: 4715 + return 1; // L: 4716 + } else { + return 2; // L: 4718 } - } // L: 4427 - - @ObfuscatedName("gk") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1118853304" - ) - @Export("addNpcsToScene") - static final void addNpcsToScene(boolean var0) { - for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4811 - NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 4812 - if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 4813 - int var3 = var2.x >> 7; // L: 4814 - int var4 = var2.y >> 7; // L: 4815 - if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 4816 - if (var2.field1150 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 4817 - if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 4818 - continue; - } - - Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 4819 - } - - long var5 = GameObject.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 4821 - var2.playerCycle = Client.cycle; // L: 4822 - ArchiveLoader.scene.drawEntity(class18.Client_plane, var2.x, var2.y, WorldMapLabel.getTileHeight(var2.field1150 * 64 - 64 + var2.x, var2.field1150 * 64 - 64 + var2.y, class18.Client_plane), var2.field1150 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 4823 - } - } - } - - } // L: 4827 + } } diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index d960ecfbf2..dc98eb2e1f 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -4,130 +4,308 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jn") +@ObfuscatedName("ji") @Implements("MusicPatchNode") public class MusicPatchNode extends Node { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -85807901 + intValue = -1633027795 ) - int field3248; - @ObfuscatedName("c") + int field3308; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Ljb;" + descriptor = "Ljt;" ) @Export("patch") MusicPatch patch; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lat;" + descriptor = "Lak;" ) @Export("rawSound") RawSound rawSound; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - MusicPatchNode2 field3247; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 388699889 - ) - int field3239; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1603871991 - ) - int field3251; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -467029619 - ) - int field3241; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 244268301 - ) - int field3242; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1685721651 - ) - int field3243; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 574011949 - ) - int field3244; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 322850677 - ) - int field3245; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 286335067 - ) - int field3246; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1066885049 - ) - int field3235; @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -921472867 + @ObfuscatedSignature( + descriptor = "Ljp;" ) - int field3252; - @ObfuscatedName("d") + MusicPatchNode2 field3306; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -443275667 + intValue = 1595060947 ) - int field3249; + int field3319; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1587247393 + intValue = -1588715753 ) - int field3250; - @ObfuscatedName("u") + int field3307; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1104457881 + intValue = 694428029 ) - int field3253; + int field3311; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1945733599 + ) + int field3312; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -1493240557 + ) + int field3310; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1183801873 + ) + int field3309; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = -1743024279 + ) + int field3302; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 181824205 + ) + int field3313; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 883462029 + ) + int field3314; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -2130944147 + ) + int field3315; @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -579957291 + intValue = 1027674077 ) - int field3237; + int field3316; @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 1108202467 + ) + int field3317; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 2110000655 + ) + int field3318; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 121475961 + ) + int field3304; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lau;" + descriptor = "Lah;" ) @Export("stream") RawPcmStream stream; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 2013381951 + intValue = -2111788587 ) - int field3255; - @ObfuscatedName("y") + int field3321; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 2077025655 + intValue = 378248553 ) - int field3238; + int field3322; MusicPatchNode() { - } // L: 31 + } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1181491124" + descriptor = "(B)V", + garbageValue = "-115" ) - void method5473() { - this.patch = null; // L: 34 + void method5316() { + this.patch = null; this.rawSound = null; // L: 35 - this.field3247 = null; // L: 36 - this.stream = null; // L: 37 - } // L: 38 + this.field3306 = null; + this.stream = null; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ldz;FB)F", + garbageValue = "-47" + ) + static float method5315(class117 var0, float var1) { + if (var0 != null && var0.method2695() != 0) { // L: 18 + if (var1 < (float)var0.field1476[0].field1430) { // L: 21 + return var0.field1472 == class116.field1470 ? var0.field1476[0].field1428 : JagexCache.method3159(var0, var1, true); // L: 22 23 25 + } else if (var1 > (float)var0.field1476[var0.method2695() - 1].field1430) { // L: 27 + return var0.field1475 == class116.field1470 ? var0.field1476[var0.method2695() - 1].field1428 : JagexCache.method3159(var0, var1, false); // L: 28 29 31 + } else if (var0.field1487) { // L: 33 + return var0.field1476[0].field1428; // L: 34 + } else { + class113 var2 = var0.method2707(var1); // L: 36 + boolean var3 = false; // L: 37 + boolean var4 = false; // L: 38 + if (var2 == null) { // L: 39 + return 0.0F; // L: 205 + } else { + float var7; + if ((double)var2.field1425 == 0.0D && 0.0D == (double)var2.field1426) { // L: 40 + var3 = true; // L: 41 + } else if (var2.field1425 == Float.MAX_VALUE && Float.MAX_VALUE == var2.field1426) { // L: 43 + var4 = true; // L: 44 + } else if (var2.field1427 != null) { // L: 46 + if (var0.field1482) { // L: 47 + float[] var5 = new float[4]; // L: 48 + float[] var6 = new float[4]; // L: 49 + var5[0] = (float)var2.field1430; // L: 50 + var6[0] = var2.field1428; // L: 51 + var5[1] = var2.field1425 * 0.33333334F + var5[0]; // L: 52 + var6[1] = var6[0] + 0.33333334F * var2.field1426; // L: 53 + var5[3] = (float)var2.field1427.field1430; // L: 54 + var6[3] = var2.field1427.field1428; // L: 55 + var5[2] = var5[3] - var2.field1427.field1423 * 0.33333334F; // L: 56 + var6[2] = var6[3] - var2.field1427.field1424 * 0.33333334F; // L: 57 + if (var0.field1477) { // L: 58 + if (var0 != null) { // L: 60 + var7 = var5[3] - var5[0]; // L: 63 + if ((double)var7 != 0.0D) { // L: 64 + float var8 = var5[1] - var5[0]; // L: 67 + float var9 = var5[2] - var5[0]; // L: 68 + Float var10 = var8 / var7; // L: 69 + Float var11 = var9 / var7; // L: 70 + var0.field1480 = var10 == 0.33333334F && var11 == 0.6666667F; // L: 71 + float var12 = var10; // L: 72 + float var13 = var11; // L: 73 + if ((double)var10 < 0.0D) { // L: 74 + var10 = 0.0F; + } + + if ((double)var11 > 1.0D) { // L: 75 + var11 = 1.0F; + } + + if ((double)var10 > 1.0D || var11 < -1.0F) { // L: 76 + Float var14 = var10; // L: 77 + Float var15 = 1.0F - var11; // L: 80 + if (var10 < 0.0F) { // L: 81 + var14 = 0.0F; + } + + if (var15 < 0.0F) { // L: 82 + var15 = 0.0F; + } + + if (var14 > 1.0F || var15 > 1.0F) { // L: 83 + float var16 = (float)((double)(var14 * (var14 - 2.0F + var15)) + (double)var15 * ((double)var15 - 2.0D) + 1.0D); // L: 84 + if (var16 + class114.field1435 > 0.0F) { // L: 85 + Float var18; + if (var14 + class114.field1435 < 1.3333334F) { // L: 89 + float var19 = var14 - 2.0F; // L: 90 + float var20 = var14 - 1.0F; // L: 91 + float var21 = (float)Math.sqrt((double)(var19 * var19 - 4.0F * var20 * var20)); // L: 92 + float var22 = 0.5F * (var21 + -var19); // L: 93 + if (var15 + class114.field1435 > var22) { // L: 94 + var18 = var22 - class114.field1435; // L: 95 + } else { + var22 = 0.5F * (-var19 - var21); // L: 98 + if (var15 < var22 + class114.field1435) { // L: 99 + var18 = var22 + class114.field1435; // L: 100 + } + } + } else { + Float var17 = 1.3333334F - class114.field1435; // L: 105 + var18 = 0.33333334F - class114.field1435; // L: 106 + } + } + } + + var15 = 1.0F - var15; // L: 111 + } + + if (var10 != var12) { // L: 114 + var5[1] = var5[0] + var10 * var7; // L: 115 + if (0.0D != (double)var12) { // L: 116 + var6[1] = var6[0] + (var6[1] - var6[0]) * var10 / var12; // L: 117 + } + } + + if (var11 != var13) { // L: 120 + var5[2] = var5[0] + var11 * var7; // L: 121 + if ((double)var13 != 1.0D) { // L: 122 + var6[2] = (float)((double)var6[3] - (double)(var6[3] - var6[2]) * (1.0D - (double)var11) / (1.0D - (double)var13)); // L: 123 + } + } + + var0.field1478 = var5[0]; // L: 126 + var0.field1479 = var5[3]; // L: 127 + class341.method6090(0.0F, var10, var11, 1.0F, var0.field1473); // L: 128 + class341.method6090(var6[0], var6[1], var6[2], var6[3], var0.field1481); // L: 129 + } + } + } else { + class113.method2623(var0, var5, var6); // L: 133 + } + + var0.field1482 = false; // L: 135 + } + } else { + var3 = true; // L: 139 + } + + if (var3) { // L: 141 + return var2.field1428; // L: 142 + } else if (var4) { // L: 144 + return (float)var2.field1430 != var1 && var2.field1427 != null ? var2.field1427.field1428 : var2.field1428; // L: 145 146 149 + } else { + float var23; + float var24; + if (var0.field1477) { // L: 152 + if (var0 == null) { // L: 155 + var24 = 0.0F; // L: 156 + } else { + if (var1 == var0.field1478) { // L: 160 + var23 = 0.0F; // L: 161 + } else if (var0.field1479 == var1) { // L: 163 + var23 = 1.0F; // L: 164 + } else { + var23 = (var1 - var0.field1478) / (var0.field1479 - var0.field1478); // L: 167 + } + + if (var0.field1480) { // L: 170 + var7 = var23; // L: 171 + } else { + float[] var25 = new float[]{var0.field1473[0] - var23, var0.field1473[1], var0.field1473[2], var0.field1473[3]}; // L: 174 175 176 177 178 + float[] var26 = new float[5]; // L: 179 + int var27 = GrandExchangeOfferAgeComparator.method5798(var25, 3, 0.0F, true, 1.0F, true, var26); // L: 180 + if (var27 == 1) { // L: 181 + var7 = var26[0]; // L: 182 + } else { + var7 = 0.0F; // L: 185 + } + } + + var24 = var0.field1481[0] + var7 * (var0.field1481[1] + (var7 * var0.field1481[3] + var0.field1481[2]) * var7); // L: 188 + } + + return var24; // L: 190 + } else { + if (var0 == null) { // L: 195 + var24 = 0.0F; // L: 196 + } else { + var23 = var1 - var0.field1478; // L: 199 + var24 = (var0.field1473[2] + var23 * (var0.field1473[0] * var23 + var0.field1473[1])) * var23 + var0.field1473[3]; // L: 200 + } + + return var24; // L: 202 + } + } + } + } + } else { + return 0.0F; // L: 19 + } + } } diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index 838e4f2677..a497639c49 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -1,50 +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; -@ObfuscatedName("jy") +@ObfuscatedName("jp") @Implements("MusicPatchNode2") public class MusicPatchNode2 { - @ObfuscatedName("v") - byte[] field3160; - @ObfuscatedName("c") - byte[] field3165; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1091435735 - ) - int field3162; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1957731725 - ) - int field3159; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 897940521 - ) - int field3163; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 100002585 - ) - int field3164; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 369050739 - ) - int field3161; + @ObfuscatedName("o") + byte[] field3232; + @ObfuscatedName("q") + byte[] field3223; @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 199056997 + intValue = 706358109 ) - int field3166; - @ObfuscatedName("q") + int field3226; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1008423979 + intValue = 2100894531 ) - int field3167; + int field3225; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 2080800417 + ) + int field3224; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 1431898739 + ) + int field3227; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -1294985269 + ) + int field3228; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1586241363 + ) + int field3229; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 1620713125 + ) + int field3222; MusicPatchNode2() { } // L: 14 + + @ObfuscatedName("if") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1059182079" + ) + @Export("Widget_runOnTargetLeave") + static void Widget_runOnTargetLeave() { + if (Client.isSpellSelected) { // L: 9786 + Widget var0 = ApproximateRouteStrategy.getWidgetChild(ArchiveDiskActionHandler.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 9787 + if (var0 != null && var0.onTargetLeave != null) { // L: 9788 + ScriptEvent var1 = new ScriptEvent(); // L: 9789 + var1.widget = var0; // L: 9790 + var1.args = var0.onTargetLeave; // L: 9791 + class144.runScriptEvent(var1); // L: 9792 + } + + Client.selectedSpellItemId = -1; // L: 9794 + Client.isSpellSelected = false; // L: 9795 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var0); // L: 9796 + } + } // L: 9797 } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index e5a4a0c3d3..f771df6844 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -3,30 +3,36 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jt") +@ObfuscatedName("jv") @Implements("MusicPatchPcmStream") public class MusicPatchPcmStream extends PcmStream { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lad;" + ) + @Export("soundSystem") + static SoundSystem soundSystem; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Ljw;" ) @Export("superStream") MidiPcmStream superStream; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llv;" ) @Export("queue") NodeDeque queue; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lal;" + descriptor = "Las;" ) @Export("mixer") PcmStreamMixer mixer; @ObfuscatedSignature( - descriptor = "(Lji;)V" + descriptor = "(Ljw;)V" ) MusicPatchPcmStream(MidiPcmStream var1) { this.queue = new NodeDeque(); // L: 11 @@ -34,48 +40,48 @@ public class MusicPatchPcmStream extends PcmStream { this.superStream = var1; // L: 15 } // L: 16 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljn;[IIIII)V", - garbageValue = "664452285" + descriptor = "(Lji;[IIIII)V", + garbageValue = "-2062540713" ) - void method5443(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if ((this.superStream.field3193[var1.field3248] & 4) != 0 && var1.field3249 < 0) { // L: 73 - int var6 = this.superStream.field3195[var1.field3248] / PcmPlayer.field268; // L: 74 + void method5281(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { + if ((this.superStream.field3247[var1.field3308] & 4) != 0 && var1.field3316 < 0) { // L: 73 + int var6 = this.superStream.field3259[var1.field3308] / PcmPlayer.field300; // L: 74 while (true) { - int var7 = (var6 + 1048575 - var1.field3238) / var6; // L: 76 + int var7 = (var6 + 1048575 - var1.field3322) / var6; // L: 76 if (var7 > var4) { // L: 77 - var1.field3238 += var4 * var6; // L: 99 + var1.field3322 += var6 * var4; // L: 99 break; } var1.stream.fill(var2, var3, var7); // L: 78 var3 += var7; // L: 79 var4 -= var7; // L: 80 - var1.field3238 += var6 * var7 - 1048576; // L: 81 - int var8 = PcmPlayer.field268 / 100; // L: 82 + var1.field3322 += var6 * var7 - 1048576; // L: 81 + int var8 = PcmPlayer.field300 / 100; // L: 82 int var9 = 262144 / var6; // L: 83 if (var9 < var8) { // L: 84 var8 = var9; } RawPcmStream var10 = var1.stream; // L: 85 - if (this.superStream.field3189[var1.field3248] == 0) { // L: 86 - var1.stream = RawPcmStream.method791(var1.rawSound, var10.method866(), var10.method797(), var10.method798()); // L: 87 + if (this.superStream.field3257[var1.field3308] == 0) { // L: 86 + var1.stream = RawPcmStream.method829(var1.rawSound, var10.method884(), var10.method805(), var10.method806()); // L: 87 } else { - var1.stream = RawPcmStream.method791(var1.rawSound, var10.method866(), 0, var10.method798()); // L: 90 - this.superStream.method5342(var1, var1.patch.field3227[var1.field3251] < 0); // L: 91 - var1.stream.method802(var8, var10.method797()); // L: 92 + var1.stream = RawPcmStream.method829(var1.rawSound, var10.method884(), 0, var10.method806()); // L: 90 + this.superStream.method5091(var1, var1.patch.field3287[var1.field3307] < 0); // L: 91 + var1.stream.method810(var8, var10.method805()); // L: 92 } - if (var1.patch.field3227[var1.field3251] < 0) { // L: 94 + if (var1.patch.field3287[var1.field3307] < 0) { // L: 94 var1.stream.setNumLoops(-1); } - var10.method882(var8); // L: 95 + var10.method812(var8); // L: 95 var10.fill(var2, var3, var5 - var3); // L: 96 - if (var10.method808()) { // L: 97 + if (var10.method935()) { // L: 97 this.mixer.addSubStream(var10); } } @@ -84,146 +90,165 @@ public class MusicPatchPcmStream extends PcmStream { var1.stream.fill(var2, var3, var4); // L: 101 } // L: 102 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Ljn;II)V", - garbageValue = "-1438401552" + descriptor = "(Lji;II)V", + garbageValue = "-1512136486" ) - void method5442(MusicPatchNode var1, int var2) { - if ((this.superStream.field3193[var1.field3248] & 4) != 0 && var1.field3249 < 0) { // L: 105 - int var3 = this.superStream.field3195[var1.field3248] / PcmPlayer.field268; // L: 106 - int var4 = (var3 + 1048575 - var1.field3238) / var3; // L: 107 - var1.field3238 = var3 * var2 + var1.field3238 & 1048575; // L: 108 + void method5297(MusicPatchNode var1, int var2) { + if ((this.superStream.field3247[var1.field3308] & 4) != 0 && var1.field3316 < 0) { // L: 105 + int var3 = this.superStream.field3259[var1.field3308] / PcmPlayer.field300; // L: 106 + int var4 = (var3 + 1048575 - var1.field3322) / var3; // L: 107 + var1.field3322 = var3 * var2 + var1.field3322 & 1048575; // L: 108 if (var4 <= var2) { // L: 109 - if (this.superStream.field3189[var1.field3248] == 0) { // L: 110 - var1.stream = RawPcmStream.method791(var1.rawSound, var1.stream.method866(), var1.stream.method797(), var1.stream.method798()); // L: 111 + if (this.superStream.field3257[var1.field3308] == 0) { // L: 110 + var1.stream = RawPcmStream.method829(var1.rawSound, var1.stream.method884(), var1.stream.method805(), var1.stream.method806()); // L: 111 } else { - var1.stream = RawPcmStream.method791(var1.rawSound, var1.stream.method866(), 0, var1.stream.method798()); // L: 114 - this.superStream.method5342(var1, var1.patch.field3227[var1.field3251] < 0); // L: 115 + var1.stream = RawPcmStream.method829(var1.rawSound, var1.stream.method884(), 0, var1.stream.method806()); // L: 114 + this.superStream.method5091(var1, var1.patch.field3287[var1.field3307] < 0); // L: 115 } - if (var1.patch.field3227[var1.field3251] < 0) { // L: 117 + if (var1.patch.field3287[var1.field3307] < 0) { // L: 117 var1.stream.setNumLoops(-1); } - var2 = var1.field3238 / var3; // L: 118 + var2 = var1.field3322 / var3; // L: 118 } } var1.stream.skip(var2); // L: 121 } // L: 122 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "()Laf;" + descriptor = "()Lao;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { - MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); + MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); // L: 19 if (var1 == null) { return null; // L: 20 } else { - return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); // L: 22 + return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); // L: 21 22 } } - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "()Laf;" + descriptor = "()Lao;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { MusicPatchNode var1; do { var1 = (MusicPatchNode)this.queue.previous(); // L: 27 - if (var1 == null) { // L: 28 - return null; + if (var1 == null) { + return null; // L: 28 } } while(var1.stream == null); // L: 29 return var1.stream; } - @ObfuscatedName("l") - protected int vmethod5441() { + @ObfuscatedName("s") + protected int vmethod5295() { return 0; // L: 34 } - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("fill") protected void fill(int[] var1, int var2, int var3) { this.mixer.fill(var1, var2, var3); // L: 40 for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { // L: 41 - if (!this.superStream.method5273(var6)) { // L: 42 + if (!this.superStream.method5113(var6)) { // L: 42 int var4 = var2; // L: 43 int var5 = var3; // L: 44 do { - if (var5 <= var6.field3255) { // L: 45 - this.method5443(var6, var1, var4, var5, var4 + var5); // L: 51 - var6.field3255 -= var5; // L: 52 + if (var5 <= var6.field3321) { // L: 45 + this.method5281(var6, var1, var4, var5, var4 + var5); // L: 51 + var6.field3321 -= var5; // L: 52 break; } - this.method5443(var6, var1, var4, var6.field3255, var5 + var4); // L: 46 - var4 += var6.field3255; // L: 47 - var5 -= var6.field3255; // L: 48 - } while(!this.superStream.method5311(var6, var1, var4, var5)); // L: 49 + this.method5281(var6, var1, var4, var6.field3321, var5 + var4); // L: 46 + var4 += var6.field3321; // L: 47 + var5 -= var6.field3321; // L: 48 + } while(!this.superStream.method5114(var6, var1, var4, var5)); // L: 49 } } } // L: 54 - @ObfuscatedName("r") + @ObfuscatedName("y") @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.method5273(var3)) { // L: 60 + if (!this.superStream.method5113(var3)) { // L: 60 int var2 = var1; // L: 61 do { - if (var2 <= var3.field3255) { // L: 62 - this.method5442(var3, var2); // L: 67 - var3.field3255 -= var2; // L: 68 + if (var2 <= var3.field3321) { // L: 62 + this.method5297(var3, var2); // L: 67 + var3.field3321 -= var2; // L: 68 break; } - this.method5442(var3, var3.field3255); // L: 63 - var2 -= var3.field3255; // L: 64 - } while(!this.superStream.method5311(var3, (int[])null, 0, var2)); // L: 65 + this.method5297(var3, var3.field3321); // L: 63 + var2 -= var3.field3321; // L: 64 + } while(!this.superStream.method5114(var3, (int[])null, 0, var2)); // L: 65 } } } // L: 70 - @ObfuscatedName("v") + @ObfuscatedName("jh") @ObfuscatedSignature( - descriptor = "([Lls;II)Lls;", - garbageValue = "-1189056832" + descriptor = "([Lki;II)V", + garbageValue = "1623622888" ) - @Export("findEnumerated") - public static MouseWheel findEnumerated(MouseWheel[] var0, int var1) { - MouseWheel[] var2 = var0; // L: 17 + @Export("runComponentCloseListeners") + static final void runComponentCloseListeners(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11746 + Widget var3 = var0[var2]; // L: 11747 + if (var3 != null) { // L: 11748 + if (var3.type == 0) { // L: 11749 + if (var3.children != null) { // L: 11750 + runComponentCloseListeners(var3.children, var1); + } - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18 - MouseWheel var4 = var2[var3]; // L: 19 - if (var1 == var4.rsOrdinal()) { - return var4; // L: 21 + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11751 + if (var4 != null) { // L: 11752 + WorldMapLabelSize.runIntfCloseListeners(var4.group, var1); + } + } + + ScriptEvent var5; + if (var1 == 0 && var3.onDialogAbort != null) { // L: 11754 + var5 = new ScriptEvent(); // L: 11755 + var5.widget = var3; // L: 11756 + var5.args = var3.onDialogAbort; // L: 11757 + class144.runScriptEvent(var5); // L: 11758 + } + + if (var1 == 1 && var3.onSubChange != null) { // L: 11760 + if (var3.childIndex >= 0) { // L: 11761 + Widget var6 = class92.getWidget(var3.id); // L: 11762 + if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 11763 + continue; + } + } + + var5 = new ScriptEvent(); // L: 11767 + var5.widget = var3; // L: 11768 + var5.args = var3.onSubChange; // L: 11769 + class144.runScriptEvent(var5); // L: 11770 + } } } - return null; // L: 25 - } - - @ObfuscatedName("fe") - @ObfuscatedSignature( - descriptor = "(B)J", - garbageValue = "-100" - ) - static long method5456() { - return Client.field623; // L: 2963 - } + } // L: 11773 } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index ef762c6c08..c895317b52 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -3,21 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ju") +@ObfuscatedName("jy") @Implements("MusicTrack") public class MusicTrack extends Node { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lpo;" + descriptor = "Lpv;" ) @Export("table") NodeHashTable table; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("midi") byte[] midi; @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpx;)V" ) MusicTrack(Buffer var1) { var1.offset = var1.array.length - 3; // L: 22 @@ -335,8 +335,8 @@ public class MusicTrack extends Node { } // L: 271 - @ObfuscatedName("c") - void method5463() { + @ObfuscatedName("q") + void method5310() { if (this.table == null) { // L: 274 this.table = new NodeHashTable(16); // L: 275 int[] var1 = new int[16]; // L: 276 @@ -416,18 +416,18 @@ public class MusicTrack extends Node { } } // L: 331 - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("clear") void clear() { this.table = null; // L: 334 } // L: 335 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lln;II)Lju;" + descriptor = "(Llp;II)Ljy;" ) @Export("readTrack") - public static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { + static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { byte[] var3 = var0.takeFile(var1, var2); // 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 d647c267d6..83581d6f0c 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -1,232 +1,223 @@ import 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("cd") @Implements("NPC") public final class NPC extends Actor { + @ObfuscatedName("tu") + @ObfuscatedGetter( + intValue = -558114619 + ) + static int field1262; + @ObfuscatedName("s") + static byte[][][] field1259; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lft;" + descriptor = "Lcb;" + ) + @Export("World_request") + static UrlRequest World_request; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lfm;" ) @Export("definition") NPCComposition definition; + @ObfuscatedName("q") + String field1258; NPC() { - } // L: 12 + this.field1258 = ""; // L: 11 + } // L: 13 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ILgm;I)V", - garbageValue = "-1427084845" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "0" ) - final void method2347(int var1, class193 var2) { - int var3 = super.pathX[0]; // L: 15 - int var4 = super.pathY[0]; // L: 16 - if (var1 == 0) { // L: 17 - --var3; // L: 18 - ++var4; // L: 19 - } + void method2338(String var1) { + this.field1258 = var1 == null ? "" : var1; // L: 16 + } // L: 17 - if (var1 == 1) { // L: 21 - ++var4; - } - - if (var1 == 2) { // L: 22 - ++var3; // L: 23 - ++var4; // L: 24 - } - - if (var1 == 3) { // L: 26 - --var3; - } - - if (var1 == 4) { // L: 27 - ++var3; - } - - if (var1 == 5) { // L: 28 - --var3; // L: 29 - --var4; // L: 30 - } - - if (var1 == 6) { // L: 32 - --var4; - } - - if (var1 == 7) { // L: 33 - ++var3; // L: 34 - --var4; // L: 35 - } - - if (super.sequence != -1 && class163.SequenceDefinition_get(super.sequence).field2158 == 1) { // L: 37 - super.sequence = -1; - } - - if (super.pathLength < 9) { // L: 38 - ++super.pathLength; - } - - for (int var5 = super.pathLength; var5 > 0; --var5) { // L: 39 - super.pathX[var5] = super.pathX[var5 - 1]; // L: 40 - super.pathY[var5] = super.pathY[var5 - 1]; // L: 41 - 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 - } // L: 47 - - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)Liq;", - garbageValue = "103" + descriptor = "(I)Lhv;", + garbageValue = "-238822980" ) @Export("getModel") protected final Model getModel() { - if (this.definition == null) { // L: 77 + if (this.definition == null) { // L: 96 return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class163.SequenceDefinition_get(super.sequence) : null; // L: 78 - SequenceDefinition var2 = super.movementSequence != -1 && (super.idleSequence != super.movementSequence || var1 == null) ? class163.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 + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class114.SequenceDefinition_get(super.sequence) : null; // L: 97 + SequenceDefinition var2 = super.movementSequence != -1 && (super.idleSequence != super.movementSequence || var1 == null) ? class114.SequenceDefinition_get(super.movementSequence) : null; // L: 98 + Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 99 + if (var3 == null) { // L: 100 return null; } else { - var3.calculateBoundsCylinder(); // L: 82 - super.defaultHeight = var3.height; // L: 83 - if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 84 - Model var4 = ClientPreferences.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 85 - if (var4 != null) { // L: 86 - var4.offsetBy(0, -super.spotAnimationHeight, 0); // L: 87 - Model[] var5 = new Model[]{var3, var4}; // L: 88 - var3 = new Model(var5, 2); // L: 89 + var3.calculateBoundsCylinder(); // L: 101 + super.defaultHeight = var3.height; // L: 102 + if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 103 + Model var4 = class136.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 104 + if (var4 != null) { // L: 105 + var4.offsetBy(0, -super.spotAnimationHeight, 0); // L: 106 + Model[] var5 = new Model[]{var3, var4}; // L: 107 + var3 = new Model(var5, 2); // L: 108 } } - if (this.definition.size == 1) { // L: 92 + if (this.definition.size == 1) { // L: 111 var3.isSingleTile = true; } - if (super.field1122 != 0 && Client.cycle >= super.field1167 && Client.cycle < super.field1168) { // L: 93 - var3.overrideHue = super.field1169; // L: 94 - var3.overrideSaturation = super.field1114; // L: 95 - var3.overrideLuminance = super.field1171; // L: 96 - var3.overrideAmount = super.field1122; // L: 97 + if (super.field1140 != 0 && Client.cycle >= super.field1196 && Client.cycle < super.field1197) { // L: 112 + var3.overrideHue = super.field1143; // L: 113 + var3.overrideSaturation = super.field1199; // L: 114 + var3.overrideLuminance = super.field1153; // L: 115 + var3.overrideAmount = super.field1140; // L: 116 } else { - var3.overrideAmount = 0; // L: 100 + var3.overrideAmount = 0; // L: 119 } - return var3; // L: 102 + return var3; // L: 121 } } } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "646080626" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "922322997" ) - final void method2348(int var1, int var2, boolean var3) { - if (super.sequence != -1 && class163.SequenceDefinition_get(super.sequence).field2158 == 1) { // L: 50 + final String method2342() { + if (!this.field1258.isEmpty()) { // L: 20 + return this.field1258; // L: 21 + } else { + NPCComposition var1 = this.definition; // L: 23 + if (var1.transforms != null) { // L: 24 + var1 = var1.transform(); // L: 25 + if (var1 == null) { // L: 26 + var1 = this.definition; // L: 27 + } + } + + return var1.name; // L: 30 + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(ILgd;B)V", + garbageValue = "1" + ) + final void method2340(int var1, class193 var2) { + int var3 = super.pathX[0]; // L: 34 + int var4 = super.pathY[0]; // L: 35 + if (var1 == 0) { // L: 36 + --var3; // L: 37 + ++var4; // L: 38 + } + + if (var1 == 1) { // L: 40 + ++var4; + } + + if (var1 == 2) { // L: 41 + ++var3; // L: 42 + ++var4; // L: 43 + } + + if (var1 == 3) { // L: 45 + --var3; + } + + if (var1 == 4) { // L: 46 + ++var3; + } + + if (var1 == 5) { // L: 47 + --var3; // L: 48 + --var4; // L: 49 + } + + if (var1 == 6) { // L: 51 + --var4; + } + + if (var1 == 7) { // L: 52 + ++var3; // L: 53 + --var4; // L: 54 + } + + if (super.sequence != -1 && class114.SequenceDefinition_get(super.sequence).field2206 == 1) { // L: 56 super.sequence = -1; } - if (!var3) { // L: 51 - int var4 = var1 - super.pathX[0]; // L: 52 - int var5 = var2 - super.pathY[0]; // L: 53 - if (var4 >= -8 && var4 <= 8 && var5 >= -8 && var5 <= 8) { // L: 54 - if (super.pathLength < 9) { // L: 55 + if (super.pathLength < 9) { // L: 57 + ++super.pathLength; + } + + for (int var5 = super.pathLength; var5 > 0; --var5) { // L: 58 + super.pathX[var5] = super.pathX[var5 - 1]; // L: 59 + super.pathY[var5] = super.pathY[var5 - 1]; // L: 60 + super.pathTraversed[var5] = super.pathTraversed[var5 - 1]; // L: 61 + } + + super.pathX[0] = var3; // L: 63 + super.pathY[0] = var4; // L: 64 + super.pathTraversed[0] = var2; // L: 65 + } // L: 66 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IIZI)V", + garbageValue = "83074574" + ) + final void method2341(int var1, int var2, boolean var3) { + if (super.sequence != -1 && class114.SequenceDefinition_get(super.sequence).field2206 == 1) { // L: 69 + super.sequence = -1; + } + + if (!var3) { // L: 70 + int var4 = var1 - super.pathX[0]; // L: 71 + int var5 = var2 - super.pathY[0]; // L: 72 + if (var4 >= -8 && var4 <= 8 && var5 >= -8 && var5 <= 8) { // L: 73 + if (super.pathLength < 9) { // L: 74 ++super.pathLength; } - for (int var6 = super.pathLength; var6 > 0; --var6) { // L: 56 - super.pathX[var6] = super.pathX[var6 - 1]; // L: 57 - super.pathY[var6] = super.pathY[var6 - 1]; // L: 58 - super.pathTraversed[var6] = super.pathTraversed[var6 - 1]; // L: 59 + for (int var6 = super.pathLength; var6 > 0; --var6) { // L: 75 + super.pathX[var6] = super.pathX[var6 - 1]; // L: 76 + super.pathY[var6] = super.pathY[var6 - 1]; // L: 77 + super.pathTraversed[var6] = super.pathTraversed[var6 - 1]; // L: 78 } - super.pathX[0] = var1; // L: 61 - super.pathY[0] = var2; // L: 62 - super.pathTraversed[0] = class193.field2185; // L: 63 - return; + super.pathX[0] = var1; // L: 80 + super.pathY[0] = var2; // L: 81 + super.pathTraversed[0] = class193.field2251; // L: 82 + return; // L: 83 } } - super.pathLength = 0; - super.field1170 = 0; - super.field1179 = 0; - super.pathX[0] = var1; - super.pathY[0] = var2; - super.x = super.pathX[0] * 128 + super.field1150 * 64; - super.y = super.pathY[0] * 128 + super.field1150 * 64; - } + super.pathLength = 0; // L: 86 + super.field1200 = 0; // L: 87 + super.field1194 = 0; // L: 88 + super.pathX[0] = var1; // L: 89 + super.pathY[0] = var2; // L: 90 + super.x = super.field1167 * 64 + super.pathX[0] * 128; // L: 91 + super.y = super.field1167 * 64 + super.pathY[0] * 128; // L: 92 + } // L: 93 - @ObfuscatedName("g") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-323504433" + descriptor = "(B)Z", + garbageValue = "-4" ) @Export("isVisible") final boolean isVisible() { - return this.definition != null; // L: 106 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "20" - ) - static void method2360() { - Tiles.Tiles_underlays = null; // L: 64 - class14.Tiles_overlays = null; // L: 65 - class147.Tiles_shapes = null; // L: 66 - Tiles.field983 = null; // L: 67 - class420.field4545 = null; // L: 68 - class392.field4374 = null; // L: 69 - Tiles.field998 = null; // L: 70 - BufferedNetSocket.Tiles_hue = null; // L: 71 - class116.Tiles_saturation = null; // L: 72 - Tiles.Tiles_lightness = null; // L: 73 - class357.Tiles_hueMultiplier = null; // L: 74 - class361.field4213 = null; // L: 75 - } // L: 76 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-1163810213" - ) - static int method2361(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1248 - if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1249 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapID.Widget_unpackTargetMask(class326.getWidgetFlags(var3)); // L: 1250 - return 1; // L: 1251 - } else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1253 - if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1260 - if (var3.dataText == null) { // L: 1261 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1262 - } - - return 1; // L: 1263 - } else { - return 2; // L: 1265 - } - } else { - int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1254 - --var4; // L: 1255 - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1256 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1257 - } else { - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; - } - - return 1; // L: 1258 - } + return this.definition != null; // L: 125 } } diff --git a/runescape-client/src/main/java/NPCComposition.java b/runescape-client/src/main/java/NPCComposition.java index 0622ee22ed..555f4e7064 100644 --- a/runescape-client/src/main/java/NPCComposition.java +++ b/runescape-client/src/main/java/NPCComposition.java @@ -4,183 +4,222 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ft") +@ObfuscatedName("fm") @Implements("NPCComposition") public class NPCComposition extends DualNode { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("NpcDefinition_archive") - static AbstractArchive NpcDefinition_archive; - @ObfuscatedName("c") + public static AbstractArchive NpcDefinition_archive; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lln;" - ) - @Export("NpcDefinition_modelArchive") - static AbstractArchive NpcDefinition_modelArchive; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("NpcDefinition_cached") public static EvictingDualNodeHashTable NpcDefinition_cached; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("NpcDefinition_cachedModels") public static EvictingDualNodeHashTable NpcDefinition_cachedModels; - @ObfuscatedName("b") + @ObfuscatedName("km") + @ObfuscatedSignature( + descriptor = "Lki;" + ) + static Widget field1991; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1249839807 + intValue = -764893815 ) @Export("id") public int id; - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("name") public String name; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 53350769 + intValue = 1453161805 ) @Export("size") public int size; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("models") int[] models; - @ObfuscatedName("q") - int[] field1900; - @ObfuscatedName("o") + @ObfuscatedName("r") + int[] field1957; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1838894863 + intValue = 2027605293 ) @Export("idleSequence") public int idleSequence; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -360120719 + intValue = -331023543 ) @Export("turnLeftSequence") public int turnLeftSequence; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1182294529 + intValue = 504124231 ) @Export("turnRightSequence") public int turnRightSequence; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1120334565 + intValue = 658265029 ) @Export("walkSequence") public int walkSequence; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1091660001 + intValue = 1856656397 ) @Export("walkBackSequence") public int walkBackSequence; - @ObfuscatedName("d") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1992227181 + intValue = 1600160867 ) @Export("walkLeftSequence") public int walkLeftSequence; - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1710177657 + intValue = -1406265677 ) @Export("walkRightSequence") public int walkRightSequence; - @ObfuscatedName("u") - @Export("recolorFrom") - short[] recolorFrom; - @ObfuscatedName("t") - @Export("recolorTo") - short[] recolorTo; - @ObfuscatedName("g") - @Export("retextureFrom") - short[] retextureFrom; @ObfuscatedName("x") - @Export("retextureTo") - short[] retextureTo; - @ObfuscatedName("a") - @Export("actions") - public String[] actions; - @ObfuscatedName("y") - @Export("drawMapDot") - public boolean drawMapDot; + @ObfuscatedGetter( + intValue = -1459326563 + ) + public int field1959; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -977511409 + ) + public int field1960; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 1606438855 + ) + public int field1961; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 450211323 + ) + public int field1946; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1014160671 + ) + public int field1985; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -997110887 + ) + public int field1964; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -867920465 + intValue = 1212486307 + ) + public int field1956; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 1453579091 + ) + public int field1966; + @ObfuscatedName("i") + @Export("recolorFrom") + short[] recolorFrom; + @ObfuscatedName("u") + @Export("recolorTo") + short[] recolorTo; + @ObfuscatedName("ag") + @Export("retextureFrom") + short[] retextureFrom; + @ObfuscatedName("ar") + @Export("retextureTo") + short[] retextureTo; + @ObfuscatedName("am") + @Export("actions") + public String[] actions; + @ObfuscatedName("ac") + @Export("drawMapDot") + public boolean drawMapDot; + @ObfuscatedName("ab") + @ObfuscatedGetter( + intValue = -200769043 ) @Export("combatLevel") public int combatLevel; - @ObfuscatedName("e") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -1011803827 + intValue = 1202800419 ) @Export("widthScale") int widthScale; - @ObfuscatedName("z") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -2073300725 + intValue = -152191005 ) @Export("heightScale") int heightScale; - @ObfuscatedName("h") + @ObfuscatedName("az") @Export("isVisible") public boolean isVisible; - @ObfuscatedName("ae") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 1984476119 + intValue = -191765959 ) @Export("ambient") int ambient; - @ObfuscatedName("aq") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 1324751059 + intValue = -1793396325 ) @Export("contrast") int contrast; - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -247585293 + intValue = 1238786573 ) @Export("headIconPrayer") public int headIconPrayer; - @ObfuscatedName("am") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1502698673 + intValue = 1934684837 ) @Export("rotation") public int rotation; - @ObfuscatedName("ak") + @ObfuscatedName("af") @Export("transforms") public int[] transforms; - @ObfuscatedName("ao") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -1082735029 + intValue = 569831853 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("aj") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 322255095 + intValue = -837879399 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("al") + @ObfuscatedName("ad") @Export("isInteractable") public boolean isInteractable; - @ObfuscatedName("av") + @ObfuscatedName("an") @Export("isClickable") public boolean isClickable; - @ObfuscatedName("at") + @ObfuscatedName("aw") @Export("isFollower") public boolean isFollower; - @ObfuscatedName("an") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "Lpt;" ) @@ -202,421 +241,393 @@ public class NPCComposition extends DualNode { this.walkBackSequence = -1; // L: 29 this.walkLeftSequence = -1; // L: 30 this.walkRightSequence = -1; // L: 31 - this.actions = new String[5]; // L: 36 - this.drawMapDot = true; // L: 37 - this.combatLevel = -1; // L: 38 - this.widthScale = 128; // L: 39 - this.heightScale = 128; // L: 40 - this.isVisible = false; // L: 41 - this.ambient = 0; // L: 42 - this.contrast = 0; // L: 43 - this.headIconPrayer = -1; // L: 44 - this.rotation = 32; // L: 45 - this.transformVarbit = -1; // L: 47 - this.transformVarp = -1; // L: 48 - this.isInteractable = true; // L: 49 - this.isClickable = true; - this.isFollower = false; - } + this.field1959 = -1; // L: 32 + this.field1960 = -1; // L: 33 + this.field1961 = -1; // L: 34 + this.field1946 = -1; // L: 35 + this.field1985 = -1; // L: 36 + this.field1964 = -1; // L: 37 + this.field1956 = -1; // L: 38 + this.field1966 = -1; // L: 39 + this.actions = new String[5]; // L: 44 + this.drawMapDot = true; // L: 45 + this.combatLevel = -1; // L: 46 + this.widthScale = 128; // L: 47 + this.heightScale = 128; // L: 48 + this.isVisible = false; // L: 49 + this.ambient = 0; // L: 50 + this.contrast = 0; // L: 51 + this.headIconPrayer = -1; // L: 52 + this.rotation = 32; // L: 53 + this.transformVarbit = -1; // L: 55 + this.transformVarp = -1; // L: 56 + this.isInteractable = true; // L: 57 + this.isClickable = true; // L: 58 + this.isFollower = false; // L: 59 + } // L: 62 - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-46" + garbageValue = "-111" ) @Export("postDecode") void postDecode() { - } // L: 73 + } // L: 76 - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-28" + descriptor = "(Lpx;B)V", + garbageValue = "-60" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 77 - if (var2 == 0) { // L: 78 - return; // L: 81 + int var2 = var1.readUnsignedByte(); // L: 80 + if (var2 == 0) { // L: 81 + return; // L: 84 } - this.decodeNext(var1, var2); // L: 79 + this.decodeNext(var1, var2); // L: 82 } } - @ObfuscatedName("b") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-109994635" + descriptor = "(Lpx;II)V", + garbageValue = "425630105" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { int var3; int var4; - if (var2 == 1) { // L: 84 - var3 = var1.readUnsignedByte(); // L: 85 - this.models = new int[var3]; // L: 86 + if (var2 == 1) { // L: 87 + var3 = var1.readUnsignedByte(); // L: 88 + this.models = new int[var3]; // L: 89 - for (var4 = 0; var4 < var3; ++var4) { // L: 87 + for (var4 = 0; var4 < var3; ++var4) { // L: 90 this.models[var4] = var1.readUnsignedShort(); } - } else if (var2 == 2) { // L: 89 + } else if (var2 == 2) { // L: 92 this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 12) { // L: 90 + } else if (var2 == 12) { // L: 93 this.size = var1.readUnsignedByte(); - } else if (var2 == 13) { // L: 91 + } else if (var2 == 13) { // L: 94 this.idleSequence = var1.readUnsignedShort(); - } else if (var2 == 14) { // L: 92 + } else if (var2 == 14) { // L: 95 this.walkSequence = var1.readUnsignedShort(); - } else if (var2 == 15) { // L: 93 + } else if (var2 == 15) { // L: 96 this.turnLeftSequence = var1.readUnsignedShort(); - } else if (var2 == 16) { // L: 94 + } else if (var2 == 16) { // L: 97 this.turnRightSequence = var1.readUnsignedShort(); - } else if (var2 == 17) { // L: 95 - this.walkSequence = var1.readUnsignedShort(); // L: 96 - this.walkBackSequence = var1.readUnsignedShort(); // L: 97 - this.walkLeftSequence = var1.readUnsignedShort(); // L: 98 - this.walkRightSequence = var1.readUnsignedShort(); // L: 99 - } else if (var2 == 18) { // L: 101 - var1.readUnsignedShort(); // L: 102 - } else if (var2 >= 30 && var2 < 35) { // L: 104 - this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 105 - if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 106 + } else if (var2 == 17) { // L: 98 + this.walkSequence = var1.readUnsignedShort(); // L: 99 + this.walkBackSequence = var1.readUnsignedShort(); // L: 100 + this.walkLeftSequence = var1.readUnsignedShort(); // L: 101 + this.walkRightSequence = var1.readUnsignedShort(); // L: 102 + } else if (var2 == 18) { // L: 104 + var1.readUnsignedShort(); // L: 105 + } else if (var2 >= 30 && var2 < 35) { // L: 107 + this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 108 + if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 109 this.actions[var2 - 30] = null; } - } else if (var2 == 40) { // L: 108 - var3 = var1.readUnsignedByte(); // L: 109 - this.recolorFrom = new short[var3]; // L: 110 - this.recolorTo = new short[var3]; // L: 111 + } else if (var2 == 40) { // L: 111 + var3 = var1.readUnsignedByte(); // L: 112 + this.recolorFrom = new short[var3]; // L: 113 + this.recolorTo = new short[var3]; // L: 114 - for (var4 = 0; var4 < var3; ++var4) { // L: 112 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 113 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 114 + for (var4 = 0; var4 < var3; ++var4) { // L: 115 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 116 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 117 } - } else if (var2 == 41) { // L: 117 - var3 = var1.readUnsignedByte(); // L: 118 - this.retextureFrom = new short[var3]; // L: 119 - this.retextureTo = new short[var3]; // L: 120 + } else if (var2 == 41) { // L: 120 + var3 = var1.readUnsignedByte(); // L: 121 + this.retextureFrom = new short[var3]; // L: 122 + this.retextureTo = new short[var3]; // L: 123 - for (var4 = 0; var4 < var3; ++var4) { // L: 121 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 122 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 123 + for (var4 = 0; var4 < var3; ++var4) { // L: 124 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 125 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 126 } - } else if (var2 == 60) { // L: 126 - var3 = var1.readUnsignedByte(); // L: 127 - this.field1900 = new int[var3]; // L: 128 + } else if (var2 == 60) { // L: 129 + var3 = var1.readUnsignedByte(); // L: 130 + this.field1957 = new int[var3]; // L: 131 - for (var4 = 0; var4 < var3; ++var4) { // L: 129 - this.field1900[var4] = var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { // L: 132 + this.field1957[var4] = var1.readUnsignedShort(); } - } else if (var2 == 93) { // L: 131 + } else if (var2 == 93) { // L: 134 this.drawMapDot = false; - } else if (var2 == 95) { // L: 132 + } else if (var2 == 95) { // L: 135 this.combatLevel = var1.readUnsignedShort(); - } else if (var2 == 97) { // L: 133 + } else if (var2 == 97) { // L: 136 this.widthScale = var1.readUnsignedShort(); - } else if (var2 == 98) { // L: 134 + } else if (var2 == 98) { // L: 137 this.heightScale = var1.readUnsignedShort(); - } else if (var2 == 99) { // L: 135 + } else if (var2 == 99) { // L: 138 this.isVisible = true; - } else if (var2 == 100) { // L: 136 + } else if (var2 == 100) { // L: 139 this.ambient = var1.readByte(); - } else if (var2 == 101) { // L: 137 + } else if (var2 == 101) { // L: 140 this.contrast = var1.readByte() * 5; - } else if (var2 == 102) { // L: 138 + } else if (var2 == 102) { // L: 141 this.headIconPrayer = var1.readUnsignedShort(); - } else if (var2 == 103) { // L: 139 + } else if (var2 == 103) { // L: 142 this.rotation = var1.readUnsignedShort(); - } else if (var2 != 106 && var2 != 118) { // L: 140 - if (var2 == 107) { // L: 158 + } else if (var2 != 106 && var2 != 118) { // L: 143 + if (var2 == 107) { // L: 161 this.isInteractable = false; - } else if (var2 == 109) { // L: 159 + } else if (var2 == 109) { // L: 162 this.isClickable = false; - } else if (var2 == 111) { // L: 160 + } else if (var2 == 111) { // L: 163 this.isFollower = true; - } else if (var2 == 249) { // L: 161 - this.params = class214.readStringIntParameters(var1, this.params); + } else if (var2 == 114) { // L: 164 + this.field1959 = var1.readUnsignedShort(); + } else if (var2 == 115) { // L: 165 + this.field1959 = var1.readUnsignedShort(); // L: 166 + this.field1960 = var1.readUnsignedShort(); // L: 167 + this.field1961 = var1.readUnsignedShort(); // L: 168 + this.field1946 = var1.readUnsignedShort(); // L: 169 + } else if (var2 == 116) { + this.field1985 = var1.readUnsignedShort(); // L: 171 + } else if (var2 == 117) { // L: 172 + this.field1985 = var1.readUnsignedShort(); // L: 173 + this.field1964 = var1.readUnsignedShort(); // L: 174 + this.field1956 = var1.readUnsignedShort(); // L: 175 + this.field1966 = var1.readUnsignedShort(); // L: 176 + } else if (var2 == 249) { // L: 178 + this.params = JagexCache.readStringIntParameters(var1, this.params); } } else { - this.transformVarbit = var1.readUnsignedShort(); // L: 141 - if (this.transformVarbit == 65535) { // L: 142 + this.transformVarbit = var1.readUnsignedShort(); // L: 144 + if (this.transformVarbit == 65535) { // L: 145 this.transformVarbit = -1; } - this.transformVarp = var1.readUnsignedShort(); // L: 143 - if (this.transformVarp == 65535) { // L: 144 + this.transformVarp = var1.readUnsignedShort(); // L: 146 + if (this.transformVarp == 65535) { // L: 147 this.transformVarp = -1; } - var3 = -1; // L: 145 - if (var2 == 118) { // L: 146 - var3 = var1.readUnsignedShort(); // L: 147 - if (var3 == 65535) { // L: 148 + var3 = -1; // L: 148 + if (var2 == 118) { // L: 149 + var3 = var1.readUnsignedShort(); // L: 150 + if (var3 == 65535) { // L: 151 var3 = -1; } } - var4 = var1.readUnsignedByte(); // L: 150 - this.transforms = new int[var4 + 2]; // L: 151 + var4 = var1.readUnsignedByte(); // L: 153 + this.transforms = new int[var4 + 2]; // L: 154 - for (int var5 = 0; var5 <= var4; ++var5) { // L: 152 - this.transforms[var5] = var1.readUnsignedShort(); // L: 153 - if (this.transforms[var5] == 65535) { // L: 154 + for (int var5 = 0; var5 <= var4; ++var5) { // L: 155 + this.transforms[var5] = var1.readUnsignedShort(); // L: 156 + if (this.transforms[var5] == 65535) { // L: 157 this.transforms[var5] = -1; } } - this.transforms[var4 + 1] = var3; // L: 156 + this.transforms[var4 + 1] = var3; // L: 159 } - } // L: 163 + } // L: 180 - @ObfuscatedName("n") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lgw;ILgw;II)Liq;", - garbageValue = "1025368138" + descriptor = "(Lgq;ILgq;IB)Lhv;", + garbageValue = "90" ) @Export("getModel") public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { - if (this.transforms != null) { // L: 166 - NPCComposition var12 = this.transform(); // L: 167 - return var12 == null ? null : var12.getModel(var1, var2, var3, var4); // L: 168 169 + if (this.transforms != null) { // L: 183 + NPCComposition var12 = this.transform(); // L: 184 + return var12 == null ? null : var12.getModel(var1, var2, var3, var4); // L: 185 186 } else { - Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id); // L: 171 - if (var5 == null) { // L: 172 - boolean var6 = false; // L: 173 + Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id); // L: 188 + if (var5 == null) { // L: 189 + boolean var6 = false; // L: 190 - for (int var7 = 0; var7 < this.models.length; ++var7) { // L: 174 - if (!NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) { + for (int var7 = 0; var7 < this.models.length; ++var7) { // L: 191 + if (!class17.NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) { var6 = true; } } - if (var6) { // L: 175 + if (var6) { // L: 192 return null; } - ModelData[] var8 = new ModelData[this.models.length]; // L: 177 + ModelData[] var8 = new ModelData[this.models.length]; // L: 194 int var9; - for (var9 = 0; var9 < this.models.length; ++var9) { // L: 178 - var8[var9] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.models[var9], 0); + for (var9 = 0; var9 < this.models.length; ++var9) { // L: 195 + var8[var9] = ModelData.ModelData_get(class17.NpcDefinition_modelArchive, this.models[var9], 0); } ModelData var10; - if (var8.length == 1) { // L: 179 + if (var8.length == 1) { // L: 196 var10 = var8[0]; } else { - var10 = new ModelData(var8, var8.length); // L: 180 + var10 = new ModelData(var8, var8.length); // L: 197 } - if (this.recolorFrom != null) { // L: 181 - for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 182 - var10.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 183 + if (this.recolorFrom != null) { // L: 198 + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 199 + var10.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 200 } } - if (this.retextureFrom != null) { // L: 186 - for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 187 - var10.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 188 + if (this.retextureFrom != null) { // L: 203 + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 204 + var10.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 205 } } - var5 = var10.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 191 - NpcDefinition_cachedModels.put(var5, (long)this.id); // L: 192 + var5 = var10.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 208 + NpcDefinition_cachedModels.put(var5, (long)this.id); // L: 209 } Model var11; - if (var1 != null && var3 != null) { // L: 195 + if (var1 != null && var3 != null) { // L: 212 var11 = var1.applyTransformations(var5, var2, var3, var4); - } else if (var1 != null) { // L: 196 + } else if (var1 != null) { // L: 213 var11 = var1.transformActorModel(var5, var2); - } else if (var3 != null) { // L: 197 + } else if (var3 != null) { // L: 214 var11 = var3.transformActorModel(var5, var4); } else { - var11 = var5.toSharedSequenceModel(true); // L: 198 + var11 = var5.toSharedSequenceModel(true); // L: 215 } - if (this.widthScale != 128 || this.heightScale != 128) { // L: 199 + if (this.widthScale != 128 || this.heightScale != 128) { // L: 216 var11.scale(this.widthScale, this.heightScale, this.widthScale); } - return var11; // L: 200 + return var11; // L: 217 } } - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)Lhc;", - garbageValue = "-2018540961" + descriptor = "(I)Lgs;", + garbageValue = "1498884102" ) @Export("getModelData") public final ModelData getModelData() { - if (this.transforms != null) { // L: 204 - NPCComposition var7 = this.transform(); // L: 205 - return var7 == null ? null : var7.getModelData(); // L: 206 207 - } else if (this.field1900 == null) { // L: 209 + if (this.transforms != null) { // L: 221 + NPCComposition var7 = this.transform(); // L: 222 + return var7 == null ? null : var7.getModelData(); // L: 223 224 + } else if (this.field1957 == null) { // L: 226 return null; } else { - boolean var1 = false; // L: 210 + boolean var1 = false; // L: 227 - for (int var2 = 0; var2 < this.field1900.length; ++var2) { // L: 211 - if (!NpcDefinition_modelArchive.tryLoadFile(this.field1900[var2], 0)) { + for (int var2 = 0; var2 < this.field1957.length; ++var2) { // L: 228 + if (!class17.NpcDefinition_modelArchive.tryLoadFile(this.field1957[var2], 0)) { var1 = true; } } - if (var1) { // L: 212 + if (var1) { // L: 229 return null; } else { - ModelData[] var5 = new ModelData[this.field1900.length]; // L: 213 + ModelData[] var5 = new ModelData[this.field1957.length]; // L: 230 - for (int var3 = 0; var3 < this.field1900.length; ++var3) { // L: 214 - var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1900[var3], 0); + for (int var3 = 0; var3 < this.field1957.length; ++var3) { // L: 231 + var5[var3] = ModelData.ModelData_get(class17.NpcDefinition_modelArchive, this.field1957[var3], 0); } ModelData var6; if (var5.length == 1) { - var6 = var5[0]; // L: 216 + var6 = var5[0]; // L: 233 } else { - var6 = new ModelData(var5, var5.length); // L: 217 + var6 = new ModelData(var5, var5.length); // L: 234 } int var4; - if (this.recolorFrom != null) { // L: 218 - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 219 - var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 220 + if (this.recolorFrom != null) { // L: 235 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 236 + var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 237 } } - if (this.retextureFrom != null) { // L: 223 - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 224 - var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 225 + if (this.retextureFrom != null) { // L: 240 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 241 + var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 242 } } - return var6; // L: 228 + return var6; // L: 245 } } } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)Lft;", - garbageValue = "-1663507633" + descriptor = "(I)Lfm;", + garbageValue = "2129984667" ) @Export("transform") public final NPCComposition transform() { - int var1 = -1; // L: 232 - if (this.transformVarbit != -1) { // L: 233 - var1 = SecureRandomCallable.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { // L: 234 + int var1 = -1; // L: 249 + if (this.transformVarbit != -1) { // L: 250 + var1 = class18.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 251 var1 = Varps.Varps_main[this.transformVarp]; } int var2; - if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 236 - var2 = this.transforms[var1]; // L: 237 + if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 253 + var2 = this.transforms[var1]; // L: 254 } else { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? KeyHandler.getNpcDefinition(var2) : null; // L: 238 239 + return var2 != -1 ? WorldMapSectionType.getNpcDefinition(var2) : null; // L: 255 256 } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "155918530" + descriptor = "(S)Z", + garbageValue = "13546" ) @Export("transformIsVisible") public boolean transformIsVisible() { - if (this.transforms == null) { // L: 243 + if (this.transforms == null) { // L: 260 return true; } else { - int var1 = -1; // L: 244 - if (this.transformVarbit != -1) { // L: 245 - var1 = SecureRandomCallable.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { // L: 246 + int var1 = -1; // L: 261 + if (this.transformVarbit != -1) { // L: 262 + var1 = class18.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 263 var1 = Varps.Varps_main[this.transformVarp]; } - if (var1 >= 0 && var1 < this.transforms.length) { // L: 247 - return this.transforms[var1] != -1; // L: 248 + if (var1 >= 0 && var1 < this.transforms.length) { // L: 264 + return this.transforms[var1] != -1; // L: 265 } else { return this.transforms[this.transforms.length - 1] != -1; } } } - @ObfuscatedName("o") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(IIS)I", - garbageValue = "17259" + garbageValue = "301" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; // L: 253 - int var3; - if (var4 == null) { // L: 255 - var3 = var2; // L: 256 - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 259 - if (var5 == null) { // L: 260 - var3 = var2; // L: 261 - } else { - var3 = var5.integer; // L: 264 - } - } - - return var3; // L: 266 + return class154.method3061(this.params, var1, var2); // L: 269 } - @ObfuscatedName("r") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "943206349" + garbageValue = "-820829648" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; // L: 271 - String var3; - if (var4 == null) { // L: 273 - var3 = var2; // L: 274 - } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 277 - if (var5 == null) { // L: 278 - var3 = var2; // L: 279 - } else { - var3 = (String)var5.obj; // L: 282 - } - } - - return var3; // L: 284 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(ILln;IIIZB)V", - garbageValue = "-11" - ) - public static void method3530(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { - class273.musicPlayerStatus = 1; // L: 50 - class273.musicTrackArchive = var1; // L: 51 - AccessFile.musicTrackGroupId = var2; // L: 52 - class273.musicTrackFileId = var3; // L: 53 - class273.musicTrackVolume = var4; // L: 54 - class17.musicTrackBoolean = var5; // L: 55 - class273.pcmSampleLength = var0; // L: 56 - } // L: 57 - - @ObfuscatedName("hj") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-43" - ) - static boolean method3531() { - return (Client.drawPlayerNames & 4) != 0; // L: 4849 + return AttackOption.method2393(this.params, var1, var2); // L: 273 } } diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index a1daad9ba7..8e78506894 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -4,48 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ey") +@ObfuscatedName("eu") @Implements("NanoClock") public class NanoClock extends Clock { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = -4737457990311632419L + longValue = 5309226644315502439L ) @Export("lastTimeNano") long lastTimeNano; - public NanoClock() { + NanoClock() { this.lastTimeNano = System.nanoTime(); // L: 10 } // L: 11 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1350330504" + garbageValue = "-1993169750" ) @Export("mark") public void mark() { this.lastTimeNano = System.nanoTime(); // L: 14 } // L: 15 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "2026134141" + garbageValue = "1389334721" ) @Export("wait") public int wait(int var1, int var2) { - long var3 = 1000000L * (long)var2; // L: 18 + long var3 = (long)var2 * 1000000L; // L: 18 long var5 = this.lastTimeNano - System.nanoTime(); // L: 19 if (var5 < var3) { // L: 20 var5 = var3; } - class93.method2384(var5 / 1000000L); // L: 21 + class241.method4815(var5 / 1000000L); // L: 21 long var7 = System.nanoTime(); // L: 22 int var9; - for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { // L: 23 24 26 + for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += (long)var1 * 1000000L) { // L: 23 24 26 ++var9; // L: 25 } diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index 102d84566e..6b00032a23 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -4,113 +4,112 @@ 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("lz") +@ObfuscatedName("lc") @Implements("NetCache") public class NetCache { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "Lnf;" ) @Export("NetCache_socket") public static AbstractSocket NetCache_socket; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 875893217 + intValue = 570239275 ) @Export("NetCache_loadTime") public static int NetCache_loadTime; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = -7945689886712382461L + longValue = -3511910326709006749L ) - public static long field3982; - @ObfuscatedName("f") + public static long field4041; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lpo;" + descriptor = "Lpv;" ) @Export("NetCache_pendingPriorityWrites") public static NodeHashTable NetCache_pendingPriorityWrites; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1056584685 + intValue = 974242219 ) @Export("NetCache_pendingPriorityWritesCount") public static int NetCache_pendingPriorityWritesCount; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lpo;" + descriptor = "Lpv;" ) @Export("NetCache_pendingPriorityResponses") public static NodeHashTable NetCache_pendingPriorityResponses; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -275565499 + intValue = 2115840371 ) @Export("NetCache_pendingPriorityResponsesCount") public static int NetCache_pendingPriorityResponsesCount; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lla;" + descriptor = "Llr;" ) @Export("NetCache_pendingWritesQueue") public static DualNodeDeque NetCache_pendingWritesQueue; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lpo;" + descriptor = "Lpv;" ) @Export("NetCache_pendingWrites") - public static NodeHashTable NetCache_pendingWrites; - @ObfuscatedName("o") + static NodeHashTable NetCache_pendingWrites; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -644606303 + intValue = 122834193 ) @Export("NetCache_pendingWritesCount") public static int NetCache_pendingWritesCount; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lpo;" + descriptor = "Lpv;" ) @Export("NetCache_pendingResponses") public static NodeHashTable NetCache_pendingResponses; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -183804397 + intValue = 903629059 ) @Export("NetCache_pendingResponsesCount") public static int NetCache_pendingResponsesCount; - @ObfuscatedName("d") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lpi;" + descriptor = "Lpx;" ) @Export("NetCache_responseHeaderBuffer") public static Buffer NetCache_responseHeaderBuffer; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -47257767 + intValue = -557211503 ) - public static int field3995; - @ObfuscatedName("g") + public static int field4052; + @ObfuscatedName("e") @Export("NetCache_crc") public static CRC32 NetCache_crc; - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "[Llx;" + descriptor = "[Lle;" ) @Export("NetCache_archives") public static Archive[] NetCache_archives; - @ObfuscatedName("y") - public static byte field3998; + @ObfuscatedName("d") + public static byte field4043; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1326084145 + intValue = 738633419 ) @Export("NetCache_crcMismatches") public static int NetCache_crcMismatches; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1735632963 + intValue = 1292218169 ) @Export("NetCache_ioExceptions") public static int NetCache_ioExceptions; @@ -127,139 +126,11 @@ public class NetCache { NetCache_pendingResponses = new NodeHashTable(4096); // L: 22 NetCache_pendingResponsesCount = 0; // L: 23 NetCache_responseHeaderBuffer = new Buffer(8); // L: 26 - field3995 = 0; // L: 28 + field4052 = 0; // L: 28 NetCache_crc = new CRC32(); // L: 30 NetCache_archives = new Archive[256]; // L: 32 - field3998 = 0; // L: 33 + field4043 = 0; // L: 33 NetCache_crcMismatches = 0; // L: 34 NetCache_ioExceptions = 0; // L: 35 } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-1081311758" - ) - static int method5965(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.OC_NAME) { // L: 3428 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3429 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = class19.ItemDefinition_get(var3).name; // L: 3430 - return 1; // L: 3431 - } else { - int var4; - ItemComposition var5; - if (var0 == ScriptOpcodes.OC_OP) { // L: 3433 - Interpreter.Interpreter_intStackSize -= 2; // L: 3434 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3435 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3436 - var5 = class19.ItemDefinition_get(var3); // L: 3437 - if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; // L: 3438 - } else { - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3439 - } - - return 1; // L: 3440 - } else if (var0 == ScriptOpcodes.OC_IOP) { // L: 3442 - Interpreter.Interpreter_intStackSize -= 2; // L: 3443 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3444 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3445 - var5 = class19.ItemDefinition_get(var3); // L: 3446 - if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 3447 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3448 - } - - return 1; // L: 3449 - } else if (var0 == ScriptOpcodes.OC_COST) { // L: 3451 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3452 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class19.ItemDefinition_get(var3).price; // L: 3453 - return 1; // L: 3454 - } else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 3456 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3457 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class19.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; // L: 3458 - return 1; // L: 3459 - } else { - ItemComposition var7; - if (var0 == ScriptOpcodes.OC_CERT) { // L: 3461 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3462 - var7 = class19.ItemDefinition_get(var3); // L: 3463 - if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 3464 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.note; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 3465 - } - - return 1; // L: 3466 - } else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 3468 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3469 - var7 = class19.ItemDefinition_get(var3); // L: 3470 - if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 3471 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.note; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 3472 - } - - return 1; // L: 3473 - } else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 3475 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3476 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class19.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; // L: 3477 - return 1; // L: 3478 - } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 3480 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3481 - var7 = class19.ItemDefinition_get(var3); // L: 3482 - if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 3483 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.placeholder; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 3484 - } - - return 1; // L: 3485 - } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 3487 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3488 - var7 = class19.ItemDefinition_get(var3); // L: 3489 - if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 3490 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.placeholder; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 3491 - } - - return 1; // L: 3492 - } else if (var0 == ScriptOpcodes.OC_FIND) { // L: 3494 - String var6 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3495 - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3496 - class12.findItemDefinitions(var6, var4 == 1); // L: 3497 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Script.foundItemIdCount; // L: 3498 - return 1; // L: 3499 - } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 3501 - if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 3506 - GameEngine.foundItemIndex = 0; // L: 3507 - return 1; // L: 3508 - } else if (var0 == 4213) { // L: 3510 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3511 - var4 = class19.ItemDefinition_get(var3).getShiftClickIndex(); // L: 3512 - if (var4 == -1) { // L: 3513 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; // L: 3514 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 + 1; // L: 3517 - } - - return 1; // L: 3519 - } else { - return 2; // L: 3521 - } - } else { - if (PendingSpawn.foundItemIds != null && GameEngine.foundItemIndex < Script.foundItemIdCount) { // L: 3502 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PendingSpawn.foundItemIds[++GameEngine.foundItemIndex - 1] & '\uffff'; // L: 3503 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } - - return 1; // L: 3504 - } - } - } - } } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 9a66981a55..80660354bd 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -4,33 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ly") +@ObfuscatedName("li") @Implements("NetFileRequest") public class NetFileRequest extends DualNode { - @ObfuscatedName("sd") - @ObfuscatedGetter( - intValue = -1408840155 - ) - static int field3960; - @ObfuscatedName("l") - @Export("SpriteBuffer_spritePalette") - public static int[] SpriteBuffer_spritePalette; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Llx;" + descriptor = "Lle;" ) @Export("archive") public Archive archive; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 2115176963 + intValue = 211628067 ) @Export("crc") public int crc; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("padding") public byte padding; NetFileRequest() { } // L: 10 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;B)Z", + garbageValue = "112" + ) + @Export("isNumber") + public static boolean isNumber(CharSequence var0) { + return class162.method3207(var0, 10, true); // L: 35 + } } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index 0801986cdb..1b3f16309c 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -9,103 +9,112 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fd") +@ObfuscatedName("fh") @Implements("NetSocket") public final class NetSocket extends AbstractSocket implements Runnable { - @ObfuscatedName("j") - @Export("userHomeDirectory") - static String userHomeDirectory; - @ObfuscatedName("v") - @Export("inputStream") - InputStream inputStream; - @ObfuscatedName("c") - @Export("outputStream") - OutputStream outputStream; - @ObfuscatedName("i") + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "[[Lki;" + ) + @Export("Widget_interfaceComponents") + public static Widget[][] Widget_interfaceComponents; + @ObfuscatedName("en") + @ObfuscatedSignature( + descriptor = "Lle;" + ) + @Export("archive0") + static Archive archive0; + @ObfuscatedName("o") @Export("socket") Socket socket; - @ObfuscatedName("f") + @ObfuscatedName("q") + @Export("inputStream") + InputStream inputStream; + @ObfuscatedName("l") + @Export("outputStream") + OutputStream outputStream; + @ObfuscatedName("k") @Export("isClosed") boolean isClosed; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lff;" + descriptor = "Lfs;" ) @Export("taskHandler") TaskHandler taskHandler; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lfx;" + descriptor = "Lfl;" ) @Export("task") Task task; - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("outBuffer") byte[] outBuffer; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1178030211 + intValue = -440186297 ) @Export("outLength") int outLength; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -831152753 + intValue = -375712399 ) @Export("outOffset") int outOffset; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("exceptionWriting") boolean exceptionWriting; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 512219451 + intValue = -759611045 ) @Export("bufferLength") final int bufferLength; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1168737827 + intValue = 2033351313 ) @Export("maxPacketLength") final int maxPacketLength; @ObfuscatedSignature( - descriptor = "(Ljava/net/Socket;Lff;I)V" + descriptor = "(Ljava/net/Socket;Lfs;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.taskHandler = var2; // L: 28 + this.socket = var1; // L: 29 this.bufferLength = var3; // L: 30 - this.maxPacketLength = var3 - 100; - this.socket.setSoTimeout(30000); - this.socket.setTcpNoDelay(true); - this.socket.setReceiveBufferSize(65536); + 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); // L: 35 this.inputStream = this.socket.getInputStream(); // L: 36 this.outputStream = this.socket.getOutputStream(); // L: 37 - } + } // L: 38 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-13138" + descriptor = "(I)V", + garbageValue = "731891927" ) @Export("close") public void close() { - if (!this.isClosed) { + if (!this.isClosed) { // L: 41 synchronized(this) { // L: 42 this.isClosed = true; // L: 43 - this.notifyAll(); + this.notifyAll(); // L: 44 } // L: 45 if (this.task != null) { // L: 46 while (this.task.status == 0) { // L: 47 - class93.method2384(1L); // L: 48 + class241.method4815(1L); // L: 48 } if (this.task.status == 1) { // L: 50 @@ -120,30 +129,30 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } // L: 58 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-891040314" + descriptor = "(B)I", + garbageValue = "18" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.isClosed ? 0 : this.inputStream.read(); // L: 65 66 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "46" + descriptor = "(I)I", + garbageValue = "-1429957580" ) @Export("available") public int available() throws IOException { return this.isClosed ? 0 : this.inputStream.available(); // L: 70 71 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "27" + descriptor = "(II)Z", + garbageValue = "-15219997" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { @@ -154,10 +163,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "-118" + descriptor = "([BIII)I", + garbageValue = "-642682113" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { @@ -168,7 +177,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { int var5; for (var4 = var3; var3 > 0; var3 -= var5) { // L: 81 82 86 var5 = this.inputStream.read(var1, var2, var3); // L: 83 - if (var5 <= 0) { // L: 84 + if (var5 <= 0) { throw new EOFException(); } @@ -179,10 +188,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-1255813086" + garbageValue = "367101522" ) @Export("write0") void write0(byte[] var1, int var2, int var3) throws IOException { @@ -214,15 +223,15 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } // L: 111 - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-1359342670" + garbageValue = "257086671" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { - this.write0(var1, var2, var3); // L: 160 - } // L: 161 + this.write0(var1, var2, var3); // L: 161 + } // L: 162 public void run() { try { @@ -291,7 +300,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { break; } } catch (Exception var12) { // L: 154 - Widget.RunException_sendStackTrace((String)null, var12); // L: 155 + ArchiveDiskActionHandler.RunException_sendStackTrace((String)null, var12); // L: 155 } } // L: 157 @@ -300,38 +309,59 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.close(); // L: 61 } // L: 62 - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "1794283621" - ) - static final boolean method3309(char var0) { - if (Character.isISOControl(var0)) { // L: 28 - return false; - } else if (class131.isAlphaNumeric(var0)) { // L: 29 - return true; - } else { - char[] var1 = class422.field4560; // 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 = class422.field4563; // 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 - } + @ObfuscatedName("y") + @Export("Entity_unpackID") + public static int Entity_unpackID(long var0) { + return (int)(var0 >>> 17 & 4294967295L); // L: 84 } + + @ObfuscatedName("kc") + @ObfuscatedSignature( + descriptor = "(Lck;ZB)V", + garbageValue = "102" + ) + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { + int var2 = var0.group; // L: 12229 + int var3 = (int)var0.key; // L: 12230 + var0.remove(); // L: 12231 + if (var1 && var2 != -1 && class120.Widget_loadedInterfaces[var2]) { // L: 12232 12233 12234 + class134.Widget_archive.clearFilesGroup(var2); // L: 12235 + if (Widget_interfaceComponents[var2] != null) { // L: 12236 + boolean var4 = true; // L: 12237 + + for (int var5 = 0; var5 < Widget_interfaceComponents[var2].length; ++var5) { // L: 12238 + if (Widget_interfaceComponents[var2][var5] != null) { // L: 12239 + if (Widget_interfaceComponents[var2][var5].type != 2) { // L: 12240 + Widget_interfaceComponents[var2][var5] = null; + } else { + var4 = false; // L: 12241 + } + } + } + + if (var4) { // L: 12244 + Widget_interfaceComponents[var2] = null; + } + + class120.Widget_loadedInterfaces[var2] = false; // L: 12245 + } + } + + for (IntegerNode var6 = (IntegerNode)Client.widgetFlags.first(); var6 != null; var6 = (IntegerNode)Client.widgetFlags.next()) { // L: 12248 + if ((var6.key >> 48 & 65535L) == (long)var2) { // L: 12249 + var6.remove(); // L: 12250 + } + } + + Widget var7 = class92.getWidget(var3); // L: 12254 + if (var7 != null) { // L: 12255 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var7); + } + + if (Client.rootInterface != -1) { // L: 12256 + WorldMapLabelSize.runIntfCloseListeners(Client.rootInterface, 1); + } + + } // L: 12257 } diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java index 696c29625e..d129d0aff8 100644 --- a/runescape-client/src/main/java/Node.java +++ b/runescape-client/src/main/java/Node.java @@ -3,26 +3,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oq") +@ObfuscatedName("os") @Implements("Node") public class Node { - @ObfuscatedName("gv") + @ObfuscatedName("gh") @Export("key") public long key; - @ObfuscatedName("gt") + @ObfuscatedName("gw") @ObfuscatedSignature( - descriptor = "Loq;" + descriptor = "Los;" ) @Export("previous") public Node previous; - @ObfuscatedName("gm") + @ObfuscatedName("gd") @ObfuscatedSignature( - descriptor = "Loq;" + descriptor = "Los;" ) @Export("next") public Node next; - @ObfuscatedName("fg") + @ObfuscatedName("fv") @Export("remove") public void remove() { if (this.next != null) { // L: 9 @@ -33,7 +33,7 @@ public class Node { } } // L: 14 - @ObfuscatedName("fh") + @ObfuscatedName("ff") @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 13583ccb61..ddb2dc2e2e 100644 --- a/runescape-client/src/main/java/NodeDeque.java +++ b/runescape-client/src/main/java/NodeDeque.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ld") +@ObfuscatedName("lv") @Implements("NodeDeque") public class NodeDeque { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Loq;" + descriptor = "Los;" ) @Export("sentinel") public Node sentinel; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Loq;" + descriptor = "Los;" ) @Export("current") Node current; @@ -25,7 +25,7 @@ public class NodeDeque { this.sentinel.next = this.sentinel; // L: 11 } // L: 12 - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("clear") public void clear() { while (true) { @@ -39,9 +39,9 @@ public class NodeDeque { } } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Loq;)V" + descriptor = "(Los;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -55,9 +55,9 @@ public class NodeDeque { var1.previous.next = var1; // L: 28 } // L: 29 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Loq;)V" + descriptor = "(Los;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -71,9 +71,9 @@ public class NodeDeque { var1.previous.next = var1; // L: 36 } // L: 37 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "()Loq;" + descriptor = "()Los;" ) @Export("removeLast") public Node removeLast() { @@ -86,9 +86,9 @@ public class NodeDeque { } } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "()Loq;" + descriptor = "()Los;" ) @Export("removeFirst") public Node removeFirst() { @@ -101,9 +101,9 @@ public class NodeDeque { } } - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "()Loq;" + descriptor = "()Los;" ) @Export("last") public Node last() { @@ -117,9 +117,9 @@ public class NodeDeque { } } - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()Loq;" + descriptor = "()Los;" ) @Export("first") public Node first() { @@ -133,9 +133,9 @@ public class NodeDeque { } } - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "()Loq;" + descriptor = "()Los;" ) @Export("previous") public Node previous() { @@ -149,9 +149,9 @@ public class NodeDeque { } } - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "()Loq;" + descriptor = "()Los;" ) @Export("next") public Node next() { @@ -165,9 +165,9 @@ public class NodeDeque { } } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Loq;Loq;)V" + descriptor = "(Los;Los;)V" ) @Export("NodeDeque_addBefore") public static void NodeDeque_addBefore(Node var0, Node var1) { diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java index 68dca9a802..a0e818b549 100644 --- a/runescape-client/src/main/java/NodeHashTable.java +++ b/runescape-client/src/main/java/NodeHashTable.java @@ -3,31 +3,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("po") +@ObfuscatedName("pv") @Implements("NodeHashTable") public final class NodeHashTable { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("size") int size; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "[Loq;" + descriptor = "[Los;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Loq;" + descriptor = "Los;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Loq;" + descriptor = "Los;" ) @Export("current") Node current; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("index") int index; @@ -44,9 +44,9 @@ public final class NodeHashTable { } // L: 20 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(J)Loq;" + descriptor = "(J)Los;" ) @Export("get") public Node get(long var1) { @@ -64,9 +64,9 @@ public final class NodeHashTable { return null; // L: 34 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Loq;J)V" + descriptor = "(Los;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -82,9 +82,9 @@ public final class NodeHashTable { var1.key = var2; // L: 44 } // L: 45 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Loq;" + descriptor = "()Los;" ) @Export("first") public Node first() { @@ -92,9 +92,9 @@ public final class NodeHashTable { return this.next(); // L: 49 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Loq;" + descriptor = "()Los;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/OAuthApi.java b/runescape-client/src/main/java/OAuthApi.java index 8bca2cb8e0..b3bba83f46 100644 --- a/runescape-client/src/main/java/OAuthApi.java +++ b/runescape-client/src/main/java/OAuthApi.java @@ -1,16 +1,14 @@ +package com.jagex.oldscape.pub; + import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; @Implements("OAuthApi") -@ObfuscatedName("com/jagex/oldscape/pub/OAuthApi") public interface OAuthApi { + void setRefreshTokenRequester(RefreshAccessTokenRequester var1); + boolean isOnLoginScreen(); long getAccountHash(); - @ObfuscatedSignature( - descriptor = "(Lcom/jagex/oldscape/pub/OtlTokenRequester;)V" - ) void setOtlTokenRequester(OtlTokenRequester var1); } diff --git a/runescape-client/src/main/java/ObjectComposition.java b/runescape-client/src/main/java/ObjectComposition.java index 26278f321f..f0a95659f3 100644 --- a/runescape-client/src/main/java/ObjectComposition.java +++ b/runescape-client/src/main/java/ObjectComposition.java @@ -1,261 +1,261 @@ -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gj") +@ObfuscatedName("gy") @Implements("ObjectComposition") public class ObjectComposition extends DualNode { - @ObfuscatedName("tp") - @ObfuscatedGetter( - intValue = -1270169191 - ) - static int field2065; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("ObjectDefinition_isLowDetail") - public static boolean ObjectDefinition_isLowDetail; - @ObfuscatedName("i") + static boolean ObjectDefinition_isLowDetail; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" + ) + @Export("ObjectDefinition_archive") + static AbstractArchive ObjectDefinition_archive; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Llp;" ) @Export("ObjectDefinition_modelsArchive") - public static AbstractArchive ObjectDefinition_modelsArchive; - @ObfuscatedName("f") + static AbstractArchive ObjectDefinition_modelsArchive; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("ObjectDefinition_cached") - static EvictingDualNodeHashTable ObjectDefinition_cached; - @ObfuscatedName("b") + public static EvictingDualNodeHashTable ObjectDefinition_cached; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("ObjectDefinition_cachedEntities") - static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; - @ObfuscatedName("s") + public static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("ObjectDefinition_cachedModels") - static EvictingDualNodeHashTable ObjectDefinition_cachedModels; - @ObfuscatedName("l") + public static EvictingDualNodeHashTable ObjectDefinition_cachedModels; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "[Lhc;" + descriptor = "[Lgs;" ) - static ModelData[] field2020; - @ObfuscatedName("q") + static ModelData[] field2085; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1590595383 + intValue = 429332721 ) @Export("id") public int id; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("modelIds") int[] modelIds; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("models") int[] models; - @ObfuscatedName("p") + @ObfuscatedName("c") @Export("name") public String name; @ObfuscatedName("w") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("k") + @ObfuscatedName("b") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("d") + @ObfuscatedName("t") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("m") + @ObfuscatedName("g") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -2085287383 + intValue = 183520013 ) @Export("sizeX") public int sizeX; - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -876347031 + intValue = -5146313 ) @Export("sizeY") public int sizeY; - @ObfuscatedName("g") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1883412293 + intValue = 1008016331 ) @Export("interactType") public int interactType; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("boolean1") public boolean boolean1; - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -906830101 + intValue = -300793899 ) @Export("int1") public int int1; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -763814967 + intValue = 414217251 ) @Export("clipType") int clipType; @ObfuscatedName("j") @Export("nonFlatShading") boolean nonFlatShading; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("modelClipped") public boolean modelClipped; - @ObfuscatedName("z") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -163974259 + intValue = 900942841 ) @Export("animationId") public int animationId; - @ObfuscatedName("h") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 2136398039 + intValue = -495384223 ) @Export("int2") public int int2; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 1916202791 + intValue = 1077699639 ) @Export("ambient") int ambient; - @ObfuscatedName("aq") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -726394467 + intValue = -1494486919 ) @Export("contrast") int contrast; - @ObfuscatedName("aw") + @ObfuscatedName("am") @Export("actions") public String[] actions; - @ObfuscatedName("am") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 2034901073 + intValue = 1927190147 ) @Export("mapIconId") public int mapIconId; - @ObfuscatedName("ak") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -297146651 + intValue = -1184310053 ) @Export("mapSceneId") public int mapSceneId; - @ObfuscatedName("ao") + @ObfuscatedName("aj") @Export("isRotated") boolean isRotated; - @ObfuscatedName("aj") + @ObfuscatedName("ae") @Export("clipped") public boolean clipped; - @ObfuscatedName("al") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 1276797079 + intValue = 1447845467 ) @Export("modelSizeX") int modelSizeX; - @ObfuscatedName("av") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -64921 + intValue = -561351305 ) @Export("modelHeight") int modelHeight; - @ObfuscatedName("at") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -473772847 + intValue = -1485595305 ) @Export("modelSizeY") int modelSizeY; - @ObfuscatedName("an") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -852003755 + intValue = 562270847 ) @Export("offsetX") int offsetX; - @ObfuscatedName("ay") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 232493773 + intValue = 1875918697 ) @Export("offsetHeight") int offsetHeight; - @ObfuscatedName("ag") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1389514563 + intValue = 1644689347 ) @Export("offsetY") int offsetY; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("boolean2") public boolean boolean2; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @Export("isSolid") boolean isSolid; - @ObfuscatedName("ab") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 1878888665 + intValue = 1954919343 ) @Export("int3") public int int3; - @ObfuscatedName("au") + @ObfuscatedName("an") @Export("transforms") public int[] transforms; - @ObfuscatedName("af") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -729176201 + intValue = 1903420193 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ad") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -2043045051 + intValue = 735656301 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1644497933 + intValue = -358109515 ) @Export("ambientSoundId") public int ambientSoundId; - @ObfuscatedName("ax") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -1328611557 + intValue = -938201117 ) @Export("int7") public int int7; - @ObfuscatedName("ar") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -171517787 + intValue = -2049921577 ) @Export("int5") public int int5; - @ObfuscatedName("ap") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 398628539 + intValue = -1600091331 ) @Export("int6") public int int6; - @ObfuscatedName("az") + @ObfuscatedName("aa") @Export("soundEffectIds") public int[] soundEffectIds; - @ObfuscatedName("as") + @ObfuscatedName("ax") @Export("boolean3") public boolean boolean3; - @ObfuscatedName("aa") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "Lpt;" ) @@ -264,11 +264,11 @@ public class ObjectComposition extends DualNode { static { ObjectDefinition_isLowDetail = false; // L: 17 - ObjectDefinition_cached = new EvictingDualNodeHashTable(4096); - ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); - ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); - ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); - field2020 = new ModelData[4]; + ObjectDefinition_cached = new EvictingDualNodeHashTable(4096); // L: 20 + ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); // L: 21 + ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); // L: 22 + ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); // L: 23 + field2085 = new ModelData[4]; // L: 24 } ObjectComposition() { @@ -297,678 +297,614 @@ public class ObjectComposition extends DualNode { this.offsetHeight = 0; // L: 54 this.offsetY = 0; // L: 55 this.boolean2 = false; // L: 56 - this.isSolid = false; - this.int3 = -1; - this.transformVarbit = -1; + this.isSolid = false; // L: 57 + this.int3 = -1; // L: 58 + this.transformVarbit = -1; // L: 60 this.transformVarp = -1; // L: 61 - this.ambientSoundId = -1; - this.int7 = 0; + this.ambientSoundId = -1; // L: 62 + this.int7 = 0; // L: 63 this.int5 = 0; // L: 64 this.int6 = 0; // L: 65 this.boolean3 = true; // L: 67 } // L: 70 - @ObfuscatedName("c") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "2" + garbageValue = "-23" ) @Export("postDecode") void postDecode() { - if (this.int1 == -1) { // L: 89 - this.int1 = 0; // L: 90 - if (this.modelIds != null && (this.models == null || this.models[0] == 10)) { // L: 91 + if (this.int1 == -1) { // L: 95 + this.int1 = 0; // L: 96 + if (this.modelIds != null && (this.models == null || this.models[0] == 10)) { // L: 97 this.int1 = 1; } - for (int var1 = 0; var1 < 5; ++var1) { // L: 92 + for (int var1 = 0; var1 < 5; ++var1) { // L: 98 if (this.actions[var1] != null) { this.int1 = 1; } } } - if (this.int3 == -1) { // L: 94 + if (this.int3 == -1) { // L: 100 this.int3 = this.interactType != 0 ? 1 : 0; } - } // L: 95 + } // L: 101 - @ObfuscatedName("i") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-1801029007" + descriptor = "(Lpx;I)V", + garbageValue = "805835073" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 99 - if (var2 == 0) { // L: 100 - return; // L: 103 + int var2 = var1.readUnsignedByte(); // L: 105 + if (var2 == 0) { // L: 106 + return; // L: 109 } - this.decodeNext(var1, var2); // L: 101 + this.decodeNext(var1, var2); // L: 107 } } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-1971745226" + descriptor = "(Lpx;II)V", + garbageValue = "-1407305271" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { int var3; int var4; - if (var2 == 1) { // L: 106 - var3 = var1.readUnsignedByte(); // L: 107 - if (var3 > 0) { // L: 108 - if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 109 - var1.offset += var3 * 3; // L: 117 + if (var2 == 1) { // L: 112 + var3 = var1.readUnsignedByte(); // L: 113 + if (var3 > 0) { // L: 114 + if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 115 + var1.offset += 3 * var3; // L: 123 } else { - this.models = new int[var3]; // L: 110 - this.modelIds = new int[var3]; // L: 111 + this.models = new int[var3]; // L: 116 + this.modelIds = new int[var3]; // L: 117 - for (var4 = 0; var4 < var3; ++var4) { // L: 112 - this.modelIds[var4] = var1.readUnsignedShort(); // L: 113 - this.models[var4] = var1.readUnsignedByte(); // L: 114 + for (var4 = 0; var4 < var3; ++var4) { // L: 118 + this.modelIds[var4] = var1.readUnsignedShort(); // L: 119 + this.models[var4] = var1.readUnsignedByte(); // L: 120 } } } - } else if (var2 == 2) { // L: 120 + } else if (var2 == 2) { // L: 126 this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 5) { // L: 121 - var3 = var1.readUnsignedByte(); // L: 122 - if (var3 > 0) { // L: 123 - if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 124 - var1.offset += 2 * var3; // L: 129 + } else if (var2 == 5) { // L: 127 + var3 = var1.readUnsignedByte(); // L: 128 + if (var3 > 0) { // L: 129 + if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 130 + var1.offset += var3 * 2; // L: 135 } else { - this.models = null; // L: 125 - this.modelIds = new int[var3]; // L: 126 + this.models = null; // L: 131 + this.modelIds = new int[var3]; // L: 132 - for (var4 = 0; var4 < var3; ++var4) { // L: 127 + for (var4 = 0; var4 < var3; ++var4) { // L: 133 this.modelIds[var4] = var1.readUnsignedShort(); } } } - } else if (var2 == 14) { // L: 132 + } else if (var2 == 14) { // L: 138 this.sizeX = var1.readUnsignedByte(); - } else if (var2 == 15) { // L: 133 + } else if (var2 == 15) { // L: 139 this.sizeY = var1.readUnsignedByte(); - } else if (var2 == 17) { // L: 134 - this.interactType = 0; // L: 135 - this.boolean1 = false; // L: 136 - } else if (var2 == 18) { // L: 138 + } else if (var2 == 17) { // L: 140 + this.interactType = 0; // L: 141 + this.boolean1 = false; // L: 142 + } else if (var2 == 18) { // L: 144 this.boolean1 = false; - } else if (var2 == 19) { // L: 139 + } else if (var2 == 19) { // L: 145 this.int1 = var1.readUnsignedByte(); - } else if (var2 == 21) { // L: 140 + } else if (var2 == 21) { // L: 146 this.clipType = 0; - } else if (var2 == 22) { // L: 141 + } else if (var2 == 22) { // L: 147 this.nonFlatShading = true; - } else if (var2 == 23) { // L: 142 + } else if (var2 == 23) { // L: 148 this.modelClipped = true; - } else if (var2 == 24) { // L: 143 - this.animationId = var1.readUnsignedShort(); // L: 144 - if (this.animationId == 65535) { // L: 145 + } else if (var2 == 24) { // L: 149 + this.animationId = var1.readUnsignedShort(); // L: 150 + if (this.animationId == 65535) { // L: 151 this.animationId = -1; } - } else if (var2 == 27) { // L: 147 + } else if (var2 == 27) { // L: 153 this.interactType = 1; - } else if (var2 == 28) { // L: 148 + } else if (var2 == 28) { // L: 154 this.int2 = var1.readUnsignedByte(); - } else if (var2 == 29) { // L: 149 + } else if (var2 == 29) { // L: 155 this.ambient = var1.readByte(); - } else if (var2 == 39) { // L: 150 + } else if (var2 == 39) { // L: 156 this.contrast = var1.readByte() * 25; - } else if (var2 >= 30 && var2 < 35) { // L: 151 - this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 152 - if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 153 + } else if (var2 >= 30 && var2 < 35) { // L: 157 + this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 158 + if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 159 this.actions[var2 - 30] = null; } - } else if (var2 == 40) { // L: 155 - var3 = var1.readUnsignedByte(); // L: 156 - this.recolorFrom = new short[var3]; // L: 157 - this.recolorTo = new short[var3]; // L: 158 + } else if (var2 == 40) { // L: 161 + var3 = var1.readUnsignedByte(); // L: 162 + this.recolorFrom = new short[var3]; // L: 163 + this.recolorTo = new short[var3]; // L: 164 - for (var4 = 0; var4 < var3; ++var4) { // L: 159 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 160 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 161 + for (var4 = 0; var4 < var3; ++var4) { // L: 165 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 166 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 167 } - } else if (var2 == 41) { // L: 164 - var3 = var1.readUnsignedByte(); // L: 165 - this.retextureFrom = new short[var3]; // L: 166 - this.retextureTo = new short[var3]; // L: 167 + } else if (var2 == 41) { // L: 170 + var3 = var1.readUnsignedByte(); // L: 171 + this.retextureFrom = new short[var3]; // L: 172 + this.retextureTo = new short[var3]; // L: 173 - for (var4 = 0; var4 < var3; ++var4) { // L: 168 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 169 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 170 + for (var4 = 0; var4 < var3; ++var4) { // L: 174 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 175 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 176 } - } else if (var2 == 61) { // L: 173 - var1.readUnsignedShort(); // L: 174 - } else if (var2 == 62) { // L: 176 + } else if (var2 == 61) { // L: 179 + var1.readUnsignedShort(); // L: 180 + } else if (var2 == 62) { // L: 182 this.isRotated = true; - } else if (var2 == 64) { // L: 177 + } else if (var2 == 64) { // L: 183 this.clipped = false; - } else if (var2 == 65) { // L: 178 + } else if (var2 == 65) { // L: 184 this.modelSizeX = var1.readUnsignedShort(); - } else if (var2 == 66) { // L: 179 + } else if (var2 == 66) { // L: 185 this.modelHeight = var1.readUnsignedShort(); - } else if (var2 == 67) { // L: 180 + } else if (var2 == 67) { // L: 186 this.modelSizeY = var1.readUnsignedShort(); - } else if (var2 == 68) { // L: 181 + } else if (var2 == 68) { // L: 187 this.mapSceneId = var1.readUnsignedShort(); - } else if (var2 == 69) { // L: 182 - var1.readUnsignedByte(); // L: 183 - } else if (var2 == 70) { // L: 185 + } else if (var2 == 69) { // L: 188 + var1.readUnsignedByte(); // L: 189 + } else if (var2 == 70) { // L: 191 this.offsetX = var1.readShort(); - } else if (var2 == 71) { // L: 186 + } else if (var2 == 71) { // L: 192 this.offsetHeight = var1.readShort(); - } else if (var2 == 72) { // L: 187 - this.offsetY = var1.readShort(); - } else if (var2 == 73) { // L: 188 + } else if (var2 == 72) { + this.offsetY = var1.readShort(); // L: 193 + } else if (var2 == 73) { // L: 194 this.boolean2 = true; - } else if (var2 == 74) { // L: 189 + } else if (var2 == 74) { // L: 195 this.isSolid = true; - } else if (var2 == 75) { // L: 190 + } else if (var2 == 75) { // L: 196 this.int3 = var1.readUnsignedByte(); - } else if (var2 != 77 && var2 != 92) { // L: 191 - if (var2 == 78) { // L: 209 - this.ambientSoundId = var1.readUnsignedShort(); // L: 210 - this.int7 = var1.readUnsignedByte(); // L: 211 - } else if (var2 == 79) { // L: 213 - this.int5 = var1.readUnsignedShort(); // L: 214 - this.int6 = var1.readUnsignedShort(); // L: 215 - this.int7 = var1.readUnsignedByte(); // L: 216 - var3 = var1.readUnsignedByte(); // L: 217 - this.soundEffectIds = new int[var3]; // L: 218 + } else if (var2 != 77 && var2 != 92) { // L: 197 + if (var2 == 78) { // L: 215 + this.ambientSoundId = var1.readUnsignedShort(); // L: 216 + this.int7 = var1.readUnsignedByte(); // L: 217 + } else if (var2 == 79) { // L: 219 + this.int5 = var1.readUnsignedShort(); // L: 220 + this.int6 = var1.readUnsignedShort(); // L: 221 + this.int7 = var1.readUnsignedByte(); // L: 222 + var3 = var1.readUnsignedByte(); // L: 223 + this.soundEffectIds = new int[var3]; // L: 224 - for (var4 = 0; var4 < var3; ++var4) { // L: 219 + for (var4 = 0; var4 < var3; ++var4) { // L: 225 this.soundEffectIds[var4] = var1.readUnsignedShort(); } - } else if (var2 == 81) { // L: 221 + } else if (var2 == 81) { // L: 227 this.clipType = var1.readUnsignedByte() * 256; - } else if (var2 == 82) { // L: 222 + } else if (var2 == 82) { // L: 228 this.mapIconId = var1.readUnsignedShort(); - } else if (var2 == 89) { // L: 223 + } else if (var2 == 89) { // L: 229 this.boolean3 = false; - } else if (var2 == 249) { // L: 224 - this.params = class214.readStringIntParameters(var1, this.params); + } else if (var2 == 249) { // L: 230 + this.params = JagexCache.readStringIntParameters(var1, this.params); } } else { - this.transformVarbit = var1.readUnsignedShort(); // L: 192 - if (this.transformVarbit == 65535) { // L: 193 + this.transformVarbit = var1.readUnsignedShort(); // L: 198 + if (this.transformVarbit == 65535) { // L: 199 this.transformVarbit = -1; } - this.transformVarp = var1.readUnsignedShort(); // L: 194 - if (this.transformVarp == 65535) { // L: 195 + this.transformVarp = var1.readUnsignedShort(); // L: 200 + if (this.transformVarp == 65535) { // L: 201 this.transformVarp = -1; } - var3 = -1; // L: 196 - if (var2 == 92) { // L: 197 - var3 = var1.readUnsignedShort(); // L: 198 - if (var3 == 65535) { // L: 199 + var3 = -1; // L: 202 + if (var2 == 92) { // L: 203 + var3 = var1.readUnsignedShort(); // L: 204 + if (var3 == 65535) { // L: 205 var3 = -1; } } - var4 = var1.readUnsignedByte(); // L: 201 - this.transforms = new int[var4 + 2]; // L: 202 + var4 = var1.readUnsignedByte(); // L: 207 + this.transforms = new int[var4 + 2]; // L: 208 - for (int var5 = 0; var5 <= var4; ++var5) { // L: 203 - this.transforms[var5] = var1.readUnsignedShort(); // L: 204 - if (this.transforms[var5] == 65535) { // L: 205 + for (int var5 = 0; var5 <= var4; ++var5) { // L: 209 + this.transforms[var5] = var1.readUnsignedShort(); // L: 210 + if (this.transforms[var5] == 65535) { // L: 211 this.transforms[var5] = -1; } } - this.transforms[var4 + 1] = var3; // L: 207 + this.transforms[var4 + 1] = var3; // L: 213 } - } // L: 226 + } // L: 232 - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "683516334" + descriptor = "(IB)Z", + garbageValue = "14" ) - public final boolean method3664(int var1) { - if (this.models != null) { // L: 229 - for (int var4 = 0; var4 < this.models.length; ++var4) { // L: 239 - if (this.models[var4] == var1) { // L: 240 + public final boolean method3589(int var1) { + if (this.models != null) { // L: 235 + for (int var4 = 0; var4 < this.models.length; ++var4) { // L: 245 + if (this.models[var4] == var1) { // L: 246 return ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var4] & 65535, 0); } } - return true; // L: 242 - } else if (this.modelIds == null) { // L: 230 + return true; // L: 248 + } else if (this.modelIds == null) { // L: 236 return true; - } else if (var1 != 10) { // L: 231 + } else if (var1 != 10) { // L: 237 return true; } else { - boolean var2 = true; // L: 232 + boolean var2 = true; // L: 238 - for (int var3 = 0; var3 < this.modelIds.length; ++var3) { // L: 233 - var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); // L: 234 + for (int var3 = 0; var3 < this.modelIds.length; ++var3) { // L: 239 + var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); // L: 240 } - return var2; // L: 236 + return var2; // L: 242 } } - @ObfuscatedName("n") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1481046668" + descriptor = "(B)Z", + garbageValue = "1" ) @Export("needsModelFiles") public final boolean needsModelFiles() { - if (this.modelIds == null) { // L: 247 + if (this.modelIds == null) { // L: 253 return true; } else { - boolean var1 = true; // L: 248 + boolean var1 = true; // L: 254 - for (int var2 = 0; var2 < this.modelIds.length; ++var2) { // L: 249 - var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); // L: 250 + for (int var2 = 0; var2 < this.modelIds.length; ++var2) { // L: 255 + var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); // L: 256 } - return var1; // L: 252 + return var1; // L: 258 } } @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II[[IIIIB)Lix;", - garbageValue = "84" + descriptor = "(II[[IIIII)Lgx;", + garbageValue = "-491315765" ) @Export("getEntity") public final Renderable getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { long var7; - if (this.models == null) { // L: 257 + if (this.models == null) { // L: 263 var7 = (long)(var2 + (this.id << 10)); } else { - var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 258 + var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 264 } - Object var9 = (Renderable)ObjectDefinition_cachedEntities.get(var7); // L: 259 - if (var9 == null) { // L: 260 - ModelData var10 = this.getModelData(var1, var2); // L: 261 - if (var10 == null) { // L: 262 + Object var9 = (Renderable)ObjectDefinition_cachedEntities.get(var7); // L: 265 + if (var9 == null) { // L: 266 + ModelData var10 = this.getModelData(var1, var2); // L: 267 + if (var10 == null) { // L: 268 return null; } - if (!this.nonFlatShading) { // L: 263 + if (!this.nonFlatShading) { // L: 269 var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); } else { - var10.ambient = (short)(this.ambient + 64); // L: 265 - var10.contrast = (short)(this.contrast + 768); // L: 266 - var10.calculateVertexNormals(); // L: 267 - var9 = var10; // L: 268 + var10.ambient = (short)(this.ambient + 64); // L: 271 + var10.contrast = (short)(this.contrast + 768); // L: 272 + var10.calculateVertexNormals(); // L: 273 + var9 = var10; // L: 274 } - ObjectDefinition_cachedEntities.put((DualNode)var9, var7); // L: 270 + ObjectDefinition_cachedEntities.put((DualNode)var9, var7); // L: 276 } - if (this.nonFlatShading) { // L: 272 - var9 = ((ModelData)var9).copyModelData(); // L: 273 + if (this.nonFlatShading) { // L: 278 + var9 = ((ModelData)var9).copyModelData(); // L: 279 } - if (this.clipType >= 0) { // L: 275 - if (var9 instanceof Model) { // L: 276 + if (this.clipType >= 0) { // L: 281 + if (var9 instanceof Model) { // L: 282 var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType); } else if (var9 instanceof ModelData) { - var9 = ((ModelData)var9).method4517(var3, var4, var5, var6, true, this.clipType); // L: 277 + var9 = ((ModelData)var9).method3847(var3, var4, var5, var6, true, this.clipType); // L: 283 } } - return (Renderable)var9; // L: 279 + return (Renderable)var9; // L: 285 } - @ObfuscatedName("l") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(II[[IIIII)Liq;", - garbageValue = "-261368298" + descriptor = "(II[[IIIII)Lhv;", + garbageValue = "1913626278" ) @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: 284 + if (this.models == null) { // L: 290 var7 = (long)(var2 + (this.id << 10)); } else { - var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 285 + var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 291 } - Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); // L: 286 - if (var9 == null) { // L: 287 - ModelData var10 = this.getModelData(var1, var2); // L: 288 - if (var10 == null) { // L: 289 + Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); // L: 292 + if (var9 == null) { // L: 293 + ModelData var10 = this.getModelData(var1, var2); // L: 294 + if (var10 == null) { // L: 295 return null; } - var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 290 - ObjectDefinition_cachedModels.put(var9, var7); // L: 291 + var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 296 + ObjectDefinition_cachedModels.put(var9, var7); // L: 297 } if (this.clipType >= 0) { - var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType); // L: 293 + var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType); // L: 299 } - return var9; // L: 294 + return var9; // L: 300 } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II[[IIIILgw;II)Liq;", - garbageValue = "1099870493" + descriptor = "(II[[IIIILgq;IB)Lhv;", + garbageValue = "2" ) @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: 299 + if (this.models == null) { // L: 305 var9 = (long)(var2 + (this.id << 10)); } else { - var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 300 + var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 306 } - Model var11 = (Model)ObjectDefinition_cachedModels.get(var9); // L: 301 - if (var11 == null) { // L: 302 - ModelData var12 = this.getModelData(var1, var2); // L: 303 - if (var12 == null) { // L: 304 + Model var11 = (Model)ObjectDefinition_cachedModels.get(var9); // L: 307 + if (var11 == null) { // L: 308 + ModelData var12 = this.getModelData(var1, var2); // L: 309 + if (var12 == null) { // L: 310 return null; } - var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 305 - ObjectDefinition_cachedModels.put(var11, var9); // L: 306 + var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 311 + ObjectDefinition_cachedModels.put(var11, var9); // L: 312 } - if (var7 == null && this.clipType == -1) { // L: 308 + if (var7 == null && this.clipType == -1) { // L: 314 return var11; } else { - if (var7 != null) { // L: 309 - var11 = var7.transformObjectModel(var11, var8, var2); // L: 310 + if (var7 != null) { // L: 315 + var11 = var7.transformObjectModel(var11, var8, var2); // L: 316 } else { - var11 = var11.toSharedSequenceModel(true); // L: 312 + var11 = var11.toSharedSequenceModel(true); // L: 318 } - if (this.clipType >= 0) { // L: 313 + if (this.clipType >= 0) { // L: 319 var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType); } - return var11; // L: 314 + return var11; // L: 320 } } - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(III)Lhc;", - garbageValue = "1620081906" + descriptor = "(III)Lgs;", + garbageValue = "732231403" ) @Export("getModelData") final ModelData getModelData(int var1, int var2) { - ModelData var3 = null; // L: 318 + ModelData var3 = null; // L: 324 boolean var4; int var5; int var7; - if (this.models == null) { // L: 319 - if (var1 != 10) { // L: 320 + if (this.models == null) { // L: 325 + if (var1 != 10) { // L: 326 return null; } - if (this.modelIds == null) { // L: 321 + if (this.modelIds == null) { // L: 327 return null; } - var4 = this.isRotated; // L: 322 - if (var1 == 2 && var2 > 3) { // L: 323 + var4 = this.isRotated; // L: 328 + if (var1 == 2 && var2 > 3) { // L: 329 var4 = !var4; } - var5 = this.modelIds.length; // L: 324 + var5 = this.modelIds.length; // L: 330 - for (int var6 = 0; var6 < var5; ++var6) { // L: 325 - var7 = this.modelIds[var6]; // L: 326 - if (var4) { // L: 327 + for (int var6 = 0; var6 < var5; ++var6) { // L: 331 + var7 = this.modelIds[var6]; // L: 332 + if (var4) { // L: 333 var7 += 65536; } - var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var7); // L: 328 - if (var3 == null) { // L: 329 - var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var7 & 65535, 0); // L: 330 - if (var3 == null) { // L: 331 + var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var7); // L: 334 + if (var3 == null) { // L: 335 + var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var7 & 65535, 0); // L: 336 + if (var3 == null) { // L: 337 return null; } - if (var4) { // L: 332 - var3.method4526(); + if (var4) { // L: 338 + var3.method3841(); } - ObjectDefinition_cachedModelData.put(var3, (long)var7); // L: 333 + ObjectDefinition_cachedModelData.put(var3, (long)var7); // L: 339 } - if (var5 > 1) { // L: 335 - field2020[var6] = var3; + if (var5 > 1) { // L: 341 + field2085[var6] = var3; } } - if (var5 > 1) { // L: 337 - var3 = new ModelData(field2020, var5); + if (var5 > 1) { // L: 343 + var3 = new ModelData(field2085, var5); } } else { - int var9 = -1; // L: 340 + int var9 = -1; // L: 346 - for (var5 = 0; var5 < this.models.length; ++var5) { // L: 341 - if (this.models[var5] == var1) { // L: 342 - var9 = var5; // L: 343 + for (var5 = 0; var5 < this.models.length; ++var5) { // L: 347 + if (this.models[var5] == var1) { // L: 348 + var9 = var5; // L: 349 break; } } - if (var9 == -1) { // L: 347 + if (var9 == -1) { // L: 353 return null; } - var5 = this.modelIds[var9]; // L: 348 - boolean var10 = this.isRotated ^ var2 > 3; // L: 349 - if (var10) { // L: 350 + var5 = this.modelIds[var9]; // L: 354 + boolean var10 = this.isRotated ^ var2 > 3; // L: 355 + if (var10) { // L: 356 var5 += 65536; } - var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var5); // L: 351 - if (var3 == null) { // L: 352 - var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var5 & 65535, 0); // L: 353 - if (var3 == null) { // L: 354 + var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var5); // L: 357 + if (var3 == null) { // L: 358 + var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var5 & 65535, 0); // L: 359 + if (var3 == null) { // L: 360 return null; } - if (var10) { // L: 355 - var3.method4526(); + if (var10) { // L: 361 + var3.method3841(); } - ObjectDefinition_cachedModelData.put(var3, (long)var5); // L: 356 + ObjectDefinition_cachedModelData.put(var3, (long)var5); // L: 362 } } - if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { // L: 360 - var4 = false; // L: 361 + if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { // L: 366 + var4 = false; // L: 367 } else { var4 = true; } boolean var11; - if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { // L: 363 - var11 = false; // L: 364 + if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { // L: 369 + var11 = false; // L: 370 } else { var11 = true; } - ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, this.retextureFrom == null, true); // L: 365 - if (var1 == 4 && var2 > 3) { // L: 366 - var8.method4512(256); // L: 367 - var8.changeOffset(45, 0, -45); // L: 368 + ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, this.retextureFrom == null, true); // L: 371 + if (var1 == 4 && var2 > 3) { // L: 372 + var8.method3823(256); // L: 373 + var8.changeOffset(45, 0, -45); // L: 374 } - var2 &= 3; // L: 370 - if (var2 == 1) { // L: 371 - var8.method4553(); - } else if (var2 == 2) { // L: 372 - var8.method4520(); - } else if (var2 == 3) { // L: 373 - var8.method4521(); + var2 &= 3; // L: 376 + if (var2 == 1) { // L: 377 + var8.method3820(); + } else if (var2 == 2) { // L: 378 + var8.method3854(); + } else if (var2 == 3) { // L: 379 + var8.method3822(); } - if (this.recolorFrom != null) { // L: 374 - for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 375 - var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 376 + if (this.recolorFrom != null) { // L: 380 + for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 381 + var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 382 } } - if (this.retextureFrom != null) { // L: 379 - for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 380 - var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 381 + if (this.retextureFrom != null) { // L: 385 + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 386 + var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 387 } } - if (var4) { // L: 384 + if (var4) { // L: 390 var8.resize(this.modelSizeX, this.modelHeight, this.modelSizeY); } - if (var11) { // L: 385 + if (var11) { // L: 391 var8.changeOffset(this.offsetX, this.offsetHeight, this.offsetY); } - return var8; // L: 386 + return var8; // L: 392 } - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Lgj;", - garbageValue = "32" + descriptor = "(B)Lgy;", + garbageValue = "-6" ) @Export("transform") public final ObjectComposition transform() { - int var1 = -1; // L: 390 - if (this.transformVarbit != -1) { // L: 391 - var1 = SecureRandomCallable.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { // L: 392 + int var1 = -1; // L: 396 + if (this.transformVarbit != -1) { // L: 397 + var1 = class18.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 398 var1 = Varps.Varps_main[this.transformVarp]; } int var2; - if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 394 - var2 = this.transforms[var1]; // L: 395 + if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 400 + var2 = this.transforms[var1]; // L: 401 } else { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? class146.getObjectDefinition(var2) : null; // L: 396 397 - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "104" - ) - @Export("getIntParam") - public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; // L: 402 - int var3; - if (var4 == null) { // L: 404 - var3 = var2; // L: 405 - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 408 - if (var5 == null) { // L: 409 - var3 = var2; // L: 410 - } else { - var3 = var5.integer; // L: 413 - } - } - - return var3; // L: 415 + return var2 != -1 ? class82.getObjectDefinition(var2) : null; // L: 402 403 } @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1202873066" + ) + @Export("getIntParam") + public int getIntParam(int var1, int var2) { + return class154.method3061(this.params, var1, var2); // L: 407 + } + + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "1640621220" + garbageValue = "1010860947" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; // L: 420 - String var3; - if (var4 == null) { // L: 422 - var3 = var2; // L: 423 - } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 426 - if (var5 == null) { // L: 427 - var3 = var2; // L: 428 - } else { - var3 = (String)var5.obj; // L: 431 - } - } - - return var3; // L: 433 + return AttackOption.method2393(this.params, var1, var2); // L: 411 } - @ObfuscatedName("d") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "45" + descriptor = "(I)Z", + garbageValue = "-1092849853" ) @Export("hasSound") public boolean hasSound() { - if (this.transforms == null) { // L: 444 + if (this.transforms == null) { // L: 415 return this.ambientSoundId != -1 || this.soundEffectIds != null; } else { - for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 445 - if (this.transforms[var1] != -1) { // L: 446 - ObjectComposition var2 = class146.getObjectDefinition(this.transforms[var1]); // L: 447 - if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 448 + for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 416 + if (this.transforms[var1] != -1) { // L: 417 + ObjectComposition var2 = class82.getObjectDefinition(this.transforms[var1]); // L: 418 + if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 419 return true; } } } - return false; // L: 451 + return false; // L: 422 } } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)Lgh;", - garbageValue = "2086980764" - ) - @Export("StructDefinition_getStructDefinition") - public static StructComposition StructDefinition_getStructDefinition(int var0) { - StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); // L: 19 - if (var1 != null) { // L: 20 - return var1; - } else { - byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); // L: 21 - var1 = new StructComposition(); // L: 22 - if (var2 != null) { // L: 23 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 24 - StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 25 - return var1; // L: 26 - } - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1937470798" - ) - static void method3674() { - Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 57 - - while (var0.hasNext()) { // L: 62 - Message var1 = (Message)var0.next(); // L: 58 - var1.clearIsFromFriend(); // L: 60 - } - - } // L: 63 } diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java index c6c047349f..85eb81a0e1 100644 --- a/runescape-client/src/main/java/ObjectNode.java +++ b/runescape-client/src/main/java/ObjectNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ou") +@ObfuscatedName("oj") @Implements("ObjectNode") public class ObjectNode extends Node { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("obj") public final Object obj; diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index 1a27f3691f..dbe05378a8 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -4,95 +4,95 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bx") +@ObfuscatedName("bj") @Implements("ObjectSound") public final class ObjectSound extends Node { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llv;" ) @Export("objectSounds") static NodeDeque objectSounds; - @ObfuscatedName("ea") + @ObfuscatedName("el") @ObfuscatedSignature( - descriptor = "Llx;" + descriptor = "Lle;" ) - @Export("archive19") - static Archive archive19; - @ObfuscatedName("c") + @Export("archive10") + static Archive archive10; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1143373499 + intValue = 732254663 ) @Export("plane") int plane; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 196890987 + intValue = 1987323191 ) @Export("x") int x; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1084424963 + intValue = 353993277 ) @Export("y") int y; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 993575825 + intValue = 2069201157 ) @Export("maxX") int maxX; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -940444737 + intValue = -1537948889 ) @Export("maxY") int maxY; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 209965041 + ) + int field817; @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1342895703 + intValue = -222773955 ) - int field818; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1138356125 - ) - int field814; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1961686125 - ) - @Export("soundEffectId") - int soundEffectId; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lau;" - ) - @Export("stream1") - RawPcmStream stream1; + int field813; @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lgy;" ) @Export("obj") ObjectComposition obj; - @ObfuscatedName("p") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 712620851 + intValue = -1832672013 ) - int field810; + @Export("soundEffectId") + int soundEffectId; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lah;" + ) + @Export("stream1") + RawPcmStream stream1; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 727974151 + ) + int field808; @ObfuscatedName("w") @Export("soundEffectIds") int[] soundEffectIds; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1687637789 + intValue = 10408455 ) - int field821; - @ObfuscatedName("d") + int field810; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lau;" + descriptor = "Lah;" ) @Export("stream2") RawPcmStream stream2; @@ -104,10 +104,10 @@ public final class ObjectSound extends Node { ObjectSound() { } // L: 27 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "725537929" + garbageValue = "2026640853" ) @Export("set") void set() { @@ -115,64 +115,45 @@ public final class ObjectSound extends Node { ObjectComposition var2 = this.obj.transform(); // L: 45 if (var2 != null) { // L: 46 this.soundEffectId = var2.ambientSoundId; // L: 47 - this.field814 = var2.int7 * 128; // L: 48 - this.field818 = var2.int5; // L: 49 - this.field810 = var2.int6; // L: 50 + this.field817 = var2.int7 * 128; // L: 48 + this.field813 = var2.int5; // L: 49 + this.field808 = var2.int6; // L: 50 this.soundEffectIds = var2.soundEffectIds; // L: 51 } else { this.soundEffectId = -1; // L: 54 - this.field814 = 0; // L: 55 - this.field818 = 0; // L: 56 - this.field810 = 0; // L: 57 + this.field817 = 0; // L: 55 + this.field813 = 0; // L: 56 + this.field808 = 0; // L: 57 this.soundEffectIds = null; // L: 58 } if (var1 != this.soundEffectId && this.stream1 != null) { // L: 60 - StructComposition.pcmStreamMixer.removeSubStream(this.stream1); // L: 61 + class122.pcmStreamMixer.removeSubStream(this.stream1); // L: 61 this.stream1 = null; // L: 62 } } // L: 64 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIZIZB)V", - garbageValue = "20" + descriptor = "(B)I", + garbageValue = "-9" ) - @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 = DevicePcmPlayerProvider.World_worlds[var6]; // L: 180 - DevicePcmPlayerProvider.World_worlds[var6] = DevicePcmPlayerProvider.World_worlds[var1]; // L: 181 - DevicePcmPlayerProvider.World_worlds[var1] = var8; // L: 182 + public static int method1734() { + return KeyHandler.KeyHandler_idleCycles; // L: 142 + } - for (int var9 = var0; var9 < var1; ++var9) { // L: 183 - if (VerticalAlignment.method3538(DevicePcmPlayerProvider.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { // L: 184 - World var10 = DevicePcmPlayerProvider.World_worlds[var9]; // L: 185 - DevicePcmPlayerProvider.World_worlds[var9] = DevicePcmPlayerProvider.World_worlds[var7]; // L: 186 - DevicePcmPlayerProvider.World_worlds[var7++] = var10; // L: 187 - } - } - - DevicePcmPlayerProvider.World_worlds[var1] = DevicePcmPlayerProvider.World_worlds[var7]; // L: 191 - DevicePcmPlayerProvider.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 + @ObfuscatedName("fu") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "2109603976" + ) + static final void method1730(boolean var0) { + if (var0) { // L: 3064 + Client.field615 = Login.field900 ? class124.field1557 : class124.field1551; // L: 3065 + } else { + Client.field615 = class12.clientPreferences.parameters.containsKey(class239.method4810(Login.Login_username)) ? class124.field1556 : class124.field1553; // L: 3068 } - } // L: 196 - - @ObfuscatedName("ms") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1165685884" - ) - static void method1757() { - if (Client.oculusOrbState == 1) { // L: 12612 - Client.field759 = true; // L: 12613 - } - - } // L: 12615 + } // L: 3070 } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index d4fd38b36f..948d2fde88 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -2,117 +2,491 @@ import 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("hy") @Implements("Occluder") public final class Occluder { - @ObfuscatedName("bs") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 521485803 - ) - static int field2687; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 432924175 + intValue = -1667496443 ) @Export("minTileX") int minTileX; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 870286189 + intValue = 1607339701 ) @Export("maxTileX") int maxTileX; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1384680613 + intValue = -1327290645 ) @Export("minTileY") int minTileY; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 307229679 + intValue = -1032573123 ) @Export("maxTileY") int maxTileY; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -2026987549 + intValue = 1960990691 ) @Export("type") int type; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1038398405 + intValue = 1746160959 ) @Export("minX") int minX; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1926841753 + intValue = 1167261617 ) @Export("maxX") int maxX; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 933387719 + intValue = -1218503837 ) @Export("minZ") int minZ; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1713258203 + intValue = 1421337339 ) @Export("maxZ") int maxZ; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 293086529 + intValue = 2056353609 ) @Export("minY") int minY; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -324431291 + intValue = 621909479 ) @Export("maxY") int maxY; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1076390299 + intValue = 880103251 ) - int field2669; + int field2510; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1300048983 + intValue = -1489264085 ) - int field2681; - @ObfuscatedName("k") + int field2507; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1268857779 + intValue = -2075749697 ) - int field2682; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 156478241 - ) - int field2683; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -213765683 - ) - int field2684; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -606308779 - ) - int field2685; + int field2508; @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1936535027 + intValue = 1502323289 ) - int field2686; + int field2509; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 1403810903 + ) + int field2495; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -340736711 + ) + int field2506; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1370877385 + ) + int field2511; Occluder() { - } // L: 23 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[SIIB)V", + garbageValue = "0" + ) + @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 + + 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 + } + } + + 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("k") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2100168808" + ) + public static void method4221() { + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 107 + if (ArchiveDiskActionHandler.field3998 != 0) { // L: 108 + ArchiveDiskActionHandler.field3998 = 1; // L: 109 + + try { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 111 + } catch (InterruptedException var3) { // L: 113 + } + } + + } + } // L: 116 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1785001872" + ) + public static int method4220(int var0) { + return class402.field4445[var0 & 16383]; // L: 37 + } + + @ObfuscatedName("hb") + @ObfuscatedSignature( + descriptor = "(Lja;I)V", + garbageValue = "791986228" + ) + static final void method4222(class263 var0) { + PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 7547 + int var2; + int var3; + int var4; + int var5; + int var6; + int var7; + int var8; + int var9; + int var10; + if (class263.field3064 == var0) { // L: 7548 + var2 = var1.readUnsignedShort(); // L: 7549 + var3 = var1.readUnsignedByte(); // L: 7550 + var4 = (var3 >> 4 & 7) + class145.field1690; // L: 7551 + var5 = (var3 & 7) + class321.field4076; // L: 7552 + var6 = var1.method7545(); // L: 7553 + var7 = var6 >> 4 & 15; // L: 7554 + var8 = var6 & 7; // L: 7555 + var9 = var1.method7593(); // L: 7556 + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7557 + var10 = var7 + 1; // L: 7558 + if (ModelData0.localPlayer.pathX[0] >= var4 - var10 && ModelData0.localPlayer.pathX[0] <= var10 + var4 && ModelData0.localPlayer.pathY[0] >= var5 - var10 && ModelData0.localPlayer.pathY[0] <= var10 + var5 && class12.clientPreferences.method2239() != 0 && var8 > 0 && Client.soundEffectCount < 50) { // L: 7559 7560 + Client.soundEffectIds[Client.soundEffectCount] = var2; // L: 7561 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; // L: 7562 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var9; // L: 7563 + Client.soundEffects[Client.soundEffectCount] = null; // L: 7564 + Client.soundLocations[Client.soundEffectCount] = var7 + (var5 << 8) + (var4 << 16); // L: 7565 + ++Client.soundEffectCount; // L: 7566 + } + } + } + + TileItem var35; + if (class263.field3066 == var0) { // L: 7571 + var2 = var1.method7593(); // L: 7572 + var3 = (var2 >> 4 & 7) + class145.field1690; // L: 7573 + var4 = (var2 & 7) + class321.field4076; // L: 7574 + var5 = var1.method7554(); // L: 7575 + var6 = var1.method7716(); // L: 7576 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7577 + var35 = new TileItem(); // L: 7578 + var35.id = var6; // L: 7579 + var35.quantity = var5; // L: 7580 + if (Client.groundItems[class128.Client_plane][var3][var4] == null) { // L: 7581 + Client.groundItems[class128.Client_plane][var3][var4] = new NodeDeque(); + } + + Client.groundItems[class128.Client_plane][var3][var4].addFirst(var35); // L: 7582 + Frames.updateItemPile(var3, var4); // L: 7583 + } + + } else if (class263.field3068 == var0) { // L: 7587 + var2 = var1.readUnsignedShort(); // L: 7588 + var3 = var1.method7593(); // L: 7589 + var4 = var3 >> 2; // L: 7590 + var5 = var3 & 3; // L: 7591 + var6 = Client.field553[var4]; // L: 7592 + var7 = var1.readUnsignedByte(); // L: 7593 + var8 = (var7 >> 4 & 7) + class145.field1690; // L: 7594 + var9 = (var7 & 7) + class321.field4076; // L: 7595 + if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104) { // L: 7596 + class221.updatePendingSpawn(class128.Client_plane, var8, var9, var6, var2, var4, var5, 0, -1); // L: 7597 + } + + } else if (class263.field3058 == var0) { // L: 7601 + var2 = var1.method7545(); // L: 7602 + var3 = (var2 >> 4 & 7) + class145.field1690; // L: 7603 + var4 = (var2 & 7) + class321.field4076; // L: 7604 + var5 = var1.readUnsignedShort(); // L: 7605 + var6 = var1.method7576(); // L: 7606 + var7 = var1.method7576(); // L: 7607 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7608 + NodeDeque var43 = Client.groundItems[class128.Client_plane][var3][var4]; // L: 7609 + if (var43 != null) { // L: 7610 + for (TileItem var36 = (TileItem)var43.last(); var36 != null; var36 = (TileItem)var43.previous()) { // L: 7611 7612 7617 + if ((var7 & 32767) == var36.id && var6 == var36.quantity) { // L: 7613 + var36.quantity = var5; // L: 7614 + break; + } + } + + Frames.updateItemPile(var3, var4); // L: 7619 + } + } + + } else if (class263.field3063 == var0) { // L: 7624 + var2 = var1.method7716(); // L: 7625 + var3 = var1.method7545(); // L: 7626 + var4 = (var3 >> 4 & 7) + class145.field1690; // L: 7627 + var5 = (var3 & 7) + class321.field4076; // L: 7628 + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7629 + NodeDeque var34 = Client.groundItems[class128.Client_plane][var4][var5]; // L: 7630 + if (var34 != null) { // L: 7631 + for (var35 = (TileItem)var34.last(); var35 != null; var35 = (TileItem)var34.previous()) { // L: 7632 7633 7638 + if ((var2 & 32767) == var35.id) { // L: 7634 + var35.remove(); // L: 7635 + break; + } + } + + if (var34.last() == null) { // L: 7640 + Client.groundItems[class128.Client_plane][var4][var5] = null; + } + + Frames.updateItemPile(var4, var5); // L: 7641 + } + } + + } else if (class263.field3059 == var0) { // L: 7646 + var2 = var1.method7545(); // L: 7647 + var3 = (var2 >> 4 & 7) + class145.field1690; // L: 7648 + var4 = (var2 & 7) + class321.field4076; // L: 7649 + var5 = var1.method7593(); // L: 7650 + var6 = var5 >> 2; // L: 7651 + var7 = var5 & 3; // L: 7652 + var8 = Client.field553[var6]; // L: 7653 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7654 + class221.updatePendingSpawn(class128.Client_plane, var3, var4, var8, -1, var6, var7, 0, -1); // L: 7655 + } + + } else if (class263.field3071 == var0) { // L: 7659 + var2 = var1.method7546(); // L: 7660 + var3 = (var2 >> 4 & 7) + class145.field1690; // L: 7661 + var4 = (var2 & 7) + class321.field4076; // L: 7662 + var5 = var1.method7545(); // L: 7663 + var6 = var1.method7716(); // L: 7664 + var7 = var1.method7716(); // L: 7665 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7666 + var3 = var3 * 128 + 64; // L: 7667 + var4 = var4 * 128 + 64; // L: 7668 + GraphicsObject var33 = new GraphicsObject(var7, class128.Client_plane, var3, var4, class202.getTileHeight(var3, var4, class128.Client_plane) - var5, var6, Client.cycle); // L: 7669 + Client.graphicsObjects.addFirst(var33); // L: 7670 + } + + } else { + int var11; + int var12; + int var13; + int var14; + byte var37; + if (class263.field3060 == var0) { // L: 7674 + var2 = var1.method7556(); // L: 7675 + var3 = var1.method7716(); // L: 7676 + var37 = var1.method7549(); // L: 7677 + var5 = var1.method7545(); // L: 7678 + var6 = (var5 >> 4 & 7) + class145.field1690; // L: 7679 + var7 = (var5 & 7) + class321.field4076; // L: 7680 + var8 = var1.method7576(); // L: 7681 + var9 = var1.readUnsignedShort(); // L: 7682 + var10 = var1.readUnsignedByte() * 4; // L: 7683 + var11 = var1.method7546(); // L: 7684 + var12 = var1.method7545() * 4; // L: 7685 + var13 = var1.method7546(); // L: 7686 + byte var39 = var1.method7549(); // L: 7687 + var14 = var39 + var6; // L: 7688 + var4 = var37 + var7; // L: 7689 + if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104 && var14 >= 0 && var4 >= 0 && var14 < 104 && var4 < 104 && var3 != 65535) { // L: 7690 + var6 = var6 * 128 + 64; // L: 7691 + var7 = var7 * 128 + 64; // L: 7692 + var14 = var14 * 128 + 64; // L: 7693 + var4 = var4 * 128 + 64; // L: 7694 + Projectile var32 = new Projectile(var3, class128.Client_plane, var6, var7, class202.getTileHeight(var6, var7, class128.Client_plane) - var12, var8 + Client.cycle, var9 + Client.cycle, var13, var11, var2, var10); // L: 7695 + var32.setDestination(var14, var4, class202.getTileHeight(var14, var4, class128.Client_plane) - var10, var8 + Client.cycle); // L: 7696 + Client.projectiles.addFirst(var32); // L: 7697 + } + + } else { + if (class263.field3062 == var0) { // L: 7701 + var2 = var1.method7554(); // L: 7702 + var3 = var1.method7716(); // L: 7703 + var37 = var1.method7547(); // L: 7704 + var5 = var1.method7546(); // L: 7705 + var6 = (var5 >> 4 & 7) + class145.field1690; // L: 7706 + var7 = (var5 & 7) + class321.field4076; // L: 7707 + var8 = var1.method7554(); // L: 7708 + var9 = var1.readUnsignedShort(); // L: 7709 + byte var38 = var1.method7547(); // L: 7710 + var11 = var1.readUnsignedByte(); // L: 7711 + var12 = var11 >> 2; // L: 7712 + var13 = var11 & 3; // L: 7713 + var14 = Client.field553[var12]; // L: 7714 + byte var15 = var1.method7547(); // L: 7715 + byte var16 = var1.method7547(); // L: 7716 + Player var17; + if (var2 == Client.localPlayerIndex) { // L: 7718 + var17 = ModelData0.localPlayer; + } else { + var17 = Client.players[var2]; // L: 7719 + } + + if (var17 != null) { // L: 7720 + ObjectComposition var18 = class82.getObjectDefinition(var3); // L: 7721 + int var19; + int var20; + if (var13 != 1 && var13 != 3) { // L: 7724 + var19 = var18.sizeX; // L: 7729 + var20 = var18.sizeY; // L: 7730 + } else { + var19 = var18.sizeY; // L: 7725 + var20 = var18.sizeX; // L: 7726 + } + + int var21 = var6 + (var19 >> 1); // L: 7732 + int var22 = var6 + (var19 + 1 >> 1); // L: 7733 + int var23 = var7 + (var20 >> 1); // L: 7734 + int var24 = var7 + (var20 + 1 >> 1); // L: 7735 + int[][] var25 = Tiles.Tiles_heights[class128.Client_plane]; // L: 7736 + int var26 = var25[var22][var24] + var25[var21][var23] + var25[var22][var23] + var25[var21][var24] >> 2; // L: 7737 + int var27 = (var6 << 7) + (var19 << 6); // L: 7738 + int var28 = (var7 << 7) + (var20 << 6); // L: 7739 + Model var29 = var18.getModel(var12, var13, var25, var27, var26, var28); // L: 7740 + if (var29 != null) { // L: 7741 + class221.updatePendingSpawn(class128.Client_plane, var6, var7, var14, -1, 0, 0, var9 + 1, var8 + 1); // L: 7742 + var17.animationCycleStart = var9 + Client.cycle; // L: 7743 + var17.animationCycleEnd = var8 + Client.cycle; // L: 7744 + var17.model0 = var29; // L: 7745 + var17.field1104 = var19 * 64 + var6 * 128; // L: 7746 + var17.field1106 = var20 * 64 + var7 * 128; // L: 7747 + var17.tileHeight2 = var26; // L: 7748 + byte var30; + if (var38 > var16) { // L: 7749 + var30 = var38; // L: 7750 + var38 = var16; // L: 7751 + var16 = var30; // L: 7752 + } + + if (var37 > var15) { // L: 7754 + var30 = var37; // L: 7755 + var37 = var15; // L: 7756 + var15 = var30; // L: 7757 + } + + var17.minX = var6 + var38; // L: 7759 + var17.maxX = var16 + var6; // L: 7760 + var17.minY = var37 + var7; // L: 7761 + var17.maxY = var7 + var15; // L: 7762 + } + } + } + + if (class263.field3067 == var0) { // L: 7766 + var2 = var1.method7593(); // L: 7767 + var3 = var2 >> 2; // L: 7768 + var4 = var2 & 3; // L: 7769 + var5 = Client.field553[var3]; // L: 7770 + var6 = var1.method7546(); // L: 7771 + var7 = (var6 >> 4 & 7) + class145.field1690; // L: 7772 + var8 = (var6 & 7) + class321.field4076; // L: 7773 + var9 = var1.method7554(); // L: 7774 + if (var7 >= 0 && var8 >= 0 && var7 < 103 && var8 < 103) { // L: 7775 + if (var5 == 0) { // L: 7776 + BoundaryObject var31 = class175.scene.method4147(class128.Client_plane, var7, var8); // L: 7777 + if (var31 != null) { // L: 7778 + var11 = NetSocket.Entity_unpackID(var31.tag); // L: 7779 + if (var3 == 2) { // L: 7780 + var31.renderable1 = new DynamicObject(var11, 2, var4 + 4, class128.Client_plane, var7, var8, var9, false, var31.renderable1); // L: 7781 + var31.renderable2 = new DynamicObject(var11, 2, var4 + 1 & 3, class128.Client_plane, var7, var8, var9, false, var31.renderable2); // L: 7782 + } else { + var31.renderable1 = new DynamicObject(var11, var3, var4, class128.Client_plane, var7, var8, var9, false, var31.renderable1); // L: 7784 + } + } + } + + if (var5 == 1) { // L: 7787 + WallDecoration var40 = class175.scene.method4049(class128.Client_plane, var7, var8); // L: 7788 + if (var40 != null) { // L: 7789 + var11 = NetSocket.Entity_unpackID(var40.tag); // L: 7790 + if (var3 != 4 && var3 != 5) { // L: 7791 + if (var3 == 6) { // L: 7792 + var40.renderable1 = new DynamicObject(var11, 4, var4 + 4, class128.Client_plane, var7, var8, var9, false, var40.renderable1); + } else if (var3 == 7) { // L: 7793 + var40.renderable1 = new DynamicObject(var11, 4, (var4 + 2 & 3) + 4, class128.Client_plane, var7, var8, var9, false, var40.renderable1); + } else if (var3 == 8) { // L: 7794 + var40.renderable1 = new DynamicObject(var11, 4, var4 + 4, class128.Client_plane, var7, var8, var9, false, var40.renderable1); // L: 7795 + var40.renderable2 = new DynamicObject(var11, 4, (var4 + 2 & 3) + 4, class128.Client_plane, var7, var8, var9, false, var40.renderable2); // L: 7796 + } + } else { + var40.renderable1 = new DynamicObject(var11, 4, var4, class128.Client_plane, var7, var8, var9, false, var40.renderable1); + } + } + } + + if (var5 == 2) { // L: 7800 + GameObject var41 = class175.scene.getGameObject(class128.Client_plane, var7, var8); // L: 7801 + if (var3 == 11) { // L: 7802 + var3 = 10; + } + + if (var41 != null) { // L: 7803 + var41.renderable = new DynamicObject(NetSocket.Entity_unpackID(var41.tag), var3, var4, class128.Client_plane, var7, var8, var9, false, var41.renderable); + } + } + + if (var5 == 3) { // L: 7805 + FloorDecoration var42 = class175.scene.getFloorDecoration(class128.Client_plane, var7, var8); // L: 7806 + if (var42 != null) { // L: 7807 + var42.renderable = new DynamicObject(NetSocket.Entity_unpackID(var42.tag), 22, var4, class128.Client_plane, var7, var8, var9, false, var42.renderable); + } + } + } + + } + } + } + } // L: 7585 7599 7622 7644 7657 7672 7699 7810 7812 } diff --git a/runescape-client/src/main/java/OtlTokenRequester.java b/runescape-client/src/main/java/OtlTokenRequester.java index b462a86b4e..c632131e17 100644 --- a/runescape-client/src/main/java/OtlTokenRequester.java +++ b/runescape-client/src/main/java/OtlTokenRequester.java @@ -1,10 +1,11 @@ +package com.jagex.oldscape.pub; + import java.net.URL; +import java.util.Map; import java.util.concurrent.Future; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; @Implements("OtlTokenRequester") -@ObfuscatedName("com/jagex/oldscape/pub/OtlTokenRequester") public interface OtlTokenRequester { - Future request(URL var1); + Future request(String var1, URL var2, Map var3, String var4); } diff --git a/runescape-client/src/main/java/OtlTokenResponse.java b/runescape-client/src/main/java/OtlTokenResponse.java index c9d8c31c0b..98c3bc8f47 100644 --- a/runescape-client/src/main/java/OtlTokenResponse.java +++ b/runescape-client/src/main/java/OtlTokenResponse.java @@ -2,9 +2,11 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @Implements("OtlTokenResponse") -@ObfuscatedName("com/jagex/oldscape/pub/OtlTokenResponse") +@ObfuscatedName("com/jagex/oldscape/pub/RefreshAccessTokenResponse") public interface OtlTokenResponse { boolean isSuccess(); - String getToken(); + String getAccessToken(); + + String getRefreshToken(); } diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index f512218bd8..e5608d4cf5 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -4,86 +4,86 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pz") +@ObfuscatedName("pc") @Implements("PacketBuffer") public class PacketBuffer extends Buffer { - @ObfuscatedName("c") - static final int[] field4614; - @ObfuscatedName("v") + @ObfuscatedName("q") + static final int[] field4675; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lqv;" + descriptor = "Lqh;" ) @Export("isaacCipher") IsaacCipher isaacCipher; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -835561769 + intValue = 1367739327 ) @Export("bitIndex") int bitIndex; static { - field4614 = 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 + field4675 = 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("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([II)V", - garbageValue = "1339442514" + descriptor = "([IB)V", + garbageValue = "36" ) @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { this.isaacCipher = new IsaacCipher(var1); // L: 15 } // L: 16 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lqv;I)V", - garbageValue = "1028615537" + descriptor = "(Lqh;I)V", + garbageValue = "-1716220711" ) @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { this.isaacCipher = var1; // L: 19 } // L: 20 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1238591858" + descriptor = "(IB)V", + garbageValue = "9" ) @Export("writeByteIsaac") public void writeByteIsaac(int var1) { super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); // L: 23 } // L: 24 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "115676548" + descriptor = "(B)I", + garbageValue = "88" ) @Export("readByteIsaac") public int readByteIsaac() { return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 27 } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "15461355" + garbageValue = "1904848037" ) - public boolean method7622() { - int var1 = super.array[super.offset] - this.isaacCipher.method8224() & 255; // L: 31 + public boolean method7495() { + int var1 = super.array[super.offset] - this.isaacCipher.method8108() & 255; // L: 31 return var1 >= 128; // L: 32 } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1913551705" + garbageValue = "-1838826462" ) @Export("readSmartByteShortIsaac") public int readSmartByteShortIsaac() { @@ -91,32 +91,32 @@ public class PacketBuffer extends Buffer { return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); // L: 38 39 } - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "([BIIB)V", - garbageValue = "60" + garbageValue = "102" ) - public void method7624(byte[] var1, int var2, int var3) { + public void method7460(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("l") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1261988260" + garbageValue = "257249853" ) @Export("importIndex") public void importIndex() { this.bitIndex = super.offset * 8; // L: 47 } // L: 48 - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "4" + descriptor = "(II)I", + garbageValue = "1769393200" ) @Export("readBits") public int readBits(int var1) { @@ -125,33 +125,33 @@ public class PacketBuffer extends Buffer { int var4 = 0; // L: 53 for (this.bitIndex += var1; var1 > var3; var3 = 8) { // L: 54 55 58 - var4 += (super.array[var2++] & field4614[var3]) << var1 - var3; // L: 56 + var4 += (super.array[var2++] & field4675[var3]) << var1 - var3; // L: 56 var1 -= var3; // L: 57 } if (var3 == var1) { // L: 60 - var4 += super.array[var2] & field4614[var3]; + var4 += super.array[var2] & field4675[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & field4614[var1]; // L: 61 + var4 += super.array[var2] >> var3 - var1 & field4675[var1]; // L: 61 } return var4; // L: 62 } - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1395113017" + descriptor = "(B)V", + garbageValue = "103" ) @Export("exportIndex") public void exportIndex() { super.offset = (this.bitIndex + 7) / 8; // L: 66 } // L: 67 - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1194786841" + garbageValue = "-2036713962" ) @Export("bitsRemaining") public int bitsRemaining(int var1) { diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index f0f1762d6e..7ea609e9b8 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -4,42 +4,47 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jd") +@ObfuscatedName("jm") @Implements("PacketBufferNode") public class PacketBufferNode extends Node { - @ObfuscatedName("b") + @ObfuscatedName("tc") + @ObfuscatedGetter( + intValue = -1437445359 + ) + static int field3083; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "[Ljd;" + descriptor = "[Ljm;" ) @Export("PacketBufferNode_packetBufferNodes") - public static PacketBufferNode[] PacketBufferNode_packetBufferNodes; - @ObfuscatedName("n") + static PacketBufferNode[] PacketBufferNode_packetBufferNodes; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 294123919 + intValue = 1074664569 ) @Export("PacketBufferNode_packetBufferNodeCount") - public static int PacketBufferNode_packetBufferNodeCount; - @ObfuscatedName("v") + static int PacketBufferNode_packetBufferNodeCount; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljj;" ) @Export("clientPacket") - public ClientPacket clientPacket; - @ObfuscatedName("c") + ClientPacket clientPacket; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -147579925 + intValue = 974252711 ) @Export("clientPacketLength") - public int clientPacketLength; - @ObfuscatedName("i") + int clientPacketLength; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lpz;" + descriptor = "Lpc;" ) @Export("packetBuffer") public PacketBuffer packetBuffer; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 843582305 + intValue = 1838555649 ) @Export("index") public int index; @@ -49,45 +54,49 @@ public class PacketBufferNode extends Node { PacketBufferNode_packetBufferNodeCount = 0; // L: 14 } - @ObfuscatedName("c") + PacketBufferNode() { + } // L: 19 + + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2142638680" + descriptor = "(S)V", + garbageValue = "11589" ) @Export("release") public void release() { - if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 45 - PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 46 + if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 50 + PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 51 } - } // L: 47 + } // L: 52 - @ObfuscatedName("n") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1834860972" + descriptor = "([BIIII[Lgh;I)V", + garbageValue = "-148866965" ) - public static boolean method5187(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false; // L: 241 242 - } - - @ObfuscatedName("ho") - @ObfuscatedSignature( - descriptor = "(Lcz;I)Z", - garbageValue = "71882365" - ) - static boolean method5188(Player var0) { - if (Client.drawPlayerNames == 0) { // L: 4861 - return false; - } else if (GrandExchangeEvents.localPlayer == var0) { // L: 4862 - return class6.method36(); // L: 4873 - } else { - boolean var1 = NPCComposition.method3531() || Varcs.method2441() && var0.isFriend(); // L: 4863 - if (!var1) { // L: 4864 - boolean var2 = (Client.drawPlayerNames & 2) != 0; // L: 4867 - var1 = var2 && var0.isFriendsChatMember(); // L: 4869 + static final void method5009(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { + int var7; + int var8; + for (int var6 = 0; var6 < 4; ++var6) { // L: 93 + for (var7 = 0; var7 < 64; ++var7) { // L: 94 + for (var8 = 0; var8 < 64; ++var8) { // L: 95 + if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { // L: 96 + int[] var10000 = var5[var6].flags[var7 + var1]; + var10000[var8 + var2] &= -16777217; + } + } } - - return var1; // L: 4871 } - } + + Buffer var10 = new Buffer(var0); // L: 100 + + for (var7 = 0; var7 < 4; ++var7) { // L: 101 + for (var8 = 0; var8 < 64; ++var8) { // L: 102 + for (int var9 = 0; var9 < 64; ++var9) { // L: 103 + class67.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); // L: 104 + } + } + } + + } // L: 108 } diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index 7c585f3982..4060a37980 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -5,85 +5,85 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cl") +@ObfuscatedName("cz") @Implements("PacketWriter") public class PacketWriter { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lny;" + descriptor = "Lnf;" ) @Export("socket") AbstractSocket socket; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Llk;" + descriptor = "Llo;" ) @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -669543133 + intValue = -644004197 ) @Export("bufferSize") int bufferSize; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lpi;" + descriptor = "Lpx;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lqv;" + descriptor = "Lqh;" ) @Export("isaacCipher") public IsaacCipher isaacCipher; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lpz;" + descriptor = "Lpc;" ) @Export("packetBuffer") PacketBuffer packetBuffer; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) @Export("serverPacket") ServerPacket serverPacket; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 365925591 + intValue = -1393417271 ) @Export("serverPacketLength") int serverPacketLength; - @ObfuscatedName("q") - boolean field1317; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -11589615 - ) - int field1322; @ObfuscatedName("r") + boolean field1348; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1829594601 + intValue = 2050999841 + ) + int field1349; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 1635279751 ) @Export("pendingWrites") int pendingWrites; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) - ServerPacket field1324; + ServerPacket field1351; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) - ServerPacket field1325; - @ObfuscatedName("k") + ServerPacket field1340; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) - ServerPacket field1313; + ServerPacket field1345; PacketWriter() { this.packetBufferNodes = new IterableNodeDeque(); // L: 15 @@ -91,16 +91,16 @@ public class PacketWriter { this.buffer = new Buffer(5000); // L: 17 this.packetBuffer = new PacketBuffer(40000); // L: 19 this.serverPacket = null; // L: 20 - this.serverPacketLength = 0; - this.field1317 = true; // L: 22 - this.field1322 = 0; // L: 23 + this.serverPacketLength = 0; // L: 21 + this.field1348 = true; // L: 22 + this.field1349 = 0; // L: 23 this.pendingWrites = 0; // L: 24 } // L: 29 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-114" + descriptor = "(I)V", + garbageValue = "-564347144" ) @Export("clearBuffer") final void clearBuffer() { @@ -108,10 +108,10 @@ public class PacketWriter { this.bufferSize = 0; // L: 33 } // L: 34 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1641157190" + garbageValue = "-1796136378" ) @Export("flush") final void flush() throws IOException { @@ -136,10 +136,10 @@ public class PacketWriter { } // L: 52 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljd;I)V", - garbageValue = "-1704102815" + descriptor = "(Ljm;B)V", + garbageValue = "0" ) @Export("addNode") public final void addNode(PacketBufferNode var1) { @@ -149,20 +149,20 @@ public class PacketWriter { this.bufferSize += var1.index; // L: 58 } // L: 59 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lny;I)V", - garbageValue = "1949084856" + descriptor = "(Lnf;I)V", + garbageValue = "1112545790" ) @Export("setSocket") void setSocket(AbstractSocket var1) { this.socket = var1; // L: 62 } // L: 63 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-600547113" + garbageValue = "-658822811" ) @Export("close") void close() { @@ -173,50 +173,145 @@ public class PacketWriter { } // L: 70 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "0" + garbageValue = "92" ) @Export("removeSocket") void removeSocket() { this.socket = null; // L: 73 } // L: 74 - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)Lny;", - garbageValue = "1980129228" + descriptor = "(S)Lnf;", + garbageValue = "255" ) @Export("getSocket") AbstractSocket getSocket() { return this.socket; // L: 77 } - @ObfuscatedName("f") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "948804767" + descriptor = "(IIIIIZB)Lqr;", + garbageValue = "5" ) - public static boolean method2498(int var0) { - return (var0 >> 21 & 1) != 0; // L: 21 - } + @Export("getItemSprite") + public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { + if (var1 == -1) { // L: 357 + var4 = 0; + } else if (var4 == 2 && var1 != 1) { // L: 358 + var4 = 1; + } - @ObfuscatedName("kr") - @ObfuscatedSignature( - descriptor = "(Lky;IIII)V", - garbageValue = "-2050353968" - ) - @Export("drawCompass") - static final void drawCompass(Widget var0, int var1, int var2, int var3) { - SpriteMask var4 = var0.getSpriteMask(false); // L: 12305 - if (var4 != null) { // L: 12306 - if (Client.minimapState < 3) { // L: 12307 - class14.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: 12308 + long var6 = ((long)var3 << 42) + ((long)var1 << 16) + (long)var0 + ((long)var2 << 38) + ((long)var4 << 40); // L: 359 + SpritePixels var8; + if (!var5) { // L: 361 + var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); // L: 362 + if (var8 != null) { // L: 363 + return var8; + } + } + + ItemComposition var9 = FileSystem.ItemDefinition_get(var0); // L: 365 + if (var1 > 1 && var9.countobj != null) { // L: 366 + int var10 = -1; // L: 367 + + for (int var11 = 0; var11 < 10; ++var11) { // L: 368 + if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 369 + var10 = var9.countobj[var11]; + } } + if (var10 != -1) { // L: 371 + var9 = FileSystem.ItemDefinition_get(var10); + } } - } // L: 12309 + + Model var19 = var9.getModel(1); // L: 373 + if (var19 == null) { // L: 374 + return null; + } else { + SpritePixels var20 = null; // L: 375 + if (var9.noteTemplate != -1) { // L: 376 + var20 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 377 + if (var20 == null) { // L: 378 + return null; + } + } else if (var9.notedId != -1) { // L: 380 + var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 381 + if (var20 == null) { // L: 382 + return null; + } + } else if (var9.placeholderTemplate != -1) { // L: 384 + var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 385 + if (var20 == null) { // L: 386 + return null; + } + } + + int[] var12 = Rasterizer2D.Rasterizer2D_pixels; // L: 388 + int var13 = Rasterizer2D.Rasterizer2D_width; // L: 389 + int var14 = Rasterizer2D.Rasterizer2D_height; // L: 390 + int[] var15 = new int[4]; // L: 391 + Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 392 + var8 = new SpritePixels(36, 32); // L: 393 + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 394 + Rasterizer2D.Rasterizer2D_clear(); // L: 395 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 396 + Rasterizer3D.method3939(16, 16); // L: 397 + Rasterizer3D.field2379 = false; // L: 398 + if (var9.placeholderTemplate != -1) { // L: 399 + var20.drawTransBgAt(0, 0); + } + + int var16 = var9.zoom2d; // L: 400 + if (var5) { // L: 401 + var16 = (int)((double)var16 * 1.5D); + } else if (var2 == 2) { // L: 402 + var16 = (int)(1.04D * (double)var16); + } + + int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 403 + int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 404 + var19.calculateBoundsCylinder(); // L: 405 + var19.method4272(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 406 + if (var9.notedId != -1) { // L: 407 + var20.drawTransBgAt(0, 0); + } + + if (var2 >= 1) { // L: 408 + var8.outline(1); + } + + if (var2 >= 2) { // L: 409 + var8.outline(16777215); + } + + if (var3 != 0) { // L: 410 + var8.shadow(var3); + } + + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 411 + if (var9.noteTemplate != -1) { // L: 412 + var20.drawTransBgAt(0, 0); + } + + if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 413 + class146.ItemDefinition_fontPlain11.draw(class301.method5583(var1), 0, 9, 16776960, 1); // L: 414 + } + + if (!var5) { // L: 416 + ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); + } + + Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 417 + Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 418 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 419 + Rasterizer3D.field2379 = true; // L: 420 + return var8; // L: 421 + } + } } diff --git a/runescape-client/src/main/java/ParamComposition.java b/runescape-client/src/main/java/ParamComposition.java index 2f7d984044..267992783f 100644 --- a/runescape-client/src/main/java/ParamComposition.java +++ b/runescape-client/src/main/java/ParamComposition.java @@ -4,45 +4,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gn") +@ObfuscatedName("gv") @Implements("ParamComposition") public class ParamComposition extends DualNode { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("ParamDefinition_archive") - public static AbstractArchive ParamDefinition_archive; - @ObfuscatedName("c") + static AbstractArchive ParamDefinition_archive; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("ParamDefinition_cached") public static EvictingDualNodeHashTable ParamDefinition_cached; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lmd;" - ) - @Export("ItemDefinition_fontPlain11") - static Font ItemDefinition_fontPlain11; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lqq;" - ) - static IndexedSprite field1983; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("type") char type; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1031818341 + intValue = 498498589 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("autoDisable") boolean autoDisable; @@ -54,116 +43,102 @@ public class ParamComposition extends DualNode { this.autoDisable = true; // L: 16 } // L: 18 - @ObfuscatedName("c") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "32" + garbageValue = "20" ) @Export("postDecode") void postDecode() { - } // L: 31 + } // L: 35 - @ObfuscatedName("i") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-31" + descriptor = "(Lpx;I)V", + garbageValue = "892504749" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 35 - if (var2 == 0) { // L: 36 - return; // L: 39 + int var2 = var1.readUnsignedByte(); // L: 39 + if (var2 == 0) { // L: 40 + return; // L: 43 } - this.decodeNext(var1, var2); // L: 37 + this.decodeNext(var1, var2); // L: 41 } } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-1270383692" + descriptor = "(Lpx;IS)V", + garbageValue = "-13" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 42 - this.type = class293.method5600(var1.readByte()); // L: 43 - } else if (var2 == 2) { // L: 45 + if (var2 == 1) { // L: 46 + byte var4 = var1.readByte(); // L: 48 + int var5 = var4 & 255; // L: 50 + if (var5 == 0) { // L: 51 + throw new IllegalArgumentException("" + Integer.toString(var5, 16)); + } + + if (var5 >= 128 && var5 < 160) { // L: 52 + char var6 = class341.cp1252AsciiExtension[var5 - 128]; // L: 53 + if (var6 == 0) { // L: 54 + var6 = '?'; + } + + var5 = var6; // L: 55 + } + + char var3 = (char)var5; // L: 57 + this.type = var3; // L: 59 + } else if (var2 == 2) { // L: 61 this.defaultInt = var1.readInt(); - } else if (var2 == 4) { - this.autoDisable = false; // L: 46 - } else if (var2 == 5) { // L: 47 + } else if (var2 == 4) { // L: 62 + this.autoDisable = false; + } else if (var2 == 5) { // L: 63 this.defaultStr = var1.readStringCp1252NullTerminated(); } - } // L: 49 + } // L: 65 - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" + descriptor = "(I)Z", + garbageValue = "-1184003682" ) @Export("isString") public boolean isString() { - return this.type == 's'; // L: 52 + return this.type == 's'; // L: 68 } - @ObfuscatedName("b") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-665269599" + descriptor = "(III)I", + garbageValue = "-1438279365" ) - public static boolean method3596(int var0) { - return (var0 >> 22 & 1) != 0; // L: 25 - } - - @ObfuscatedName("jv") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "-83" - ) - @Export("formatItemStacks") - static final String formatItemStacks(int var0) { - String var1 = Integer.toString(var0); // L: 10753 - - for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 10754 - var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 10755 - } - - if (var1.length() > 9) { // L: 10757 - return " " + UserComparator9.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; - } else { - return var1.length() > 6 ? " " + UserComparator9.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + UserComparator9.colorStartTag(16776960) + var1 + ""; // L: 10758 10759 - } - } - - @ObfuscatedName("ki") - @ObfuscatedSignature( - descriptor = "(Lky;IIS)V", - garbageValue = "180" - ) - @Export("clickWidget") - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 11753 - if (var0 != null && FriendLoginUpdate.method6686(var0) != null) { // L: 11754 - Client.clickedWidget = var0; // L: 11755 - Client.clickedWidgetParent = FriendLoginUpdate.method6686(var0); // L: 11756 - Client.widgetClickX = var1; // L: 11757 - Client.widgetClickY = var2; // L: 11758 - class124.widgetDragDuration = 0; // L: 11759 - Client.isDraggingWidget = false; // L: 11760 - int var3 = GameBuild.method5773(); // L: 11761 - if (var3 != -1) { // L: 11762 - Interpreter.tempMenuAction = new MenuAction(); // L: 11763 - Interpreter.tempMenuAction.param0 = Client.menuArguments1[var3]; // L: 11764 - Interpreter.tempMenuAction.param1 = Client.menuArguments2[var3]; // L: 11765 - Interpreter.tempMenuAction.opcode = Client.menuOpcodes[var3]; // L: 11766 - Interpreter.tempMenuAction.identifier = Client.menuIdentifiers[var3]; // L: 11767 - Interpreter.tempMenuAction.action = Client.menuActions[var3]; // L: 11768 - } - + static final int method3505(int var0, int var1) { + if (var0 == -2) { // L: 977 + return 12345678; + } else if (var0 == -1) { // L: 978 + if (var1 < 2) { // L: 979 + var1 = 2; + } else if (var1 > 126) { // L: 980 + var1 = 126; } + + return var1; // L: 981 + } else { + var1 = (var0 & 127) * var1 / 128; // L: 983 + if (var1 < 2) { // L: 984 + var1 = 2; + } else if (var1 > 126) { // L: 985 + var1 = 126; + } + + return (var0 & 65408) + var1; // L: 986 } - } // L: 11770 + } } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index ca55a0e0b2..5e3df2f2a6 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -1,338 +1,339 @@ -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("ay") +@ObfuscatedName("al") @Implements("PcmPlayer") public class PcmPlayer { - @ObfuscatedName("tf") - @ObfuscatedGetter( - intValue = -1674990359 - ) - static int field294; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -100861485 - ) - public static int field268; - @ObfuscatedName("n") - @Export("PcmPlayer_stereo") - protected static boolean PcmPlayer_stereo; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -876322285 - ) - static int field295; - @ObfuscatedName("ax") - @Export("garbageCollector") - static GarbageCollectorMXBean garbageCollector; - @ObfuscatedName("iw") + @ObfuscatedName("rg") @ObfuscatedSignature( - descriptor = "[Lqq;" + descriptor = "Lnx;" ) - @Export("modIconSprites") - static IndexedSprite[] modIconSprites; - @ObfuscatedName("k") + @Export("friendsChat") + static FriendsChat friendsChat; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -1724087219 + ) + public static int field300; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lai;" + ) + @Export("pcmPlayerProvider") + public static class47 pcmPlayerProvider; + @ObfuscatedName("lg") + @ObfuscatedSignature( + descriptor = "Lht;" + ) + @Export("textureProvider") + static TextureProvider textureProvider; + @ObfuscatedName("np") + @ObfuscatedGetter( + intValue = 2000163897 + ) + @Export("selectedItemSlot") + static int selectedItemSlot; + @ObfuscatedName("b") @Export("samples") protected int[] samples; - @ObfuscatedName("d") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Laf;" + descriptor = "Lao;" ) @Export("stream") PcmStream stream; - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 219086691 + intValue = -340177369 ) - int field292; - @ObfuscatedName("u") + int field284; + @ObfuscatedName("x") @ObfuscatedGetter( - longValue = 7132959178591486869L + longValue = 5049222240699791159L ) @Export("timeMs") long timeMs; - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1707278451 + intValue = 579110347 ) @Export("capacity") int capacity; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 918986377 - ) - int field289; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1421867195 - ) - int field279; - @ObfuscatedName("a") - @ObfuscatedGetter( - longValue = 9027155764200073789L - ) - long field280; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -742253307 - ) - int field281; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -220533853 - ) - int field275; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -220706099 + intValue = 1078400585 ) - int field283; + int field287; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -1185294269 + ) + int field288; + @ObfuscatedName("f") + @ObfuscatedGetter( + longValue = 6299016637519592913L + ) + long field289; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -1779244015 + ) + int field294; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 757484531 + ) + int field282; @ObfuscatedName("z") @ObfuscatedGetter( - longValue = -5317730937569531851L + intValue = 15281057 ) - long field284; - @ObfuscatedName("h") - boolean field285; - @ObfuscatedName("ao") + int field292; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -473229249 + longValue = -315826732775221247L ) - int field277; + long field293; + @ObfuscatedName("u") + boolean field281; @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "[Laf;" + @ObfuscatedGetter( + intValue = -1579013191 ) - PcmStream[] field272; - @ObfuscatedName("al") + int field295; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "[Laf;" + descriptor = "[Lao;" ) - PcmStream[] field290; + PcmStream[] field296; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "[Lao;" + ) + PcmStream[] field297; protected PcmPlayer() { - this.field292 = 32; // L: 22 - this.timeMs = class136.method2931(); // L: 23 - this.field280 = 0L; // L: 27 - this.field281 = 0; // L: 28 - this.field275 = 0; // L: 29 - this.field283 = 0; // L: 30 - this.field284 = 0L; // L: 31 - this.field285 = true; // L: 32 - this.field277 = 0; // L: 38 - this.field272 = new PcmStream[8]; // L: 39 - this.field290 = new PcmStream[8]; // L: 40 + this.field284 = 32; // L: 22 + this.timeMs = class113.method2624(); // L: 23 + this.field289 = 0L; // L: 27 + this.field294 = 0; // L: 28 + this.field282 = 0; // L: 29 + this.field292 = 0; // L: 30 + this.field293 = 0L; // L: 31 + this.field281 = true; // L: 32 + this.field295 = 0; // L: 38 + this.field296 = new PcmStream[8]; // L: 39 + this.field297 = new PcmStream[8]; // L: 40 } // L: 42 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-843995592" + garbageValue = "-125708948" ) @Export("init") protected void init() throws Exception { } // L: 280 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1651380399" + descriptor = "(IS)V", + garbageValue = "-30840" ) @Export("open") protected void open(int var1) throws Exception { } // L: 281 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "244839095" + descriptor = "(S)I", + garbageValue = "181" ) @Export("position") protected int position() throws Exception { return this.capacity; // L: 284 } - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("write") protected void write() throws Exception { } // L: 287 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1662003992" + descriptor = "(B)V", + garbageValue = "25" ) @Export("close") protected void close() { } // L: 288 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1137884684" + garbageValue = "207475579" ) @Export("discard") protected void discard() throws Exception { } // L: 289 - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Laf;I)V", - garbageValue = "-1433712556" + descriptor = "(Lao;I)V", + garbageValue = "1991751814" ) @Export("setStream") public final synchronized void setStream(PcmStream var1) { this.stream = var1; // L: 79 - } + } // L: 80 - @ObfuscatedName("z") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-941854175" + garbageValue = "631128625" ) @Export("run") public final synchronized void run() { - if (this.samples != null) { - long var1 = class136.method2931(); + if (this.samples != null) { // L: 83 + long var1 = class113.method2624(); // L: 84 try { - if (this.field280 != 0L) { - if (var1 < this.field280) { + if (this.field289 != 0L) { // L: 86 + if (var1 < this.field289) { // L: 87 return; } - this.open(this.capacity); - this.field280 = 0L; - this.field285 = true; + this.open(this.capacity); // L: 88 + this.field289 = 0L; // L: 89 + this.field281 = true; // L: 90 } - int var3 = this.position(); - if (this.field283 - var3 > this.field281) { - this.field281 = this.field283 - var3; + int var3 = this.position(); // L: 92 + if (this.field292 - var3 > this.field294) { // L: 93 + this.field294 = this.field292 - var3; } - int var4 = this.field279 + this.field289; - if (var4 + 256 > 16384) { + int var4 = this.field287 + this.field288; // L: 94 + if (var4 + 256 > 16384) { // L: 95 var4 = 16128; } - if (var4 + 256 > this.capacity) { - this.capacity += 1024; - if (this.capacity > 16384) { + if (var4 + 256 > this.capacity) { // L: 96 + this.capacity += 1024; // L: 97 + if (this.capacity > 16384) { // L: 98 this.capacity = 16384; } - this.close(); - this.open(this.capacity); - var3 = 0; - this.field285 = true; // L: 102 + this.close(); // L: 99 + this.open(this.capacity); // L: 100 + var3 = 0; // L: 101 + this.field281 = true; // L: 102 if (var4 + 256 > this.capacity) { // L: 103 var4 = this.capacity - 256; // L: 104 - this.field279 = var4 - this.field289; + this.field288 = var4 - this.field287; // L: 105 } } - while (var3 < var4) { - this.fill(this.samples, 256); - this.write(); - var3 += 256; + while (var3 < var4) { // L: 108 + this.fill(this.samples, 256); // L: 109 + this.write(); // L: 110 + var3 += 256; // L: 111 } - if (var1 > this.field284) { - if (!this.field285) { - if (this.field281 == 0 && this.field275 == 0) { + if (var1 > this.field293) { + if (!this.field281) { + if (this.field294 == 0 && this.field282 == 0) { this.close(); - this.field280 = var1 + 2000L; // L: 117 + this.field289 = 2000L + var1; return; } - this.field279 = Math.min(this.field275, this.field281); // L: 120 - this.field275 = this.field281; // L: 121 + this.field288 = Math.min(this.field282, this.field294); + this.field282 = this.field294; } else { - this.field285 = false; // L: 123 + this.field281 = false; } - this.field281 = 0; // L: 124 - this.field284 = 2000L + var1; // L: 125 + this.field294 = 0; + this.field293 = var1 + 2000L; } - this.field283 = var3; // L: 127 - } catch (Exception var7) { // L: 129 - this.close(); // L: 130 - this.field280 = 2000L + var1; // L: 131 + this.field292 = var3; + } catch (Exception var7) { + this.close(); + this.field289 = 2000L + var1; } try { - if (var1 > 500000L + this.timeMs) { // L: 134 + if (var1 > this.timeMs + 500000L) { // L: 134 var1 = this.timeMs; } while (var1 > 5000L + this.timeMs) { // L: 135 - this.skip(256); // L: 136 - this.timeMs += (long)(256000 / field268); // L: 137 + this.skip(256); + this.timeMs += (long)(256000 / field300); } - } catch (Exception var6) { // L: 140 - this.timeMs = var1; // L: 141 + } catch (Exception var6) { + this.timeMs = var1; } } - } // L: 143 + } - @ObfuscatedName("h") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1721057511" + garbageValue = "2012802257" ) - public final void method690() { - this.field285 = true; // L: 146 - } // L: 147 + public final void method739() { + this.field281 = true; + } - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1697875178" + garbageValue = "1905716699" ) @Export("tryDiscard") public final synchronized void tryDiscard() { - this.field285 = true; // L: 150 + this.field281 = true; try { this.discard(); // L: 152 } catch (Exception var2) { // L: 154 this.close(); // L: 155 - this.field280 = class136.method2931() + 2000L; // L: 156 + this.field289 = class113.method2624() + 2000L; // L: 156 } } // L: 158 - @ObfuscatedName("aq") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "1" + garbageValue = "26" ) @Export("shutdown") public final synchronized void shutdown() { - if (class6.soundSystem != null) { // L: 161 + if (MusicPatchPcmStream.soundSystem != null) { // L: 161 boolean var1 = true; // L: 162 for (int var2 = 0; var2 < 2; ++var2) { // L: 163 - if (this == class6.soundSystem.players[var2]) { - class6.soundSystem.players[var2] = null; // L: 164 + if (this == MusicPatchPcmStream.soundSystem.players[var2]) { + MusicPatchPcmStream.soundSystem.players[var2] = null; // L: 164 } - if (class6.soundSystem.players[var2] != null) { // L: 165 + if (MusicPatchPcmStream.soundSystem.players[var2] != null) { // L: 165 var1 = false; } } if (var1) { // L: 167 - WorldMapSection1.soundSystemExecutor.shutdownNow(); // L: 168 - WorldMapSection1.soundSystemExecutor = null; // L: 169 - class6.soundSystem = null; // L: 170 + InterfaceParent.soundSystemExecutor.shutdownNow(); // L: 168 + InterfaceParent.soundSystemExecutor = null; // L: 169 + MusicPatchPcmStream.soundSystem = null; // L: 170 } } @@ -340,16 +341,16 @@ public class PcmPlayer { this.samples = null; // L: 174 } // L: 175 - @ObfuscatedName("aw") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "2048" + descriptor = "(II)V", + garbageValue = "1357307630" ) @Export("skip") final void skip(int var1) { - this.field277 -= var1; // L: 178 - if (this.field277 < 0) { - this.field277 = 0; // L: 179 + this.field295 -= var1; // L: 178 + if (this.field295 < 0) { + this.field295 = 0; // L: 179 } if (this.stream != null) { @@ -358,20 +359,20 @@ public class PcmPlayer { } // L: 181 - @ObfuscatedName("am") + @ObfuscatedName("ac") @Export("fill") final void fill(int[] var1, int var2) { int var3 = var2; // L: 185 - if (PcmPlayer_stereo) { // L: 186 + if (ArchiveDiskAction.PcmPlayer_stereo) { // L: 186 var3 = var2 << 1; } - class350.clearIntArray(var1, 0, var3); // L: 187 - this.field277 -= var2; // L: 188 - if (this.stream != null && this.field277 <= 0) { // L: 189 - this.field277 += field268 >> 4; // L: 190 - class296.PcmStream_disable(this.stream); // L: 191 - this.method695(this.stream, this.stream.vmethod962()); // L: 192 + class351.clearIntArray(var1, 0, var3); // L: 187 + this.field295 -= var2; // L: 188 + if (this.stream != null && this.field295 <= 0) { // L: 189 + this.field295 += field300 >> 4; // L: 190 + World.PcmStream_disable(this.stream); // L: 191 + this.method700(this.stream, this.stream.vmethod951()); // L: 192 int var4 = 0; // L: 193 int var5 = 255; // L: 194 @@ -393,7 +394,7 @@ public class PcmPlayer { if ((var9 & 1) != 0) { // L: 211 var5 &= ~(1 << var7); // L: 214 var10 = null; // L: 215 - PcmStream var11 = this.field272[var7]; // L: 216 + PcmStream var11 = this.field296[var7]; // L: 216 label102: while (true) { @@ -409,33 +410,33 @@ public class PcmPlayer { var11 = var11.after; // L: 222 } else { var11.active = true; // L: 225 - int var13 = var11.vmethod5441(); // L: 226 + int var13 = var11.vmethod5295(); // L: 226 var4 += var13; // L: 227 - if (var12 != null) { // L: 228 - var12.position += var13; + if (var12 != null) { + var12.position += var13; // L: 228 } - if (var4 >= this.field292) { // L: 229 + if (var4 >= this.field284) { // L: 229 break label108; } PcmStream var14 = var11.firstSubStream(); // L: 230 if (var14 != null) { // L: 231 - for (int var15 = var11.field343; var14 != null; var14 = var11.nextSubStream()) { // L: 232 233 235 - this.method695(var14, var15 * var14.vmethod962() >> 8); // L: 234 + for (int var15 = var11.field348; var14 != null; var14 = var11.nextSubStream()) { // L: 232 233 235 + this.method700(var14, var15 * var14.vmethod951() >> 8); // L: 234 } } PcmStream var18 = var11.after; // L: 238 var11.after = null; // L: 239 if (var10 == null) { // L: 240 - this.field272[var7] = var18; + this.field296[var7] = var18; } else { var10.after = var18; // L: 241 } if (var18 == null) { // L: 242 - this.field290[var7] = var10; + this.field297[var7] = var10; } var11 = var18; // L: 243 @@ -450,9 +451,9 @@ public class PcmPlayer { } for (var6 = 0; var6 < 8; ++var6) { // L: 247 - PcmStream var16 = this.field272[var6]; // L: 248 - PcmStream[] var17 = this.field272; // L: 249 - this.field290[var6] = null; // L: 251 + PcmStream var16 = this.field296[var6]; // L: 248 + PcmStream[] var17 = this.field296; // L: 249 + this.field297[var6] = null; // L: 251 for (var17[var6] = null; var16 != null; var16 = var10) { // L: 252 253 256 var10 = var16.after; // L: 254 @@ -461,98 +462,342 @@ public class PcmPlayer { } } - if (this.field277 < 0) { // L: 260 - this.field277 = 0; + if (this.field295 < 0) { // L: 260 + this.field295 = 0; } if (this.stream != null) { this.stream.fill(var1, 0, var2); // L: 261 } - this.timeMs = class136.method2931(); // L: 262 + this.timeMs = class113.method2624(); // L: 262 } // L: 263 - @ObfuscatedName("ao") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Laf;IS)V", - garbageValue = "195" + descriptor = "(Lao;IB)V", + garbageValue = "52" ) - final void method695(PcmStream var1, int var2) { + final void method700(PcmStream var1, int var2) { int var3 = var2 >> 5; // L: 272 - PcmStream var4 = this.field290[var3]; // L: 273 + PcmStream var4 = this.field297[var3]; // L: 273 if (var4 == null) { // L: 274 - this.field272[var3] = var1; + this.field296[var3] = var1; } else { var4.after = var1; // L: 275 } - this.field290[var3] = var1; // L: 276 - var1.field343 = var2; // L: 277 + this.field297[var3] = var1; // L: 276 + var1.field348 = var2; // L: 277 } // L: 278 - @ObfuscatedName("f") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([BI)Lbd;", - garbageValue = "1634234442" + descriptor = "(III)I", + garbageValue = "-706080799" + ) + public static int method744(int var0, int var1) { + return (var0 << 8) + var1; // L: 13 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1739109574" + ) + static void method753() { + Tiles.Tiles_underlays = null; // L: 64 + Tiles.Tiles_overlays = null; // L: 65 + Tiles.Tiles_shapes = null; // L: 66 + RunException.field4812 = null; // L: 67 + VerticalAlignment.field1993 = null; // L: 68 + NPC.field1259 = null; // L: 69 + Interpreter.field839 = null; // L: 70 + class154.Tiles_hue = null; // L: 71 + MusicPatch.Tiles_saturation = null; // L: 72 + WallDecoration.Tiles_lightness = null; // L: 73 + Tiles.Tiles_hueMultiplier = null; // L: 74 + MenuAction.field866 = null; // L: 75 + } // L: 76 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "([BI)Lbb;", + garbageValue = "1083812736" ) @Export("newScript") static Script newScript(byte[] var0) { - Script var1 = new Script(); // L: 80 - Buffer var2 = new Buffer(var0); // L: 81 - var2.offset = var2.array.length - 2; // L: 82 - int var3 = var2.readUnsignedShort(); // L: 83 - int var4 = var2.array.length - 2 - var3 - 12; // L: 84 - var2.offset = var4; // L: 85 - int var5 = var2.readInt(); // L: 86 - var1.localIntCount = var2.readUnsignedShort(); // L: 87 - var1.localStringCount = var2.readUnsignedShort(); // L: 88 - var1.intArgumentCount = var2.readUnsignedShort(); // L: 89 - var1.stringArgumentCount = var2.readUnsignedShort(); // L: 90 - int var6 = var2.readUnsignedByte(); // L: 91 + Script var1 = new Script(); // L: 112 + Buffer var2 = new Buffer(var0); // L: 113 + var2.offset = var2.array.length - 2; // L: 114 + int var3 = var2.readUnsignedShort(); // L: 115 + int var4 = var2.array.length - 2 - var3 - 12; // L: 116 + var2.offset = var4; // L: 117 + int var5 = var2.readInt(); // L: 118 + var1.localIntCount = var2.readUnsignedShort(); // L: 119 + var1.localStringCount = var2.readUnsignedShort(); // L: 120 + var1.intArgumentCount = var2.readUnsignedShort(); // L: 121 + var1.stringArgumentCount = var2.readUnsignedShort(); // L: 122 + int var6 = var2.readUnsignedByte(); // L: 123 int var7; int var8; - if (var6 > 0) { // L: 92 - var1.switches = var1.newIterableNodeHashTable(var6); // L: 93 + if (var6 > 0) { // L: 124 + var1.switches = var1.newIterableNodeHashTable(var6); // L: 125 - for (var7 = 0; var7 < var6; ++var7) { // L: 94 - var8 = var2.readUnsignedShort(); // L: 95 - IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? class67.method1909(var8) : 1); // L: 96 - var1.switches[var7] = var9; // L: 97 + for (var7 = 0; var7 < var6; ++var7) { // L: 126 + var8 = var2.readUnsignedShort(); // L: 127 + IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? FontName.method7228(var8) : 1); // L: 128 + var1.switches[var7] = var9; // L: 129 - while (var8-- > 0) { // L: 98 - int var10 = var2.readInt(); // L: 99 - int var11 = var2.readInt(); // L: 100 - var9.put(new IntegerNode(var11), (long)var10); // L: 101 + while (var8-- > 0) { // L: 130 + int var10 = var2.readInt(); // L: 131 + int var11 = var2.readInt(); // L: 132 + var9.put(new IntegerNode(var11), (long)var10); // L: 133 } } } - var2.offset = 0; // L: 105 - var1.field954 = var2.readStringCp1252NullTerminatedOrNull(); // L: 106 - var1.opcodes = new int[var5]; // L: 107 - var1.intOperands = new int[var5]; // L: 108 - var1.stringOperands = new String[var5]; // L: 109 + var2.offset = 0; + var1.field949 = var2.readStringCp1252NullTerminatedOrNull(); // L: 138 + var1.opcodes = new int[var5]; // L: 139 + var1.intOperands = new int[var5]; // L: 140 + var1.stringOperands = new String[var5]; // L: 141 - for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 110 111 116 - var8 = var2.readUnsignedShort(); // L: 112 - if (var8 == 3) { // L: 113 + for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 142 143 148 + var8 = var2.readUnsignedShort(); // L: 144 + if (var8 == 3) { // L: 145 var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { - var1.intOperands[var7] = var2.readInt(); // L: 114 + var1.intOperands[var7] = var2.readInt(); // L: 146 } else { - var1.intOperands[var7] = var2.readUnsignedByte(); // L: 115 + var1.intOperands[var7] = var2.readUnsignedByte(); // L: 147 } } - return var1; // L: 118 + return var1; // L: 150 } - @ObfuscatedName("b") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IB)I", - garbageValue = "42" + descriptor = "(IIS)I", + garbageValue = "12333" ) - public static int method746(CharSequence var0, int var1) { - return class263.method5178(var0, var1, true); // L: 71 + static int method693(int var0, int var1) { + for (int var2 = 0; var2 < 8; ++var2) { // L: 1035 + if (var1 <= var0 + 30) { // L: 1036 + return var2; // L: 1037 + } + + var0 += 30; // L: 1039 + var0 += var2 != 1 && var2 != 3 ? 5 : 20; // L: 1040 + } + + return 0; // L: 1042 } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1845671157" + ) + public static void method757() { + KitDefinition.KitDefinition_cached.clear(); // L: 136 + } // L: 137 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-1912643787" + ) + @Export("Login_promptCredentials") + static void Login_promptCredentials(boolean var0) { + if (!class82.client.method1128() && !class82.client.method1520()) { // L: 1046 + Login.Login_response1 = ""; // L: 1050 + Login.Login_response2 = "Enter your username/email & password."; // L: 1051 + Login.Login_response3 = ""; // L: 1052 + class126.method2799(2); // L: 1053 + if (var0) { // L: 1054 + Login.Login_password = ""; + } + + if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 1056 + if (class12.clientPreferences.method2241() != null) { // L: 1057 + Login.Login_username = class12.clientPreferences.method2241(); // L: 1058 + Client.Login_isUsernameRemembered = true; // L: 1059 + } else { + Client.Login_isUsernameRemembered = false; // L: 1061 + } + } + + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 1064 + Login.currentLoginField = 1; // L: 1065 + } else { + Login.currentLoginField = 0; // L: 1068 + } + + } else { + class126.method2799(10); // L: 1047 + } + } // L: 1048 1071 + + @ObfuscatedName("fi") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "24" + ) + @Export("getLoginError") + static void getLoginError(int var0) { + int var1 = Login.loginIndex; // L: 2842 + if (var0 == -3) { // L: 2845 + class345.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); + } else if (var0 == -2) { // L: 2846 + class345.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); + } else if (var0 == -1) { // L: 2847 + class345.setLoginResponseString("No response from server.", "Please try using a different world.", ""); + } else if (var0 == 3) { // L: 2848 + class126.method2799(3); // L: 2849 + Login.field907 = 1; // L: 2850 + } else if (var0 == 4) { // L: 2852 + class400.method6957(0); // L: 2853 + } else if (var0 == 5) { // L: 2855 + Login.field907 = 2; // L: 2856 + class345.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: 2857 + } else if (var0 == 68 || !Client.onMobile && var0 == 6) { // L: 2859 + class345.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2860 + } else if (var0 == 7) { // L: 2862 + class345.setLoginResponseString("This world is full.", "Please use a different world.", ""); + } else if (var0 == 8) { // L: 2863 + class345.setLoginResponseString("Unable to connect.", "Login server offline.", ""); + } else if (var0 == 9) { // L: 2864 + class345.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); + } else if (var0 == 10) { // L: 2865 + class345.setLoginResponseString("Unable to connect.", "Bad session id.", ""); + } else if (var0 == 11) { // L: 2866 + class345.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); + } else if (var0 == 12) { // L: 2867 + class345.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); + } else if (var0 == 13) { // L: 2868 + class345.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); + } else if (var0 == 14) { // L: 2869 + class345.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 16) { // L: 2870 + class345.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); + } else if (var0 == 17) { // L: 2871 + class345.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: 2872 + class400.method6957(1); // L: 2873 + } else if (var0 == 19) { // L: 2875 + class345.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); + } else if (var0 == 20) { // L: 2876 + class345.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); + } else if (var0 == 22) { // L: 2877 + class345.setLoginResponseString("Malformed login packet.", "Please try again.", ""); + } else if (var0 == 23) { // L: 2878 + class345.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 24) { // L: 2879 + class345.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); + } else if (var0 == 25) { // L: 2880 + class345.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); + } else if (var0 == 26) { // L: 2881 + class345.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); + } else if (var0 == 27) { // L: 2882 + class345.setLoginResponseString("", "Service unavailable.", ""); + } else if (var0 == 31) { // L: 2883 + class345.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: 2884 + class345.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: 2885 + class345.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); + } else if (var0 == 38) { // L: 2886 + class345.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); + } else if (var0 == 55) { // L: 2887 + class126.method2799(8); // L: 2888 + } else { + if (var0 == 56) { // L: 2890 + class345.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2891 + PendingSpawn.updateGameState(11); // L: 2892 + return; // L: 2893 + } + + if (var0 == 57) { // L: 2895 + class345.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2896 + PendingSpawn.updateGameState(11); // L: 2897 + return; // L: 2898 + } + + if (var0 == 61) { // L: 2900 + class345.setLoginResponseString("", "Please enter your date of birth (DD/MM/YYYY)", ""); // L: 2901 + class126.method2799(7); // L: 2902 + } else { + if (var0 == 62) { // L: 2904 + PendingSpawn.updateGameState(10); // L: 2905 + class126.method2799(9); // L: 2906 + class345.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); // L: 2907 + return; // L: 2908 + } + + if (var0 == 63) { // L: 2910 + PendingSpawn.updateGameState(10); // L: 2911 + class126.method2799(9); // L: 2912 + class345.setLoginResponseString("You were signed out.", "Please sign in again.", ""); // L: 2913 + return; // L: 2914 + } + + if (var0 == 65 || var0 == 67) { // L: 2916 + PendingSpawn.updateGameState(10); // L: 2917 + class126.method2799(9); // L: 2918 + class345.setLoginResponseString("Failed to login.", "Please try again.", ""); // L: 2919 + return; // L: 2920 + } + + if (var0 == 71) { // L: 2922 + PendingSpawn.updateGameState(10); // L: 2923 + class126.method2799(7); // L: 2924 + class345.setLoginResponseString("There was a problem updating your DOB.", "Please try again later. If the problem ", "persists, please contact Jagex Support."); // L: 2925 + } else if (var0 == 73) { // L: 2927 + PendingSpawn.updateGameState(10); // L: 2928 + class126.method2799(6); // L: 2929 + class345.setLoginResponseString("Your date of birth information is waiting", "to be reviewed by our staff.", "It will be processed shortly."); // L: 2930 + } else if (var0 == 72) { // L: 2932 + PendingSpawn.updateGameState(10); // L: 2933 + class126.method2799(26); // L: 2934 + } else { + class345.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 2936 + } + } + } + + PendingSpawn.updateGameState(10); // L: 2937 + int var4 = Login.loginIndex; // L: 2941 + boolean var5 = var4 != var1; // L: 2943 + if (!var5 && Client.field517.method7790()) { // L: 2944 + class126.method2799(9); // L: 2945 + } + + } // L: 2947 + + @ObfuscatedName("kz") + @ObfuscatedSignature( + descriptor = "(IIIILqr;Lka;I)V", + garbageValue = "-1306286729" + ) + @Export("drawSpriteOnMinimap") + static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + if (var4 != null) { // L: 12398 + int var6 = Client.camAngleY & 2047; // L: 12399 + int var7 = var3 * var3 + var2 * var2; // L: 12400 + if (var7 <= 6400) { // L: 12401 + int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 12402 + int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 12403 + int var10 = var9 * var2 + var3 * var8 >> 16; // L: 12404 + int var11 = var3 * var9 - var8 * var2 >> 16; // L: 12405 + if (var7 > 2500) { + var4.method7947(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: 12406 + } else { + var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 12407 + } + + } + } + } // L: 12408 } diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index e9b55bf291..3a0693681e 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -3,23 +3,23 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("af") +@ObfuscatedName("ao") @Implements("PcmStream") public abstract class PcmStream extends Node { @ObfuscatedName("w") @Export("active") volatile boolean active; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Laf;" + descriptor = "Lao;" ) @Export("after") PcmStream after; - @ObfuscatedName("t") - int field343; - @ObfuscatedName("g") + @ObfuscatedName("n") + int field348; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lbm;" + descriptor = "Lbi;" ) @Export("sound") AbstractSound sound; @@ -28,37 +28,37 @@ public abstract class PcmStream extends Node { this.active = true; // L: 11 } // L: 13 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "()Laf;" + descriptor = "()Lao;" ) @Export("firstSubStream") protected abstract PcmStream firstSubStream(); - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "()Laf;" + descriptor = "()Lao;" ) @Export("nextSubStream") protected abstract PcmStream nextSubStream(); - @ObfuscatedName("l") - protected abstract int vmethod5441(); + @ObfuscatedName("s") + protected abstract int vmethod5295(); - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("skip") protected abstract void skip(int var1); - @ObfuscatedName("ag") - int vmethod962() { + @ObfuscatedName("al") + int vmethod951() { return 255; // L: 16 } - @ObfuscatedName("fs") + @ObfuscatedName("fy") @Export("update") final void update(int[] var1, int var2, int var3) { if (this.active) { // L: 24 diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index 3b22f6db25..7980935ebc 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -3,152 +3,152 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("al") +@ObfuscatedName("as") @Implements("PcmStreamMixer") public class PcmStreamMixer extends PcmStream { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llv;" ) @Export("subStreams") NodeDeque subStreams; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llv;" ) - NodeDeque field244; - @ObfuscatedName("i") - int field246; - @ObfuscatedName("f") - int field243; + NodeDeque field254; + @ObfuscatedName("l") + int field255; + @ObfuscatedName("k") + int field257; public PcmStreamMixer() { this.subStreams = new NodeDeque(); // L: 9 - this.field244 = new NodeDeque(); // L: 10 - this.field246 = 0; // L: 11 - this.field243 = -1; // L: 12 + this.field254 = new NodeDeque(); // L: 10 + this.field255 = 0; // L: 11 + this.field257 = -1; // L: 12 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Laf;)V" + descriptor = "(Lao;)V" ) @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { this.subStreams.addLast(var1); // L: 15 } // L: 16 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Laf;)V" + descriptor = "(Lao;)V" ) @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { var1.remove(); // L: 19 } // L: 20 - @ObfuscatedName("i") - void method617() { - if (this.field246 > 0) { // L: 23 - for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field244.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field244.previous()) { // L: 24 - var1.field390 -= this.field246; // L: 25 + @ObfuscatedName("l") + void method605() { + if (this.field255 > 0) { // L: 23 + for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field254.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field254.previous()) { // L: 24 + var1.field396 -= this.field255; // L: 25 } - this.field243 -= this.field246; // L: 27 - this.field246 = 0; // L: 28 + this.field257 -= this.field255; // L: 27 + this.field255 = 0; // L: 28 } } // L: 30 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Loq;Lap;)V" + descriptor = "(Los;Lat;)V" ) - void method618(Node var1, PcmStreamMixerListener var2) { - while (this.field244.sentinel != var1 && ((PcmStreamMixerListener)var1).field390 <= var2.field390) { // L: 33 + void method629(Node var1, PcmStreamMixerListener var2) { + while (this.field254.sentinel != var1 && ((PcmStreamMixerListener)var1).field396 <= var2.field396) { // L: 33 var1 = var1.previous; } NodeDeque.NodeDeque_addBefore(var2, var1); // L: 34 - this.field243 = ((PcmStreamMixerListener)this.field244.sentinel.previous).field390; // L: 35 + this.field257 = ((PcmStreamMixerListener)this.field254.sentinel.previous).field396; // L: 35 } // L: 36 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lap;)V" + descriptor = "(Lat;)V" ) - void method619(PcmStreamMixerListener var1) { + void method607(PcmStreamMixerListener var1) { var1.remove(); // L: 39 var1.remove2(); // L: 40 - Node var2 = this.field244.sentinel.previous; // L: 41 - if (var2 == this.field244.sentinel) { - this.field243 = -1; // L: 42 + Node var2 = this.field254.sentinel.previous; // L: 41 + if (var2 == this.field254.sentinel) { + this.field257 = -1; // L: 42 } else { - this.field243 = ((PcmStreamMixerListener)var2).field390; // L: 43 + this.field257 = ((PcmStreamMixerListener)var2).field396; // L: 43 } } // L: 44 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "()Laf;" + descriptor = "()Lao;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return (PcmStream)this.subStreams.last(); // L: 47 } - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "()Laf;" + descriptor = "()Lao;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return (PcmStream)this.subStreams.previous(); // L: 51 } - @ObfuscatedName("l") - protected int vmethod5441() { + @ObfuscatedName("s") + protected int vmethod5295() { return 0; // L: 55 } - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { - if (this.field243 < 0) { // L: 60 + if (this.field257 < 0) { // L: 60 this.updateSubStreams(var1, var2, var3); // L: 61 return; // L: 62 } - if (var3 + this.field246 < this.field243) { // L: 64 - this.field246 += var3; // L: 65 + if (var3 + this.field255 < this.field257) { // L: 64 + this.field255 += var3; // L: 65 this.updateSubStreams(var1, var2, var3); // L: 66 return; // L: 67 } - int var4 = this.field243 - this.field246; // L: 69 + int var4 = this.field257 - this.field255; // L: 69 this.updateSubStreams(var1, var2, var4); // L: 70 var2 += var4; // L: 71 var3 -= var4; // L: 72 - this.field246 += var4; // L: 73 - this.method617(); // L: 74 - PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field244.last(); // L: 75 + this.field255 += var4; // L: 73 + this.method605(); // L: 74 + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field254.last(); // L: 75 synchronized(var5) { // L: 76 int var7 = var5.update(); // L: 77 if (var7 < 0) { // L: 78 - var5.field390 = 0; // L: 79 - this.method619(var5); // L: 80 + var5.field396 = 0; // L: 79 + this.method607(var5); // L: 80 } else { - var5.field390 = var7; // L: 83 - this.method618(var5.previous, var5); // L: 84 + var5.field396 = var7; // L: 83 + this.method629(var5.previous, var5); // L: 84 } } } while(var3 != 0); // L: 87 } - @ObfuscatedName("o") + @ObfuscatedName("v") @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 @@ -157,42 +157,42 @@ public class PcmStreamMixer extends PcmStream { } // L: 95 - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("skip") public final synchronized void skip(int var1) { do { - if (this.field243 < 0) { // L: 99 + if (this.field257 < 0) { // L: 99 this.skipSubStreams(var1); // L: 100 return; // L: 101 } - if (this.field246 + var1 < this.field243) { // L: 103 - this.field246 += var1; // L: 104 + if (this.field255 + var1 < this.field257) { // L: 103 + this.field255 += var1; // L: 104 this.skipSubStreams(var1); // L: 105 return; // L: 106 } - int var2 = this.field243 - this.field246; // L: 108 + int var2 = this.field257 - this.field255; // L: 108 this.skipSubStreams(var2); // L: 109 var1 -= var2; // L: 110 - this.field246 += var2; // L: 111 - this.method617(); // L: 112 - PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field244.last(); // L: 113 + this.field255 += var2; // L: 111 + this.method605(); // L: 112 + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field254.last(); // L: 113 synchronized(var3) { // L: 114 int var5 = var3.update(); // L: 115 if (var5 < 0) { // L: 116 - var3.field390 = 0; // L: 117 - this.method619(var3); // L: 118 + var3.field396 = 0; // L: 117 + this.method607(var3); // L: 118 } else { - var3.field390 = var5; // L: 121 - this.method618(var3.previous, var3); // L: 122 + var3.field396 = var5; // L: 121 + this.method629(var3.previous, var3); // L: 122 } } } while(var1 != 0); // L: 125 } - @ObfuscatedName("p") + @ObfuscatedName("c") @Export("skipSubStreams") void skipSubStreams(int var1) { for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { // L: 130 diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java index 2cee1b57b8..c142441915 100644 --- a/runescape-client/src/main/java/PcmStreamMixerListener.java +++ b/runescape-client/src/main/java/PcmStreamMixerListener.java @@ -3,19 +3,19 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ap") +@ObfuscatedName("at") @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { - @ObfuscatedName("v") - int field390; + @ObfuscatedName("o") + int field396; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("remove2") abstract void remove2(); - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lal;)I" + descriptor = "(Las;)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 5956a5ebd0..93e4451370 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -1,84 +1,84 @@ -import java.applet.Applet; -import java.net.URL; +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.lang.reflect.Field; +import java.lang.reflect.Method; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; +import net.runelite.rs.Reflection; -@ObfuscatedName("ct") +@ObfuscatedName("ci") @Implements("PendingSpawn") public final class PendingSpawn extends Node { - @ObfuscatedName("ux") - @Export("foundItemIds") - static short[] foundItemIds; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1984278839 + intValue = -1548569011 ) @Export("plane") int plane; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -685471761 + intValue = 1470200335 ) @Export("type") int type; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1470046835 + intValue = 706964479 ) @Export("x") int x; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 241546961 + intValue = 307238289 ) @Export("y") int y; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1849366507 + intValue = -360543025 ) @Export("objectId") int objectId; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1969851359 + intValue = 265612905 ) - int field1104; + int field1131; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -539992975 + ) + int field1129; @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2130994383 - ) - int field1105; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -406866951 + intValue = -420912825 ) @Export("id") int id; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1916353905 + intValue = -1623947917 ) @Export("orientation") int orientation; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1901242165 + intValue = 1200611791 ) - int field1107; - @ObfuscatedName("r") + int field1126; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1886053549 + intValue = -997627389 ) @Export("delay") int delay; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -758552801 + intValue = -1963124653 ) @Export("hitpoints") int hitpoints; @@ -88,85 +88,392 @@ public final class PendingSpawn extends Node { this.hitpoints = -1; // L: 17 } // L: 19 - @ObfuscatedName("f") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z", - garbageValue = "1938115950" + descriptor = "(Llp;Llp;IZI)Lds;", + garbageValue = "1523171392" ) - static boolean method2165(String var0, int var1, String var2) { - if (var1 == 0) { // L: 63 - try { - if (!class29.field175.startsWith("win")) { // L: 65 - throw new Exception(); - } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 66 - throw new Exception(); - } else { - String var13 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 67 + public static class122 method2161(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { + boolean var4 = true; // L: 23 + byte[] var5 = var0.takeFile(var2 >> 16 & 65535, var2 & 65535); // L: 24 + if (var5 == null) { // L: 25 + var4 = false; // L: 26 + return null; // L: 27 + } else { + int var6 = (var5[1] & 255) << 8 | var5[2] & 255; // L: 29 + byte[] var7; + if (var3) { + var7 = var1.getFile(0, var6); // L: 31 + } else { + var7 = var1.getFile(var6, 0); // L: 32 + } - for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 68 - if (var13.indexOf(var0.charAt(var4)) == -1) { // L: 69 - throw new Exception(); + if (var7 == null) { // L: 33 + var4 = false; + } + + if (!var4) { // L: 34 + return null; + } else { + try { + return new class122(var0, var1, var2, var3); // L: 36 + } catch (Exception var9) { // L: 38 + return null; // L: 39 + } + } + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;III)V", + garbageValue = "373101383" + ) + public static void method2160(String var0, String var1, int var2, int var3) throws IOException { + UserComparator6.idxCount = var3; // L: 40 + class11.cacheGamebuild = var2; // L: 41 + + try { + JagexCache.operatingSystemName = System.getProperty("os.name"); + } catch (Exception var18) { // L: 45 + JagexCache.operatingSystemName = "Unknown"; // L: 46 + } + + WorldMapArea.formattedOperatingSystemName = JagexCache.operatingSystemName.toLowerCase(); // L: 48 + + try { + BufferedSource.userHomeDirectory = System.getProperty("user.home"); // L: 50 + if (BufferedSource.userHomeDirectory != null) { // L: 51 + BufferedSource.userHomeDirectory = BufferedSource.userHomeDirectory + "/"; + } + } catch (Exception var17) { // L: 53 + } + + try { + if (WorldMapArea.formattedOperatingSystemName.startsWith("win")) { // L: 55 + if (BufferedSource.userHomeDirectory == null) { // L: 56 + BufferedSource.userHomeDirectory = System.getenv("USERPROFILE"); + } + } else if (BufferedSource.userHomeDirectory == null) { + BufferedSource.userHomeDirectory = System.getenv("HOME"); + } + + if (BufferedSource.userHomeDirectory != null) { // L: 61 + BufferedSource.userHomeDirectory = BufferedSource.userHomeDirectory + "/"; + } + } catch (Exception var16) { // L: 63 + } + + if (BufferedSource.userHomeDirectory == null) { // L: 64 + BufferedSource.userHomeDirectory = "~/"; + } + + SecureRandomCallable.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", BufferedSource.userHomeDirectory, "/tmp/", ""}; // L: 65 + class83.cacheSubPaths = new String[]{".jagex_cache_" + class11.cacheGamebuild, ".file_store_" + class11.cacheGamebuild}; // L: 66 + int var12 = 0; + + int var7; + File var8; + label141: + while (var12 < 4) { + JagexCache.cacheDir = SequenceDefinition.method3717(var0, var1, var12); // L: 68 + if (!JagexCache.cacheDir.exists()) { // L: 69 + JagexCache.cacheDir.mkdirs(); + } + + File[] var5 = JagexCache.cacheDir.listFiles(); // L: 70 + if (var5 == null) { // L: 71 + break; + } + + File[] var6 = var5; // L: 73 + var7 = 0; + + while (true) { + if (var7 >= var6.length) { + break label141; + } + + var8 = var6[var7]; // L: 75 + + boolean var9; + try { + RandomAccessFile var10 = new RandomAccessFile(var8, "rw"); // L: 80 + int var11 = var10.read(); // L: 81 + var10.seek(0L); // L: 82 + var10.write(var11); // L: 83 + var10.seek(0L); // L: 84 + var10.close(); // L: 85 + var9 = true; // L: 87 + } catch (Exception var15) { // L: 89 + var9 = false; // L: 90 + } + + if (!var9) { // L: 93 + ++var12; // L: 67 + break; + } + + ++var7; // L: 74 + } + } + + File var4 = JagexCache.cacheDir; // L: 100 + FileSystem.FileSystem_cacheDir = var4; // L: 102 + if (!FileSystem.FileSystem_cacheDir.exists()) { // L: 103 + throw new RuntimeException(""); + } else { + FileSystem.FileSystem_hasPermissions = true; // L: 104 + + try { + File var20 = new File(BufferedSource.userHomeDirectory, "random.dat"); // L: 108 + if (var20.exists()) { // L: 109 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var20, "rw", 25L), 24, 0); // L: 110 + } else { + label120: + for (int var13 = 0; var13 < class83.cacheSubPaths.length; ++var13) { // L: 113 + for (var7 = 0; var7 < SecureRandomCallable.cacheParentPaths.length; ++var7) { // L: 114 + var8 = new File(SecureRandomCallable.cacheParentPaths[var7] + class83.cacheSubPaths[var13] + File.separatorChar + "random.dat"); // L: 115 + if (var8.exists()) { // L: 116 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var8, "rw", 25L), 24, 0); // L: 117 + break label120; // L: 118 + } } } - - Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 71 - return true; // L: 72 } - } catch (Throwable var8) { // L: 74 - return false; // L: 75 - } - } else if (var1 == 1) { // L: 78 - try { - Applet var7 = class29.field176; // L: 81 - Object[] var5 = new Object[]{(new URL(class29.field176.getCodeBase(), var0)).toString()}; // L: 82 - Object var3 = JSObject.getWindow(var7).call(var2, var5); // L: 85 - return var3 != null; // L: 88 - } catch (Throwable var9) { // L: 90 - return false; // L: 91 - } - } else if (var1 == 2) { // L: 94 - try { - class29.field176.getAppletContext().showDocument(new URL(class29.field176.getCodeBase(), var0), "_blank"); // L: 96 - return true; // L: 97 - } catch (Exception var10) { // L: 99 - return false; // L: 100 - } - } else if (var1 == 3) { // L: 103 - try { - class27.method383(class29.field176, "loggedout"); // L: 105 - } catch (Throwable var12) { // L: 107 + + if (JagexCache.JagexCache_randomDat == null) { + RandomAccessFile var21 = new RandomAccessFile(var20, "rw"); + var7 = var21.read(); + var21.seek(0L); + var21.write(var7); + var21.seek(0L); + var21.close(); + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var20, "rw", 25L), 24, 0); + } + } catch (IOException var19) { // L: 133 } - try { - class29.field176.getAppletContext().showDocument(new URL(class29.field176.getCodeBase(), var0), "_top"); // L: 109 - return true; // L: 110 - } catch (Exception var11) { // L: 112 - return false; // L: 113 + JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(VarpDefinition.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); + JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(VarpDefinition.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); + JagexCache.JagexCache_idxFiles = new BufferedFile[UserComparator6.idxCount]; + + for (int var14 = 0; var14 < UserComparator6.idxCount; ++var14) { + JagexCache.JagexCache_idxFiles[var14] = new BufferedFile(new AccessFile(VarpDefinition.getFile("main_file_cache.idx" + var14), "rw", 1048576L), 6000, 0); } - } else { - throw new IllegalArgumentException(); // L: 116 + } } - @ObfuscatedName("fd") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-617620981" + descriptor = "(Lpx;II)V", + garbageValue = "-1995968561" ) - static boolean method2166() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1458 - while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1459 - ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 1460 - if (!var0.isLoaded()) { - return false; // L: 1461 + @Export("readReflectionCheck") + public static void readReflectionCheck(Buffer var0, int var1) { + ReflectionCheck var2 = new ReflectionCheck(); // L: 123 + var2.size = var0.readUnsignedByte(); // L: 124 + var2.id = var0.readInt(); // L: 125 + var2.operations = new int[var2.size]; // L: 126 + var2.creationErrors = new int[var2.size]; // L: 127 + var2.fields = new Field[var2.size]; // L: 128 + var2.intReplaceValues = new int[var2.size]; // L: 129 + var2.methods = new Method[var2.size]; // L: 130 + var2.arguments = new byte[var2.size][][]; // L: 131 + + for (int var3 = 0; var3 < var2.size; ++var3) { // L: 132 + try { + int var4 = var0.readUnsignedByte(); // L: 134 + String var5; + String var6; + int var7; + if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 135 + if (var4 == 3 || var4 == 4) { // L: 145 + var5 = var0.readStringCp1252NullTerminated(); // L: 146 + var6 = var0.readStringCp1252NullTerminated(); // L: 147 + var7 = var0.readUnsignedByte(); // L: 148 + String[] var8 = new String[var7]; // L: 149 + + for (int var9 = 0; var9 < var7; ++var9) { // L: 150 + var8[var9] = var0.readStringCp1252NullTerminated(); + } + + String var20 = var0.readStringCp1252NullTerminated(); // L: 151 + byte[][] var10 = new byte[var7][]; // L: 152 + int var12; + if (var4 == 3) { // L: 153 + for (int var11 = 0; var11 < var7; ++var11) { // L: 154 + var12 = var0.readInt(); // L: 155 + var10[var11] = new byte[var12]; // L: 156 + var0.readBytes(var10[var11], 0, var12); // L: 157 + } + } + + var2.operations[var3] = var4; // L: 160 + Class[] var21 = new Class[var7]; // L: 161 + + for (var12 = 0; var12 < var7; ++var12) { // L: 162 + var21[var12] = WorldMapSection1.loadClassFromDescriptor(var8[var12]); + } + + Class var22 = WorldMapSection1.loadClassFromDescriptor(var20); // L: 163 + if (WorldMapSection1.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 164 + throw new SecurityException(); + } + + Method[] var13 = WorldMapSection1.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 165 + Method[] var14 = var13; // L: 167 + + for (int var15 = 0; var15 < var14.length; ++var15) { // L: 168 + Method var16 = var14[var15]; // L: 169 + if (Reflection.getMethodName(var16).equals(var6)) { // L: 171 + Class[] var17 = Reflection.getParameterTypes(var16); // L: 172 + if (var21.length == var17.length) { // L: 173 + boolean var18 = true; // L: 174 + + for (int var19 = 0; var19 < var21.length; ++var19) { // L: 175 + if (var17[var19] != var21[var19]) { // L: 176 + var18 = false; // L: 177 + break; // L: 178 + } + } + + if (var18 && var22 == var16.getReturnType()) { // L: 181 + var2.methods[var3] = var16; // L: 182 + } + } + } + } + + var2.arguments[var3] = var10; // L: 189 + } + } else { + var5 = var0.readStringCp1252NullTerminated(); // L: 136 + var6 = var0.readStringCp1252NullTerminated(); // L: 137 + var7 = 0; // L: 138 + if (var4 == 1) { // L: 139 + var7 = var0.readInt(); + } + + var2.operations[var3] = var4; // L: 140 + var2.intReplaceValues[var3] = var7; // L: 141 + if (WorldMapSection1.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 142 + throw new SecurityException(); + } + + var2.fields[var3] = Reflection.findField(WorldMapSection1.loadClassFromDescriptor(var5), var6); // L: 143 } - - ++Client.archiveLoadersDone; // L: 1462 + } catch (ClassNotFoundException var24) { // L: 192 + var2.creationErrors[var3] = -1; // L: 193 + } catch (SecurityException var25) { // L: 195 + var2.creationErrors[var3] = -2; // L: 196 + } catch (NullPointerException var26) { // L: 198 + var2.creationErrors[var3] = -3; // L: 199 + } catch (Exception var27) { // L: 201 + var2.creationErrors[var3] = -4; // L: 202 + } catch (Throwable var28) { // L: 204 + var2.creationErrors[var3] = -5; // L: 205 } + } - return true; // L: 1464 + class33.reflectionChecks.addFirst(var2); // L: 208 + } // L: 209 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-1" + ) + public static boolean method2164(int var0) { + return var0 >= WorldMapDecorationType.field3571.id && var0 <= WorldMapDecorationType.field3559.id || var0 == WorldMapDecorationType.field3560.id; // L: 43 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "191115673" + ) + static int method2163(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 57 + if (var1 == null) { // L: 58 + return -1; } else { - return true; // L: 1463 + return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 59 60 } } + + @ObfuscatedName("fy") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1563631744" + ) + @Export("updateGameState") + static void updateGameState(int var0) { + if (var0 != Client.gameState) { // L: 1144 + if (Client.gameState == 0) { // L: 1145 + class82.client.method438(); + } + + if (var0 == 20 || var0 == 40 || var0 == 45 || var0 == 50) { // L: 1146 + Canvas.method347(0); // L: 1147 + Client.field626 = 0; // L: 1148 + Client.field514 = 0; // L: 1149 + Client.timer.method6369(var0); // L: 1150 + if (var0 != 20) { // L: 1151 + ObjectSound.method1730(false); + } + } + + if (var0 != 20 && var0 != 40 && DirectByteArrayCopier.field3337 != null) { // L: 1153 1154 + DirectByteArrayCopier.field3337.close(); // L: 1155 + DirectByteArrayCopier.field3337 = null; // L: 1156 + } + + if (Client.gameState == 25) { // L: 1159 + Client.field597 = 0; // L: 1160 + Client.field545 = 0; // L: 1161 + Client.field546 = 1; // L: 1162 + Client.field570 = 0; // L: 1163 + Client.field548 = 1; // L: 1164 + } + + int var1; + if (var0 != 5 && var0 != 10) { // L: 1166 + if (var0 == 20) { // L: 1170 + var1 = Client.gameState == 11 ? 4 : 0; // L: 1171 + AbstractWorldMapData.method4800(ObjectSound.archive10, class305.archive8, false, var1); // L: 1172 + } else if (var0 == 11) { // L: 1174 + AbstractWorldMapData.method4800(ObjectSound.archive10, class305.archive8, false, 4); // L: 1175 + } else if (var0 == 50) { // L: 1177 + class345.setLoginResponseString("", "Updating date of birth...", ""); // L: 1178 + AbstractWorldMapData.method4800(ObjectSound.archive10, class305.archive8, false, 7); // L: 1179 + } else if (Login.clearLoginScreen) { // L: 1182 + Login.titleboxSprite = null; // L: 1183 + Login.titlebuttonSprite = null; // L: 1184 + Login.runesSprite = null; // L: 1185 + UserComparator6.leftTitleSprite = null; // L: 1186 + SecureRandomCallable.rightTitleSprite = null; // L: 1187 + Clock.logoSprite = null; // L: 1188 + class358.title_muteSprite = null; // L: 1189 + class67.options_buttons_0Sprite = null; // L: 1190 + class101.options_buttons_2Sprite = null; // L: 1191 + GameEngine.worldSelectBackSprites = null; // L: 1192 + class260.worldSelectFlagSprites = null; // L: 1193 + class114.worldSelectArrows = null; // L: 1194 + class267.worldSelectStars = null; // L: 1195 + ArchiveDiskAction.field3997 = null; // L: 1196 + class193.loginScreenRunesAnimation.method2214(); // L: 1197 + UrlRequester.method2538(2); // L: 1198 + MouseRecorder.method2088(true); // L: 1199 + Login.clearLoginScreen = false; // L: 1200 + } + } else { + var1 = class118.method2721() ? 0 : 12; // L: 1167 + AbstractWorldMapData.method4800(ObjectSound.archive10, class305.archive8, true, var1); // L: 1168 + } + + Client.gameState = var0; // L: 1202 + } + } // L: 1203 } diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index b29e07e71a..96f29e769d 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -4,226 +4,202 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oj") +@ObfuscatedName("om") @Implements("PlatformInfo") public class PlatformInfo extends Node { - @ObfuscatedName("aj") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 359254147 + intValue = -352723525 ) - int field4422; - @ObfuscatedName("al") - boolean field4423; - @ObfuscatedName("av") - @ObfuscatedGetter( - intValue = -1214181177 - ) - int field4429; - @ObfuscatedName("at") - @ObfuscatedGetter( - intValue = 2123313943 - ) - int field4425; - @ObfuscatedName("an") - @ObfuscatedGetter( - intValue = -293463653 - ) - int field4433; - @ObfuscatedName("ay") - @ObfuscatedGetter( - intValue = -290319841 - ) - int field4440; - @ObfuscatedName("ag") - @ObfuscatedGetter( - intValue = 114996927 - ) - int field4428; - @ObfuscatedName("ah") - boolean field4426; - @ObfuscatedName("ac") - @ObfuscatedGetter( - intValue = 1292539811 - ) - int field4430; - @ObfuscatedName("ab") - @ObfuscatedGetter( - intValue = -598233409 - ) - int field4431; - @ObfuscatedName("af") - @ObfuscatedGetter( - intValue = 2084134641 - ) - int field4417; - @ObfuscatedName("ad") - @ObfuscatedGetter( - intValue = 200679177 - ) - int field4436; - @ObfuscatedName("ai") - String field4434; - @ObfuscatedName("ax") - String field4435; - @ObfuscatedName("ar") - String field4444; - @ObfuscatedName("ap") - String field4437; + int field4493; @ObfuscatedName("az") + boolean field4484; + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 800300679 + intValue = 67717751 ) - int field4420; + int field4485; @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -562728499 + intValue = 514361411 ) - int field4439; + int field4486; + @ObfuscatedName("au") + @ObfuscatedGetter( + intValue = -1922265923 + ) + int field4494; + @ObfuscatedName("ak") + @ObfuscatedGetter( + intValue = 1001039591 + ) + int field4488; + @ObfuscatedName("af") + @ObfuscatedGetter( + intValue = 1803225865 + ) + int field4504; + @ObfuscatedName("al") + boolean field4490; + @ObfuscatedName("aq") + @ObfuscatedGetter( + intValue = -1919314793 + ) + int field4491; + @ObfuscatedName("ad") + @ObfuscatedGetter( + intValue = 1063380295 + ) + int field4498; + @ObfuscatedName("aw") + @ObfuscatedGetter( + intValue = 1620119563 + ) + int field4489; + @ObfuscatedName("ah") + @ObfuscatedGetter( + intValue = 1010736361 + ) + int field4487; + @ObfuscatedName("ao") + String field4495; + @ObfuscatedName("av") + String field4496; + @ObfuscatedName("ai") + String field4497; + @ObfuscatedName("ay") + String field4483; @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 2035566047 + intValue = 244652383 ) - int field4446; - @ObfuscatedName("bj") + int field4499; + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -995431815 + intValue = -1643044807 ) - int field4441; - @ObfuscatedName("bm") - String field4427; + int field4500; + @ObfuscatedName("at") + @ObfuscatedGetter( + intValue = 1832945347 + ) + int field4501; @ObfuscatedName("br") - String field4443; - @ObfuscatedName("bo") - int[] field4442; - @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = -123804323 + intValue = 653746079 ) - int field4424; - @ObfuscatedName("be") - String field4432; + int field4502; + @ObfuscatedName("ba") + String field4503; + @ObfuscatedName("bk") + String field4477; + @ObfuscatedName("bi") + int[] field4505; + @ObfuscatedName("bc") + @ObfuscatedGetter( + intValue = -826466447 + ) + int field4506; + @ObfuscatedName("bo") + String field4507; 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.field4442 = new int[3]; // L: 62 - this.field4422 = var1; // L: 67 - this.field4423 = var2; // L: 68 - this.field4429 = var3; // L: 69 - this.field4425 = var4; // L: 70 - this.field4433 = var5; // L: 71 - this.field4440 = var6; // L: 72 - this.field4428 = var7; // L: 73 - this.field4426 = var8; // L: 74 - this.field4430 = var9; // L: 75 - this.field4431 = var10; // L: 76 - this.field4417 = var11; // L: 77 - this.field4436 = var12; // L: 78 - this.field4434 = var13; // L: 79 - this.field4435 = var14; // L: 80 - this.field4444 = var15; // L: 81 - this.field4437 = var16; // L: 82 - this.field4420 = var17; // L: 83 - this.field4439 = var18; // L: 84 - this.field4446 = var19; // L: 85 - this.field4441 = var20; // L: 86 - this.field4427 = var21; // L: 87 - this.field4443 = var22; // L: 88 - this.field4442 = var23; // L: 89 - this.field4424 = var24; // L: 90 - this.field4432 = var25; // L: 91 + this.field4505 = new int[3]; // L: 62 + this.field4493 = var1; // L: 67 + this.field4484 = var2; // L: 68 + this.field4485 = var3; // L: 69 + this.field4486 = var4; // L: 70 + this.field4494 = var5; // L: 71 + this.field4488 = var6; // L: 72 + this.field4504 = var7; // L: 73 + this.field4490 = var8; // L: 74 + this.field4491 = var9; // L: 75 + this.field4498 = var10; // L: 76 + this.field4489 = var11; // L: 77 + this.field4487 = var12; // L: 78 + this.field4495 = var13; // L: 79 + this.field4496 = var14; // L: 80 + this.field4497 = var15; // L: 81 + this.field4483 = var16; // L: 82 + this.field4499 = var17; // L: 83 + this.field4500 = var18; // L: 84 + this.field4501 = var19; // L: 85 + this.field4502 = var20; // L: 86 + this.field4503 = var21; // L: 87 + this.field4477 = var22; // L: 88 + this.field4505 = var23; // L: 89 + this.field4506 = var24; // L: 90 + this.field4507 = var25; // L: 91 } // L: 92 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "1752573389" + descriptor = "(Lpx;S)V", + garbageValue = "12185" ) @Export("write") public void write(Buffer var1) { var1.writeByte(8); // L: 95 - var1.writeByte(this.field4422); // L: 96 - var1.writeByte(this.field4423 ? 1 : 0); // L: 97 - var1.writeShort(this.field4429); // L: 98 - var1.writeByte(this.field4425); // L: 99 - var1.writeByte(this.field4433); // L: 100 - var1.writeByte(this.field4440); // L: 101 - var1.writeByte(this.field4428); // L: 102 - var1.writeByte(this.field4426 ? 1 : 0); // L: 103 - var1.writeShort(this.field4430); // L: 104 - var1.writeByte(this.field4431); // L: 105 - var1.writeMedium(this.field4417); // L: 106 - var1.writeShort(this.field4436); // L: 107 - var1.writeStringCp1252NullCircumfixed(this.field4434); // L: 108 - var1.writeStringCp1252NullCircumfixed(this.field4435); // L: 109 - var1.writeStringCp1252NullCircumfixed(this.field4444); // L: 110 - var1.writeStringCp1252NullCircumfixed(this.field4437); // L: 111 - var1.writeByte(this.field4439); // L: 112 - var1.writeShort(this.field4420); // L: 113 - var1.writeStringCp1252NullCircumfixed(this.field4427); // L: 114 - var1.writeStringCp1252NullCircumfixed(this.field4443); // L: 115 - var1.writeByte(this.field4446); // L: 116 - var1.writeByte(this.field4441); // L: 117 + var1.writeByte(this.field4493); // L: 96 + var1.writeByte(this.field4484 ? 1 : 0); // L: 97 + var1.writeShort(this.field4485); // L: 98 + var1.writeByte(this.field4486); // L: 99 + var1.writeByte(this.field4494); // L: 100 + var1.writeByte(this.field4488); // L: 101 + var1.writeByte(this.field4504); // L: 102 + var1.writeByte(this.field4490 ? 1 : 0); // L: 103 + var1.writeShort(this.field4491); // L: 104 + var1.writeByte(this.field4498); // L: 105 + var1.writeMedium(this.field4489); // L: 106 + var1.writeShort(this.field4487); // L: 107 + var1.writeStringCp1252NullCircumfixed(this.field4495); // L: 108 + var1.writeStringCp1252NullCircumfixed(this.field4496); // L: 109 + var1.writeStringCp1252NullCircumfixed(this.field4497); // L: 110 + var1.writeStringCp1252NullCircumfixed(this.field4483); // L: 111 + var1.writeByte(this.field4500); // L: 112 + var1.writeShort(this.field4499); // L: 113 + var1.writeStringCp1252NullCircumfixed(this.field4503); // L: 114 + var1.writeStringCp1252NullCircumfixed(this.field4477); // L: 115 + var1.writeByte(this.field4501); // L: 116 + var1.writeByte(this.field4502); // L: 117 - for (int var2 = 0; var2 < this.field4442.length; ++var2) { // L: 118 - var1.writeInt(this.field4442[var2]); + for (int var2 = 0; var2 < this.field4505.length; ++var2) { // L: 118 + var1.writeInt(this.field4505[var2]); } - var1.writeInt(this.field4424); // L: 119 - var1.writeStringCp1252NullCircumfixed(this.field4432); // L: 120 + var1.writeInt(this.field4506); // L: 119 + var1.writeStringCp1252NullCircumfixed(this.field4507); // L: 120 } // L: 121 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1283677650" + garbageValue = "-1383471227" ) @Export("size") public int size() { byte var1 = 39; // L: 124 - String var4 = this.field4434; // L: 127 + String var4 = this.field4495; // L: 127 int var3 = var4.length() + 2; // L: 129 - int var23 = var3 + var1; // L: 131 - String var7 = this.field4435; // L: 134 + int var23 = var1 + var3; // L: 131 + String var7 = this.field4496; // L: 134 int var6 = var7.length() + 2; // L: 136 var23 += var6; // L: 138 - String var10 = this.field4444; // L: 141 + String var10 = this.field4497; // L: 141 int var9 = var10.length() + 2; // L: 143 var23 += var9; // L: 145 - String var13 = this.field4437; // L: 148 + String var13 = this.field4483; // L: 148 int var12 = var13.length() + 2; // L: 150 var23 += var12; // L: 152 - String var16 = this.field4427; // L: 155 + String var16 = this.field4503; // L: 155 int var15 = var16.length() + 2; // L: 157 var23 += var15; // L: 159 - String var19 = this.field4443; // L: 162 + String var19 = this.field4477; // L: 162 int var18 = var19.length() + 2; // L: 164 var23 += var18; // L: 166 - String var22 = this.field4432; // L: 169 + String var22 = this.field4507; // L: 169 int var21 = var22.length() + 2; // L: 171 var23 += var21; // L: 173 return var23; // L: 174 } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Lbb;B)V", - garbageValue = "-99" - ) - @Export("changeWorld") - static void changeWorld(World var0) { - if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1823 - Client.isMembersWorld = var0.isMembersOnly(); // L: 1824 - ClanSettings.method3033(var0.isMembersOnly()); // L: 1825 - } - - if (var0.properties != Client.worldProperties) { // L: 1827 - class260.method5174(class145.archive8, var0.properties); // L: 1828 - } - - class17.worldHost = var0.host; // L: 1830 - Client.worldId = var0.id; // L: 1831 - Client.worldProperties = var0.properties; // L: 1832 - SecureRandomFuture.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1833 - UserComparator9.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1834 - class329.currentPort = SecureRandomFuture.worldPort; // L: 1835 - } // L: 1836 } diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java index ebe66a68b8..322ef03e77 100644 --- a/runescape-client/src/main/java/PlatformInfoProvider.java +++ b/runescape-client/src/main/java/PlatformInfoProvider.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("or") +@ObfuscatedName("oi") @Implements("PlatformInfoProvider") public interface PlatformInfoProvider { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Loj;", - garbageValue = "2004856383" + descriptor = "(B)Lom;", + garbageValue = "-12" ) @Export("get") PlatformInfo get(); diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 32e3d95498..ad31efc037 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -5,165 +5,165 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cz") +@ObfuscatedName("ca") @Implements("Player") public final class Player extends Actor { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lqb;" + descriptor = "Lqv;" ) @Export("username") Username username; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "Lkp;" ) @Export("appearance") PlayerComposition appearance; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -340980975 + intValue = 207387843 ) @Export("headIconPk") int headIconPk; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -2075940565 + intValue = -2136235279 ) @Export("headIconPrayer") int headIconPrayer; - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("actions") String[] actions; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 940198705 + intValue = 1373676035 ) @Export("combatLevel") int combatLevel; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1876948275 + intValue = 216850049 ) @Export("skillLevel") int skillLevel; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1793810743 + intValue = -982635953 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1130612929 + intValue = 583621725 ) @Export("animationCycleStart") int animationCycleStart; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 38935459 + intValue = 171882853 ) @Export("animationCycleEnd") int animationCycleEnd; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 249721451 + intValue = 1199422479 ) - int field1080; + int field1104; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1209305495 + intValue = -776738565 ) @Export("tileHeight2") int tileHeight2; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1724112821 + intValue = -934008587 ) - int field1082; - @ObfuscatedName("d") + int field1106; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lhv;" ) @Export("model0") Model model0; - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 593217569 + intValue = -1928979701 ) @Export("minX") int minX; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1371594921 + intValue = 1892949157 ) @Export("minY") int minY; - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1538239 + intValue = 738468853 ) @Export("maxX") int maxX; - @ObfuscatedName("g") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1112469711 + intValue = -73932831 ) @Export("maxY") int maxY; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("isUnanimated") boolean isUnanimated; - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1892679033 + intValue = 98212949 ) @Export("team") int team; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("isHidden") boolean isHidden; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -181716259 + intValue = 2123212889 ) @Export("plane") int plane; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -567529937 + intValue = -1295799177 ) @Export("index") int index; - @ObfuscatedName("z") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnq;" ) @Export("isFriendTriBool") TriBool isFriendTriBool; - @ObfuscatedName("h") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnq;" ) @Export("isInFriendsChat") TriBool isInFriendsChat; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnq;" ) @Export("isInClanChat") TriBool isInClanChat; - @ObfuscatedName("aq") - boolean field1070; - @ObfuscatedName("aw") + @ObfuscatedName("ar") + boolean field1095; + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -1041685371 + intValue = -634902129 ) @Export("tileX") int tileX; - @ObfuscatedName("am") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1747269173 + intValue = 375783777 ) @Export("tileY") int tileY; @@ -181,37 +181,37 @@ public final class Player extends Actor { this.skillLevel = 0; // L: 30 this.animationCycleStart = 0; // L: 32 this.animationCycleEnd = 0; // L: 33 - this.isUnanimated = false; // L: 42 - this.team = 0; // L: 43 - this.isHidden = false; // L: 44 - this.isFriendTriBool = TriBool.TriBool_unknown; // L: 47 - this.isInFriendsChat = TriBool.TriBool_unknown; // L: 48 - this.isInClanChat = TriBool.TriBool_unknown; // L: 49 - this.field1070 = false; // L: 50 - } // L: 54 + this.isUnanimated = false; + this.team = 0; + this.isHidden = false; + this.isFriendTriBool = TriBool.TriBool_unknown; + this.isInFriendsChat = TriBool.TriBool_unknown; + this.isInClanChat = TriBool.TriBool_unknown; + this.field1095 = false; + } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-1242087125" + descriptor = "(Lpx;I)V", + garbageValue = "261913950" ) @Export("read") final void read(Buffer var1) { - var1.offset = 0; // L: 57 - int var2 = var1.readUnsignedByte(); // L: 58 - this.headIconPk = var1.readByte(); // L: 59 - this.headIconPrayer = var1.readByte(); // L: 60 - int var3 = -1; // L: 61 - this.team = 0; // L: 62 - int[] var4 = new int[12]; // L: 63 + var1.offset = 0; + int var2 = var1.readUnsignedByte(); + this.headIconPk = var1.readByte(); + this.headIconPrayer = var1.readByte(); + int var3 = -1; + this.team = 0; + int[] var4 = new int[12]; int var6; int var7; int var8; - for (int var5 = 0; var5 < 12; ++var5) { // L: 64 - var6 = var1.readUnsignedByte(); // L: 65 + for (int var5 = 0; var5 < 12; ++var5) { + var6 = var1.readUnsignedByte(); if (var6 == 0) { // L: 66 - var4[var5] = 0; // L: 67 + var4[var5] = 0; } else { var7 = var1.readUnsignedByte(); // L: 70 var4[var5] = var7 + (var6 << 8); // L: 71 @@ -221,7 +221,7 @@ public final class Player extends Actor { } if (var4[var5] >= 512) { // L: 76 - var8 = class19.ItemDefinition_get(var4[var5] - 512).team; // L: 77 + var8 = FileSystem.ItemDefinition_get(var4[var5] - 512).team; // L: 77 if (var8 != 0) { // L: 78 this.team = var8; } @@ -233,7 +233,7 @@ public final class Player extends Actor { for (var6 = 0; var6 < 5; ++var6) { // L: 82 var7 = var1.readUnsignedByte(); // L: 83 - if (var7 < 0 || var7 >= class144.field1629[var6].length) { // L: 84 + if (var7 < 0 || var7 >= DesktopPlatformInfoProvider.field4469[var6].length) { // L: 84 var7 = 0; } @@ -276,11 +276,11 @@ public final class Player extends Actor { super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), class122.loginType); // L: 102 + this.username = new Username(var1.readStringCp1252NullTerminated(), class391.loginType); // L: 102 this.clearIsFriend(); // L: 103 this.clearIsInFriendsChat(); // L: 104 - this.method2121(); // L: 105 - if (this == GrandExchangeEvents.localPlayer) { // L: 106 + this.method2114(); // L: 105 + if (this == ModelData0.localPlayer) { // L: 106 RunException.localPlayerName = this.username.getName(); } @@ -293,244 +293,249 @@ public final class Player extends Actor { class168[] var12 = null; // L: 111 boolean var13 = false; // L: 112 - if (var1.offset < var1.array.length) { // L: 113 - var8 = var1.readUnsignedShort(); // L: 114 - var13 = (var8 >> 15 & 1) == 1; // L: 115 - if (var8 > 0 && var8 != 32768) { // L: 116 - var12 = new class168[12]; // L: 117 + var8 = var1.readUnsignedShort(); // L: 113 + var13 = (var8 >> 15 & 1) == 1; // L: 114 + int var9; + if (var8 > 0 && var8 != 32768) { // L: 115 + var12 = new class168[12]; // L: 116 - for (int var9 = 0; var9 < 12; ++var9) { // L: 118 - int var10 = var8 >> 12 - var9 & 1; // L: 119 - if (var10 == 1) { // L: 120 - var12[var9] = class349.method6509(var4[var9] - 512, var1); // L: 121 - } + for (var9 = 0; var9 < 12; ++var9) { // L: 117 + int var10 = var8 >> 12 - var9 & 1; // L: 118 + if (var10 == 1) { // L: 119 + var12[var9] = class127.method2807(var4[var9] - 512, var1); // L: 120 } } } - if (this.appearance == null) { // L: 126 + if (var1.offset < var1.array.length) { // L: 124 + for (var9 = 0; var9 < 3; ++var9) { // L: 125 + this.actions[var9] = var1.readStringCp1252NullTerminated(); // L: 126 + } + } + + if (this.appearance == null) { // L: 129 this.appearance = new PlayerComposition(); } - this.appearance.method5570(var4, var12, var13, var11, var2 == 1, var3); // L: 127 - } // L: 128 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(B)Liq;", - garbageValue = "103" - ) - @Export("getModel") - protected final Model getModel() { - if (this.appearance == null) { // L: 191 - return null; - } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class163.SequenceDefinition_get(super.sequence) : null; // L: 192 - SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.movementSequence == super.idleSequence && var1 != null ? null : class163.SequenceDefinition_get(super.movementSequence); // L: 193 - Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 194 - if (var3 == null) { // L: 195 - return null; - } else { - var3.calculateBoundsCylinder(); // L: 196 - super.defaultHeight = var3.height; // L: 197 - Model var4; - Model[] var5; - if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 198 - var4 = ClientPreferences.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 199 - if (var4 != null) { // L: 200 - var4.offsetBy(0, -super.spotAnimationHeight, 0); // L: 201 - var5 = new Model[]{var3, var4}; // L: 202 - var3 = new Model(var5, 2); // L: 203 - } - } - - if (!this.isUnanimated && this.model0 != null) { // L: 206 - if (Client.cycle >= this.animationCycleEnd) { // L: 207 - this.model0 = null; - } - - if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { // L: 208 - var4 = this.model0; // L: 209 - var4.offsetBy(this.field1080 - super.x, this.tileHeight2 - this.tileHeight, this.field1082 - super.y); // L: 210 - if (super.orientation == 512) { // L: 211 - var4.rotateY90Ccw(); // L: 212 - var4.rotateY90Ccw(); // L: 213 - var4.rotateY90Ccw(); // L: 214 - } else if (super.orientation == 1024) { // L: 216 - var4.rotateY90Ccw(); // L: 217 - var4.rotateY90Ccw(); // L: 218 - } else if (super.orientation == 1536) { // L: 220 - var4.rotateY90Ccw(); - } - - var5 = new Model[]{var3, var4}; // L: 221 - var3 = new Model(var5, 2); // L: 222 - if (super.orientation == 512) { // L: 223 - var4.rotateY90Ccw(); - } else if (super.orientation == 1024) { // L: 224 - var4.rotateY90Ccw(); // L: 225 - var4.rotateY90Ccw(); // L: 226 - } else if (super.orientation == 1536) { // L: 228 - var4.rotateY90Ccw(); // L: 229 - var4.rotateY90Ccw(); // L: 230 - var4.rotateY90Ccw(); // L: 231 - } - - var4.offsetBy(super.x - this.field1080, this.tileHeight - this.tileHeight2, super.y - this.field1082); // L: 233 - } - } - - var3.isSingleTile = true; // L: 236 - if (super.field1122 != 0 && Client.cycle >= super.field1167 && Client.cycle < super.field1168) { // L: 237 - var3.overrideHue = super.field1169; // L: 238 - var3.overrideSaturation = super.field1114; // L: 239 - var3.overrideLuminance = super.field1171; // L: 240 - var3.overrideAmount = super.field1122; // L: 241 - } else { - var3.overrideAmount = 0; // L: 244 - } - - return var3; // L: 246 - } - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2114149890" - ) - @Export("isFriend") - boolean isFriend() { - if (this.isFriendTriBool == TriBool.TriBool_unknown) { // L: 131 - this.checkIsFriend(); // L: 132 - } - - return this.isFriendTriBool == TriBool.TriBool_true; // L: 134 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-187822721" - ) - @Export("clearIsFriend") - void clearIsFriend() { - this.isFriendTriBool = TriBool.TriBool_unknown; // L: 138 - } // L: 139 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-111" - ) - @Export("checkIsFriend") - void checkIsFriend() { - this.isFriendTriBool = Decimator.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 142 - } // L: 143 + this.appearance.method5395(var4, var12, var13, var11, var2 == 1, var3); // L: 130 + } // L: 131 @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "28" + descriptor = "(I)Lhv;", + garbageValue = "-238822980" ) - @Export("isFriendsChatMember") - boolean isFriendsChatMember() { - if (this.isInFriendsChat == TriBool.TriBool_unknown) { // L: 146 - this.updateIsInFriendsChat(); // L: 147 - } + @Export("getModel") + protected final Model getModel() { + if (this.appearance == null) { // L: 194 + return null; + } else { + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class114.SequenceDefinition_get(super.sequence) : null; // L: 195 + SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.idleSequence != super.movementSequence || var1 == null) ? class114.SequenceDefinition_get(super.movementSequence) : null; // L: 196 + Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 197 + if (var3 == null) { // L: 198 + return null; + } else { + var3.calculateBoundsCylinder(); // L: 199 + super.defaultHeight = var3.height; // L: 200 + Model var4; + Model[] var5; + if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 201 + var4 = class136.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 202 + if (var4 != null) { // L: 203 + var4.offsetBy(0, -super.spotAnimationHeight, 0); // L: 204 + var5 = new Model[]{var3, var4}; // L: 205 + var3 = new Model(var5, 2); // L: 206 + } + } - return this.isInFriendsChat == TriBool.TriBool_true; // L: 149 + if (!this.isUnanimated && this.model0 != null) { // L: 209 + if (Client.cycle >= this.animationCycleEnd) { // L: 210 + this.model0 = null; + } + + if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { // L: 211 + var4 = this.model0; // L: 212 + var4.offsetBy(this.field1104 - super.x, this.tileHeight2 - this.tileHeight, this.field1106 - super.y); // L: 213 + if (super.orientation == 512) { // L: 214 + var4.rotateY90Ccw(); // L: 215 + var4.rotateY90Ccw(); // L: 216 + var4.rotateY90Ccw(); // L: 217 + } else if (super.orientation == 1024) { // L: 219 + var4.rotateY90Ccw(); // L: 220 + var4.rotateY90Ccw(); // L: 221 + } else if (super.orientation == 1536) { // L: 223 + var4.rotateY90Ccw(); + } + + var5 = new Model[]{var3, var4}; // L: 224 + var3 = new Model(var5, 2); // L: 225 + if (super.orientation == 512) { // L: 226 + var4.rotateY90Ccw(); + } else if (super.orientation == 1024) { // L: 227 + var4.rotateY90Ccw(); // L: 228 + var4.rotateY90Ccw(); // L: 229 + } else if (super.orientation == 1536) { // L: 231 + var4.rotateY90Ccw(); // L: 232 + var4.rotateY90Ccw(); // L: 233 + var4.rotateY90Ccw(); // L: 234 + } + + var4.offsetBy(super.x - this.field1104, this.tileHeight - this.tileHeight2, super.y - this.field1106); // L: 236 + } + } + + var3.isSingleTile = true; // L: 239 + if (super.field1140 != 0 && Client.cycle >= super.field1196 && Client.cycle < super.field1197) { // L: 240 + var3.overrideHue = super.field1143; // L: 241 + var3.overrideSaturation = super.field1199; // L: 242 + var3.overrideLuminance = super.field1153; // L: 243 + var3.overrideAmount = super.field1140; // L: 244 + } else { + var3.overrideAmount = 0; // L: 247 + } + + return var3; // L: 249 + } + } } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "374589634" + descriptor = "(I)Z", + garbageValue = "1628986356" ) - @Export("clearIsInFriendsChat") - void clearIsInFriendsChat() { - this.isInFriendsChat = TriBool.TriBool_unknown; // L: 153 - } // L: 154 + @Export("isFriend") + boolean isFriend() { + if (this.isFriendTriBool == TriBool.TriBool_unknown) { // L: 134 + this.checkIsFriend(); // L: 135 + } + + return this.isFriendTriBool == TriBool.TriBool_true; // L: 137 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "0" + ) + @Export("clearIsFriend") + void clearIsFriend() { + this.isFriendTriBool = TriBool.TriBool_unknown; // L: 141 + } // L: 142 @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1844788103" + ) + @Export("checkIsFriend") + void checkIsFriend() { + this.isFriendTriBool = BufferedSource.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 145 + } // L: 146 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1086408777" + ) + @Export("isFriendsChatMember") + boolean isFriendsChatMember() { + if (this.isInFriendsChat == TriBool.TriBool_unknown) { // L: 149 + this.updateIsInFriendsChat(); // L: 150 + } + + return this.isInFriendsChat == TriBool.TriBool_true; // L: 152 + } + + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "119" + garbageValue = "-55" + ) + @Export("clearIsInFriendsChat") + void clearIsInFriendsChat() { + this.isInFriendsChat = TriBool.TriBool_unknown; // L: 156 + } // L: 157 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "199387675" ) @Export("updateIsInFriendsChat") void updateIsInFriendsChat() { - this.isInFriendsChat = ClientPacket.friendsChat != null && ClientPacket.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 157 - } // L: 158 - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-935029357" - ) - @Export("updateIsInClanChat") - void updateIsInClanChat() { - for (int var1 = 0; var1 < 3; ++var1) { // L: 161 - if (Client.currentClanSettings[var1] != null && Client.currentClanSettings[var1].method2955(this.username.getName()) != -1 && var1 != 2) { // L: 162 163 - this.isInClanChat = TriBool.TriBool_true; // L: 164 - return; // L: 165 - } - } - - this.isInClanChat = TriBool.TriBool_false; // L: 169 - } // L: 170 + this.isInFriendsChat = PcmPlayer.friendsChat != null && PcmPlayer.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 160 + } // L: 161 @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1132300918" + garbageValue = "1914658106" ) - void method2121() { - this.isInClanChat = TriBool.TriBool_unknown; // L: 173 - } // L: 174 + @Export("updateIsInClanChat") + void updateIsInClanChat() { + for (int var1 = 0; var1 < 4; ++var1) { // L: 164 + if (Client.currentClanSettings[var1] != null && Client.currentClanSettings[var1].method2884(this.username.getName()) != -1 && var1 != 2) { // L: 165 166 + this.isInClanChat = TriBool.TriBool_true; // L: 167 + return; // L: 168 + } + } - @ObfuscatedName("k") + this.isInClanChat = TriBool.TriBool_false; // L: 172 + } // L: 173 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1431876622" + ) + void method2114() { + this.isInClanChat = TriBool.TriBool_unknown; // L: 176 + } // L: 177 + + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1003316934" + garbageValue = "1920996538" ) @Export("isClanMember") boolean isClanMember() { - if (this.isInClanChat == TriBool.TriBool_unknown) { // L: 177 - this.updateIsInClanChat(); // L: 178 + if (this.isInClanChat == TriBool.TriBool_unknown) { // L: 180 + this.updateIsInClanChat(); // L: 181 } - return this.isInClanChat == TriBool.TriBool_true; // L: 180 + return this.isInClanChat == TriBool.TriBool_true; // L: 183 } - @ObfuscatedName("d") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-119" + descriptor = "(I)I", + garbageValue = "1044591641" ) @Export("transformedSize") int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? KeyHandler.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 184 185 187 + return this.appearance != null && this.appearance.npcTransformId != -1 ? WorldMapSectionType.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 187 188 190 } - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(IILgm;I)V", - garbageValue = "626817443" + descriptor = "(IILgd;I)V", + garbageValue = "1708455011" ) - final void method2125(int var1, int var2, class193 var3) { - if (super.sequence != -1 && class163.SequenceDefinition_get(super.sequence).field2158 == 1) { // L: 250 + final void method2117(int var1, int var2, class193 var3) { + if (super.sequence != -1 && class114.SequenceDefinition_get(super.sequence).field2206 == 1) { // L: 253 super.sequence = -1; } - super.field1121 = -1; // L: 251 - if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { // L: 252 - if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { // L: 253 - if (var3 == class193.field2187) { - class341.method6279(this, var1, var2, class193.field2187); // L: 255 + super.field1172 = -1; // L: 254 + if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { // L: 255 + if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { // L: 256 + if (var3 == class193.field2248) { + UrlRequester.method2540(this, var1, var2, class193.field2248); // L: 258 } - this.method2127(var1, var2, var3); // L: 256 + this.method2119(var1, var2, var3); // L: 259 } else { this.resetPath(var1, var2); } @@ -538,199 +543,243 @@ public final class Player extends Actor { this.resetPath(var1, var2); } - } // L: 258 + } // L: 261 - @ObfuscatedName("u") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1757316857" + garbageValue = "-2013717198" ) @Export("resetPath") void resetPath(int var1, int var2) { - super.pathLength = 0; // L: 261 - super.field1170 = 0; // L: 262 - super.field1179 = 0; // L: 263 - super.pathX[0] = var1; // L: 264 - super.pathY[0] = var2; // L: 265 - int var3 = this.transformedSize(); // L: 266 - super.x = var3 * 64 + super.pathX[0] * 128; // L: 267 - super.y = var3 * 64 + super.pathY[0] * 128; // L: 268 - } // L: 269 + super.pathLength = 0; // L: 264 + super.field1200 = 0; // L: 265 + super.field1194 = 0; // L: 266 + super.pathX[0] = var1; // L: 267 + super.pathY[0] = var2; // L: 268 + int var3 = this.transformedSize(); // L: 269 + super.x = var3 * 64 + super.pathX[0] * 128; // L: 270 + super.y = super.pathY[0] * 128 + var3 * 64; // L: 271 + } // L: 272 - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IILgm;B)V", - garbageValue = "71" + descriptor = "(IILgd;I)V", + garbageValue = "4079166" ) - final void method2127(int var1, int var2, class193 var3) { - if (super.pathLength < 9) { // L: 272 + final void method2119(int var1, int var2, class193 var3) { + if (super.pathLength < 9) { // L: 275 ++super.pathLength; } - for (int var4 = super.pathLength; var4 > 0; --var4) { // L: 273 - super.pathX[var4] = super.pathX[var4 - 1]; // L: 274 - super.pathY[var4] = super.pathY[var4 - 1]; // L: 275 - super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; // L: 276 + for (int var4 = super.pathLength; var4 > 0; --var4) { // L: 276 + super.pathX[var4] = super.pathX[var4 - 1]; // L: 277 + super.pathY[var4] = super.pathY[var4 - 1]; // L: 278 + super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; // L: 279 } - super.pathX[0] = var1; // L: 278 - super.pathY[0] = var2; // L: 279 - super.pathTraversed[0] = var3; // L: 280 - } // L: 281 + super.pathX[0] = var1; // L: 281 + super.pathY[0] = var2; // L: 282 + super.pathTraversed[0] = var3; // L: 283 + } // L: 284 - @ObfuscatedName("g") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-323504433" + descriptor = "(B)Z", + garbageValue = "-4" ) @Export("isVisible") final boolean isVisible() { - return this.appearance != null; // L: 284 + return this.appearance != null; // L: 287 } - @ObfuscatedName("ao") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "1" + descriptor = "(Lpc;B)V", + garbageValue = "0" ) - static int method2112(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2892 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2893 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2894 - return 1; // L: 2895 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2897 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2898 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2899 - return 1; // L: 2900 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2902 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2903 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2904 - return 1; // L: 2905 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2907 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2908 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2909 - return 1; // L: 2910 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2912 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2913 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2914 - return 1; // L: 2915 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2917 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2918 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2919 - return 1; // L: 2920 - } else { - int var13; - if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2922 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2923 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2924 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2925 - return 1; // L: 2926 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2928 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2929 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2930 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2931 - return 1; // L: 2932 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2934 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2935 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2936 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2937 - return 1; // L: 2938 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2940 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2941 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2942 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2943 - return 1; // L: 2944 - } else { - boolean var12; - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2946 - var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2947 - if (class83.grandExchangeEvents != null) { // L: 2948 - class83.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2949 - } + @Export("updatePlayer") + static final void updatePlayer(PacketBuffer var0) { + var0.importIndex(); // L: 37 + int var1 = Client.localPlayerIndex; // L: 38 + Player var2 = ModelData0.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 - SecureRandomCallable.baseX; // L: 45 + var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46 + var2.pathY[0] = var6 - GrandExchangeOfferOwnWorldComparator.baseY; // L: 47 + var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48 + class128.Client_plane = var2.plane = var4; // L: 49 + if (Players.field1307[var1] != null) { // L: 50 + var2.read(Players.field1307[var1]); + } - return 1; // L: 2951 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2953 - var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2954 - if (class83.grandExchangeEvents != null) { // L: 2955 - class83.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2956 - } + Players.Players_count = 0; // L: 51 + Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52 + Players.field1301[var1] = 0; // L: 53 + Players.Players_emptyIdxCount = 0; // L: 54 - return 1; // L: 2958 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2960 - Interpreter.Interpreter_intStackSize -= 2; // L: 2961 - var12 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == 1; // L: 2962 - boolean var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 2963 - if (class83.grandExchangeEvents != null) { // L: 2964 - Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2965 - class83.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2966 - } - - return 1; // L: 2968 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2970 - var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2971 - if (class83.grandExchangeEvents != null) { // L: 2972 - class83.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2973 - } - - return 1; // L: 2975 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2977 - var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2978 - if (class83.grandExchangeEvents != null) { // L: 2979 - class83.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2980 - } - - return 1; // L: 2982 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2984 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class83.grandExchangeEvents == null ? 0 : class83.grandExchangeEvents.events.size(); // L: 2985 - return 1; // L: 2986 - } else { - GrandExchangeEvent var4; - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2988 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2989 - var4 = (GrandExchangeEvent)class83.grandExchangeEvents.events.get(var3); // L: 2990 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.world; // L: 2991 - return 1; // L: 2992 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2994 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2995 - var4 = (GrandExchangeEvent)class83.grandExchangeEvents.events.get(var3); // L: 2996 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2997 - return 1; // L: 2998 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 3000 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3001 - var4 = (GrandExchangeEvent)class83.grandExchangeEvents.events.get(var3); // L: 3002 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 3003 - return 1; // L: 3004 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 3006 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3007 - var4 = (GrandExchangeEvent)class83.grandExchangeEvents.events.get(var3); // L: 3008 - long var5 = class136.method2931() - WorldMapID.field2388 - var4.age; // L: 3009 - int var7 = (int)(var5 / 3600000L); // L: 3010 - int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 3011 - int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 3012 - String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 3013 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var10; // L: 3014 - return 1; // L: 3015 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 3017 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3018 - var4 = (GrandExchangeEvent)class83.grandExchangeEvents.events.get(var3); // L: 3019 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 3020 - return 1; // L: 3021 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 3023 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3024 - var4 = (GrandExchangeEvent)class83.grandExchangeEvents.events.get(var3); // L: 3025 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 3026 - return 1; // L: 3027 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 3029 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3030 - var4 = (GrandExchangeEvent)class83.grandExchangeEvents.events.get(var3); // L: 3031 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 3032 - return 1; // L: 3033 - } else { - return 2; // L: 3035 - } - } + for (int var7 = 1; var7 < 2048; ++var7) { // L: 55 + if (var7 != var1) { // 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.field1301[var7] = 0; // L: 65 } } + + var0.exportIndex(); // L: 67 + } // L: 68 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)[Lcs;", + garbageValue = "-1603535940" + ) + static class82[] method2159() { + return new class82[]{class82.field1078, class82.field1073, class82.field1076, class82.field1075, class82.field1079}; // L: 16 } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(ILbb;ZB)I", + garbageValue = "-86" + ) + static int method2157(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 1031 + var0 -= 1000; // L: 1032 + var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1033 + } else { + var3 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 1035 + } + + String var4 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1036 + int[] var5 = null; // L: 1037 + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 1038 + int var6 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1039 + if (var6 > 0) { // L: 1040 + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]) { // L: 1041 1042 + } + } + + var4 = var4.substring(0, var4.length() - 1); // L: 1044 + } + + Object[] var8 = new Object[var4.length() + 1]; // L: 1046 + + int var7; + for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 1047 + if (var4.charAt(var7 - 1) == 's') { // L: 1048 + var8[var7] = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; + } else { + var8[var7] = new Integer(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1049 + } + } + + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1051 + if (var7 != -1) { // L: 1052 + var8[0] = new Integer(var7); + } else { + var8 = null; // L: 1053 + } + + if (var0 == ScriptOpcodes.CC_SETONCLICK) { + var3.onClick = var8; // L: 1054 + } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 1055 + var3.onHold = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 1056 + var3.onRelease = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 1057 + var3.onMouseOver = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 1058 + var3.onMouseLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 1059 + var3.onDrag = var8; + } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 1060 + var3.onTargetLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 1061 + var3.onVarTransmit = var8; // L: 1062 + var3.varTransmitTriggers = var5; // L: 1063 + } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 1065 + var3.onTimer = var8; + } else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 1066 + var3.onOp = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 1067 + var3.onDragComplete = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 1068 + var3.onClickRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 1069 + var3.onMouseRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 1070 + var3.onInvTransmit = var8; // L: 1071 + var3.invTransmitTriggers = var5; // L: 1072 + } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 1074 + var3.onStatTransmit = var8; // L: 1075 + var3.statTransmitTriggers = var5; // L: 1076 + } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { // L: 1078 + var3.onTargetEnter = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 1079 + var3.onScroll = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 1080 + var3.onChatTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 1081 + var3.onKey = var8; + } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 1082 + var3.onFriendTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 1083 + var3.onClanTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 1084 + var3.onMiscTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 1085 + var3.onDialogAbort = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1086 + var3.onSubChange = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1087 + var3.onStockTransmit = var8; + } else if (var0 == 1426) { // L: 1088 + var3.field3520 = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { // L: 1089 + var3.onResize = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANSETTINGSTRANSMIT) { // L: 1090 + var3.field3513 = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANCHANNELTRANSMIT) { // L: 1091 + var3.field3456 = var8; + } else if (var0 == 1430) { // L: 1092 + var3.field3443 = var8; + } else if (var0 == 1431) { // L: 1093 + var3.field3510 = var8; + } else { + if (var0 != 1434) { // L: 1094 + return 2; // L: 1095 + } + + var3.field3460 = var8; + } + + var3.hasListener = true; // L: 1096 + return 1; // L: 1097 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2538543" + ) + static void method2135() { + if (ClientPreferences.loadWorlds()) { // L: 1949 + Login.worldSelectOpen = true; // L: 1950 + Login.worldSelectPage = 0; // L: 1951 + Login.worldSelectPagesCount = 0; // L: 1952 + } + + } // L: 1954 } diff --git a/runescape-client/src/main/java/PlayerComposition.java b/runescape-client/src/main/java/PlayerComposition.java index 122424ca8c..3d7b112571 100644 --- a/runescape-client/src/main/java/PlayerComposition.java +++ b/runescape-client/src/main/java/PlayerComposition.java @@ -7,55 +7,50 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("kp") @Implements("PlayerComposition") public class PlayerComposition { - @ObfuscatedName("q") - public static short[] field3304; + @ObfuscatedName("c") + public static short[][] field3366; @ObfuscatedName("w") @Export("equipmentIndices") static final int[] equipmentIndices; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("PlayerAppearance_cachedModels") public static EvictingDualNodeHashTable PlayerAppearance_cachedModels; - @ObfuscatedName("hk") - @ObfuscatedGetter( - intValue = -468225065 - ) - static int field3307; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("equipment") int[] equipment; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("bodyColors") int[] bodyColors; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("isFemale") public boolean isFemale; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1661729967 + intValue = 92752325 ) @Export("npcTransformId") public int npcTransformId; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - longValue = -2450730779169477887L + longValue = -7782152714703146163L ) @Export("hash") long hash; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - longValue = -5318511275487729225L + longValue = -9099438919226183133L ) - long field3301; - @ObfuscatedName("s") + long field3368; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "[Lfj;" + descriptor = "[Lfn;" ) - class168[] field3302; - @ObfuscatedName("l") - boolean field3306; + class168[] field3364; + @ObfuscatedName("s") + boolean field3365; static { equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; // L: 26 @@ -63,24 +58,24 @@ public class PlayerComposition { } public PlayerComposition() { - this.field3306 = false; // L: 21 + this.field3365 = false; // L: 21 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([I[Lfj;Z[IZII)V", - garbageValue = "-299741271" + descriptor = "([I[Lfn;Z[IZII)V", + garbageValue = "2036477706" ) - public void method5570(int[] var1, class168[] var2, boolean var3, int[] var4, boolean var5, int var6) { - this.field3302 = var2; // L: 30 - this.field3306 = var3; // L: 31 + public void method5395(int[] var1, class168[] var2, boolean var3, int[] var4, boolean var5, int var6) { + this.field3364 = var2; // L: 30 + this.field3365 = var3; // L: 31 this.update(var1, var4, var5, var6); // L: 32 } // L: 33 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "([I[IZII)V", - garbageValue = "-1061020993" + garbageValue = "-1891855467" ) @Export("update") public void update(int[] var1, int[] var2, boolean var3, int var4) { @@ -88,9 +83,9 @@ public class PlayerComposition { var1 = new int[12]; // L: 37 for (int var5 = 0; var5 < 7; ++var5) { // L: 38 - for (int var6 = 0; var6 < KitDefinition.KitDefinition_fileCount; ++var6) { // L: 39 - KitDefinition var7 = WorldMapLabel.KitDefinition_get(var6); // L: 40 - if (var7 != null && !var7.nonSelectable && var5 + (var3 ? 7 : 0) == var7.bodypartID) { // L: 41 + for (int var6 = 0; var6 < class147.KitDefinition_fileCount; ++var6) { // L: 39 + KitDefinition var7 = Script.KitDefinition_get(var6); // L: 40 + if (var7 != null && !var7.nonSelectable && var7.bodypartID == var5 + (var3 ? 7 : 0)) { // L: 41 var1[equipmentIndices[var5]] = var6 + 256; // L: 42 break; // L: 43 } @@ -105,10 +100,10 @@ public class PlayerComposition { this.setHash(); // L: 52 } // L: 53 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(IZI)V", - garbageValue = "771015122" + garbageValue = "983810736" ) @Export("changeAppearance") public void changeAppearance(int var1, boolean var2) { @@ -122,17 +117,17 @@ public class PlayerComposition { if (!var2) { // L: 61 --var3; // L: 62 if (var3 < 0) { // L: 63 - var3 = KitDefinition.KitDefinition_fileCount - 1; + var3 = class147.KitDefinition_fileCount - 1; } } else { ++var3; // L: 66 - if (var3 >= KitDefinition.KitDefinition_fileCount) { // L: 67 + if (var3 >= class147.KitDefinition_fileCount) { // L: 67 var3 = 0; } } - var4 = WorldMapLabel.KitDefinition_get(var3); // L: 69 - } while(var4 == null || var4.nonSelectable || var4.bodypartID != (this.isFemale ? 7 : 0) + var1); // L: 70 + var4 = Script.KitDefinition_get(var3); // L: 69 + } while(var4 == null || var4.nonSelectable || (this.isFemale ? 7 : 0) + var1 != var4.bodypartID); // L: 70 this.equipment[equipmentIndices[var1]] = var3 + 256; // L: 72 this.setHash(); // L: 73 @@ -140,31 +135,31 @@ public class PlayerComposition { } } // L: 74 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IZI)V", - garbageValue = "-730659334" + garbageValue = "-2104748199" ) - public void method5594(int var1, boolean var2) { + public void method5394(int var1, boolean var2) { int var3 = this.bodyColors[var1]; // L: 77 boolean var4; if (!var2) { // L: 78 do { - --var3; // L: 80 - if (var3 < 0) { // L: 81 - var3 = class144.field1629[var1].length - 1; // L: 82 + --var3; + if (var3 < 0) { + var3 = DesktopPlatformInfoProvider.field4469[var1].length - 1; } - if (var1 == 4 && var3 >= 8) { // L: 86 + if (var1 == 4 && var3 >= 8) { var4 = false; // L: 87 } else { - var4 = true; // L: 90 + var4 = true; } } while(!var4); // L: 92 } else { do { ++var3; // L: 97 - if (var3 >= class144.field1629[var1].length) { // L: 98 + if (var3 >= DesktopPlatformInfoProvider.field4469[var1].length) { // L: 98 var3 = 0; } @@ -180,10 +175,10 @@ public class PlayerComposition { this.setHash(); // L: 111 } // L: 112 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(ZB)V", - garbageValue = "23" + garbageValue = "108" ) @Export("changeSex") public void changeSex(boolean var1) { @@ -192,10 +187,10 @@ public class PlayerComposition { } } // L: 117 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "103" + descriptor = "(Lpx;I)V", + garbageValue = "1160486905" ) @Export("write") public void write(Buffer var1) { @@ -217,10 +212,10 @@ public class PlayerComposition { } // L: 127 - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "720689587" + descriptor = "(B)V", + garbageValue = "28" ) @Export("setHash") void setHash() { @@ -256,21 +251,21 @@ public class PlayerComposition { this.hash += (long)(this.isFemale ? 1 : 0); // L: 147 this.equipment[5] = var3; // L: 148 this.equipment[9] = var4; // L: 149 - if (0L != var1 && var1 != this.hash || this.field3306) { // L: 150 + if (var1 != 0L && var1 != this.hash || this.field3365) { // L: 150 PlayerAppearance_cachedModels.remove(var1); } } // L: 151 - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lgw;ILgw;II)Liq;", - garbageValue = "2065643699" + descriptor = "(Lgq;ILgq;IB)Lhv;", + garbageValue = "-45" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { if (this.npcTransformId != -1) { // L: 154 - return KeyHandler.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 155 + return WorldMapSectionType.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 155 } else { long var5 = this.hash; // L: 157 int[] var7 = this.equipment; // L: 158 @@ -299,18 +294,18 @@ public class PlayerComposition { int var11; for (int var10 = 0; var10 < 12; ++var10) { // L: 174 var11 = var7[var10]; // L: 175 - if (var11 >= 256 && var11 < 512 && !WorldMapLabel.KitDefinition_get(var11 - 256).ready()) { // L: 176 177 + if (var11 >= 256 && var11 < 512 && !Script.KitDefinition_get(var11 - 256).ready()) { // L: 176 177 var9 = true; } - if (var11 >= 512 && !class19.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 179 180 + if (var11 >= 512 && !FileSystem.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 179 180 var9 = true; } } if (var9) { // L: 183 - if (this.field3301 != -1L) { // L: 184 - var18 = (Model)PlayerAppearance_cachedModels.get(this.field3301); + if (this.field3368 != -1L) { // L: 184 + var18 = (Model)PlayerAppearance_cachedModels.get(this.field3368); } if (var18 == null) { // L: 185 @@ -326,94 +321,94 @@ public class PlayerComposition { for (int var12 = 0; var12 < 12; ++var12) { // L: 190 var13 = var7[var12]; // L: 191 if (var13 >= 256 && var13 < 512) { // L: 192 - ModelData var14 = WorldMapLabel.KitDefinition_get(var13 - 256).getModelData(); // L: 193 + ModelData var14 = Script.KitDefinition_get(var13 - 256).getModelData(); // L: 193 if (var14 != null) { // L: 194 var19[var11++] = var14; } } if (var13 >= 512) { // L: 196 - ItemComposition var22 = class19.ItemDefinition_get(var13 - 512); - ModelData var15 = var22.method3719(this.isFemale); - if (var15 != null) { - if (this.field3302 != null) { - class168 var16 = this.field3302[var12]; - if (var16 != null) { + ItemComposition var22 = FileSystem.ItemDefinition_get(var13 - 512); // L: 197 + ModelData var15 = var22.method3630(this.isFemale); // L: 198 + if (var15 != null) { // L: 199 + if (this.field3364 != null) { // L: 200 + class168 var16 = this.field3364[var12]; // L: 201 + if (var16 != null) { // L: 202 int var17; - if (var16.field1791 != null && var22.recolorFrom != null && var16.field1791.length == var22.recolorTo.length) { - for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { - var15.recolor(var22.recolorTo[var17], var16.field1791[var17]); // L: 205 + if (var16.field1847 != null && var22.recolorFrom != null && var22.recolorTo.length == var16.field1847.length) { // L: 203 + for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { // L: 204 + var15.recolor(var22.recolorTo[var17], var16.field1847[var17]); // L: 205 } } - if (var16.field1790 != null && var22.retextureFrom != null && var22.retextureTo.length == var16.field1790.length) { - for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) { - var15.retexture(var22.retextureTo[var17], var16.field1790[var17]); + if (var16.field1844 != null && var22.retextureFrom != null && var16.field1844.length == var22.retextureTo.length) { // L: 208 + for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) { // L: 209 + var15.retexture(var22.retextureTo[var17], var16.field1844[var17]); // L: 210 } } } } - var19[var11++] = var15; + var19[var11++] = var15; // L: 215 } } } - ModelData var20 = new ModelData(var19, var11); + ModelData var20 = new ModelData(var19, var11); // L: 219 - for (var13 = 0; var13 < 5; ++var13) { - if (this.bodyColors[var13] < class144.field1629[var13].length) { - var20.recolor(field3304[var13], class144.field1629[var13][this.bodyColors[var13]]); + for (var13 = 0; var13 < 5; ++var13) { // L: 220 + if (this.bodyColors[var13] < DesktopPlatformInfoProvider.field4469[var13].length) { // L: 221 + var20.recolor(Coord.field3352[var13], DesktopPlatformInfoProvider.field4469[var13][this.bodyColors[var13]]); } - if (this.bodyColors[var13] < WorldMapRectangle.field2356[var13].length) { // L: 222 - var20.recolor(WorldMapIcon_0.field2300[var13], WorldMapRectangle.field2356[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < field3366[var13].length) { // L: 222 + var20.recolor(class340.field4156[var13], field3366[var13][this.bodyColors[var13]]); } } - var18 = var20.toModel(64, 850, -30, -50, -30); - PlayerAppearance_cachedModels.put(var18, var5); - this.field3301 = var5; + var18 = var20.toModel(64, 850, -30, -50, -30); // L: 224 + PlayerAppearance_cachedModels.put(var18, var5); // L: 225 + this.field3368 = var5; // L: 226 } } - if (var1 == null && var3 == null) { + if (var1 == null && var3 == null) { // L: 230 return var18; } else { Model var21; - if (var1 != null && var3 != null) { + if (var1 != null && var3 != null) { // L: 231 var21 = var1.applyTransformations(var18, var2, var3, var4); - } else if (var1 != null) { + } else if (var1 != null) { // L: 232 var21 = var1.transformActorModel(var18, var2); } else { var21 = var3.transformActorModel(var18, var4); // L: 233 } - return var21; + return var21; // L: 234 } } } - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)Lhc;", - garbageValue = "-801308505" + descriptor = "(B)Lgs;", + garbageValue = "-25" ) @Export("getModelData") ModelData getModelData() { if (this.npcTransformId != -1) { // L: 238 - return KeyHandler.getNpcDefinition(this.npcTransformId).getModelData(); + return WorldMapSectionType.getNpcDefinition(this.npcTransformId).getModelData(); // L: 239 } else { - boolean var1 = false; + boolean var1 = false; // L: 241 int var3; for (int var2 = 0; var2 < 12; ++var2) { // L: 242 - var3 = this.equipment[var2]; - if (var3 >= 256 && var3 < 512 && !WorldMapLabel.KitDefinition_get(var3 - 256).method3447()) { + var3 = this.equipment[var2]; // L: 243 + if (var3 >= 256 && var3 < 512 && !Script.KitDefinition_get(var3 - 256).method3335()) { // L: 244 245 var1 = true; } - if (var3 >= 512 && !class19.ItemDefinition_get(var3 - 512).method3723(this.isFemale)) { // L: 247 248 + if (var3 >= 512 && !FileSystem.ItemDefinition_get(var3 - 512).method3631(this.isFemale)) { // L: 247 248 var1 = true; } } @@ -421,23 +416,23 @@ public class PlayerComposition { if (var1) { // L: 251 return null; } else { - ModelData[] var7 = new ModelData[12]; + ModelData[] var7 = new ModelData[12]; // L: 252 var3 = 0; // L: 253 int var5; - for (int var4 = 0; var4 < 12; ++var4) { - var5 = this.equipment[var4]; + for (int var4 = 0; var4 < 12; ++var4) { // L: 254 + var5 = this.equipment[var4]; // L: 255 ModelData var6; - if (var5 >= 256 && var5 < 512) { - var6 = WorldMapLabel.KitDefinition_get(var5 - 256).getKitDefinitionModels(); - if (var6 != null) { + if (var5 >= 256 && var5 < 512) { // L: 256 + var6 = Script.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 257 + if (var6 != null) { // L: 258 var7[var3++] = var6; } } - if (var5 >= 512) { - var6 = class19.ItemDefinition_get(var5 - 512).method3718(this.isFemale); // L: 261 - if (var6 != null) { + if (var5 >= 512) { // L: 260 + var6 = FileSystem.ItemDefinition_get(var5 - 512).method3632(this.isFemale); // L: 261 + if (var6 != null) { // L: 262 var7[var3++] = var6; } } @@ -445,13 +440,13 @@ public class PlayerComposition { ModelData var8 = new ModelData(var7, var3); // L: 265 - for (var5 = 0; var5 < 5; ++var5) { - if (this.bodyColors[var5] < class144.field1629[var5].length) { - var8.recolor(field3304[var5], class144.field1629[var5][this.bodyColors[var5]]); + for (var5 = 0; var5 < 5; ++var5) { // L: 266 + if (this.bodyColors[var5] < DesktopPlatformInfoProvider.field4469[var5].length) { // L: 267 + var8.recolor(Coord.field3352[var5], DesktopPlatformInfoProvider.field4469[var5][this.bodyColors[var5]]); } - if (this.bodyColors[var5] < WorldMapRectangle.field2356[var5].length) { - var8.recolor(WorldMapIcon_0.field2300[var5], WorldMapRectangle.field2356[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < field3366[var5].length) { // L: 268 + var8.recolor(class340.field4156[var5], field3366[var5][this.bodyColors[var5]]); } } @@ -460,220 +455,44 @@ public class PlayerComposition { } } - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1675843128" + garbageValue = "695614719" ) @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 + KeyHandler.getNpcDefinition(this.npcTransformId).id; // L: 274 + 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 + WorldMapSectionType.getNpcDefinition(this.npcTransformId).id; // L: 274 275 } - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpz;II)V", - garbageValue = "1476146212" + descriptor = "(IIIIB)V", + garbageValue = "-10" ) - @Export("readPlayerUpdate") - static void readPlayerUpdate(PacketBuffer var0, int var1) { - boolean var2 = var0.readBits(1) == 1; // L: 197 - if (var2) { // L: 198 - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } - - int var3 = var0.readBits(2); // L: 199 - Player var4 = Client.players[var1]; // L: 200 - if (var3 == 0) { // L: 201 - if (var2) { // L: 202 - var4.field1070 = false; // L: 203 - } else if (Client.localPlayerIndex == var1) { // L: 206 - throw new RuntimeException(); - } else { - Players.Players_regions[var1] = (var4.plane << 28) + (GrandExchangeOfferOwnWorldComparator.baseX + var4.pathX[0] >> 13 << 14) + (VarcInt.baseY + var4.pathY[0] >> 13); // L: 207 - if (var4.field1121 != -1) { // L: 208 - Players.Players_orientations[var1] = var4.field1121; - } else { - Players.Players_orientations[var1] = var4.orientation; // L: 209 - } - - Players.Players_targetIndices[var1] = var4.targetIndex; // L: 210 - Client.players[var1] = null; // L: 211 - if (var0.readBits(1) != 0) { // L: 212 - class175.updateExternalPlayer(var0, var1); - } - - } - } else { - int var5; - int var6; - int var7; - if (var3 == 1) { // L: 215 - var5 = var0.readBits(3); // L: 216 - var6 = var4.pathX[0]; // L: 217 - var7 = var4.pathY[0]; // L: 218 - if (var5 == 0) { // L: 219 - --var6; // L: 220 - --var7; // L: 221 - } else if (var5 == 1) { // L: 223 - --var7; - } else if (var5 == 2) { // L: 224 - ++var6; // L: 225 - --var7; // L: 226 - } else if (var5 == 3) { // L: 228 - --var6; - } else if (var5 == 4) { // L: 229 - ++var6; - } else if (var5 == 5) { // L: 230 - --var6; // L: 231 - ++var7; // L: 232 - } else if (var5 == 6) { // L: 234 - ++var7; - } else if (var5 == 7) { // L: 235 - ++var6; // L: 236 - ++var7; // L: 237 - } - - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 239 - var4.resetPath(var6, var7); // L: 240 - var4.field1070 = false; // L: 241 - } else if (var2) { // L: 243 - var4.field1070 = true; // L: 244 - var4.tileX = var6; // L: 245 - var4.tileY = var7; // L: 246 - } else { - var4.field1070 = false; // L: 249 - var4.method2125(var6, var7, Players.field1286[var1]); // L: 250 - } - - } else if (var3 == 2) { // L: 254 - var5 = var0.readBits(4); // L: 255 - var6 = var4.pathX[0]; // L: 256 - var7 = var4.pathY[0]; // L: 257 - if (var5 == 0) { // L: 258 - var6 -= 2; // L: 259 - var7 -= 2; // L: 260 - } else if (var5 == 1) { // L: 262 - --var6; // L: 263 - var7 -= 2; // L: 264 - } else if (var5 == 2) { // L: 266 - var7 -= 2; - } else if (var5 == 3) { // L: 267 - ++var6; // L: 268 - var7 -= 2; // L: 269 - } else if (var5 == 4) { // L: 271 - var6 += 2; // L: 272 - var7 -= 2; // L: 273 - } else if (var5 == 5) { // L: 275 - var6 -= 2; // L: 276 - --var7; // L: 277 - } else if (var5 == 6) { // L: 279 - var6 += 2; // L: 280 - --var7; // L: 281 - } else if (var5 == 7) { // L: 283 - var6 -= 2; - } else if (var5 == 8) { // L: 284 - var6 += 2; - } else if (var5 == 9) { // L: 285 - var6 -= 2; // L: 286 - ++var7; // L: 287 - } else if (var5 == 10) { // L: 289 - var6 += 2; // L: 290 - ++var7; // L: 291 - } else if (var5 == 11) { // L: 293 - var6 -= 2; // L: 294 - var7 += 2; // L: 295 - } else if (var5 == 12) { // L: 297 - --var6; // L: 298 - var7 += 2; // L: 299 - } else if (var5 == 13) { // L: 301 - var7 += 2; - } else if (var5 == 14) { // L: 302 - ++var6; // L: 303 - var7 += 2; // L: 304 - } else if (var5 == 15) { // L: 306 - var6 += 2; // L: 307 - var7 += 2; // L: 308 - } - - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 310 - var4.resetPath(var6, var7); // L: 311 - var4.field1070 = false; // L: 312 - } else if (var2) { // L: 314 - var4.field1070 = true; // L: 315 - var4.tileX = var6; // L: 316 - var4.tileY = var7; // L: 317 - } else { - var4.field1070 = false; // L: 320 - var4.method2125(var6, var7, Players.field1286[var1]); // L: 321 - } - - } else { - var5 = var0.readBits(1); // L: 325 - int var8; - int var9; - int var10; - int var11; - if (var5 == 0) { // L: 326 - var6 = var0.readBits(12); // L: 327 - var7 = var6 >> 10; // L: 328 - var8 = var6 >> 5 & 31; // L: 329 - if (var8 > 15) { // L: 330 - var8 -= 32; + static final void method5408(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 + NPC.field1259[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]; } - var9 = var6 & 31; // L: 331 - if (var9 > 15) { // L: 332 - var9 -= 32; + if (var5 == var0 + var2 && var5 < 103) { // L: 84 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; } - var10 = var8 + var4.pathX[0]; // L: 333 - var11 = var9 + var4.pathY[0]; // L: 334 - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 335 - if (var2) { // L: 339 - var4.field1070 = true; // L: 340 - var4.tileX = var10; // L: 341 - var4.tileY = var11; // L: 342 - } else { - var4.field1070 = false; // L: 345 - var4.method2125(var10, var11, Players.field1286[var1]); // L: 346 - } - } else { - var4.resetPath(var10, var11); // L: 336 - var4.field1070 = false; // L: 337 + if (var4 == var1 && var4 > 0) { // L: 85 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; } - var4.plane = (byte)(var7 + var4.plane & 3); // L: 348 - if (Client.localPlayerIndex == var1) { // L: 349 - class18.Client_plane = var4.plane; + if (var3 + var1 == var4 && var4 < 103) { // L: 86 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; } - - } else { - var6 = var0.readBits(30); // L: 352 - var7 = var6 >> 28; // L: 353 - var8 = var6 >> 14 & 16383; // L: 354 - var9 = var6 & 16383; // L: 355 - var10 = (var8 + GrandExchangeOfferOwnWorldComparator.baseX + var4.pathX[0] & 16383) - GrandExchangeOfferOwnWorldComparator.baseX; // L: 356 - var11 = (var9 + VarcInt.baseY + var4.pathY[0] & 16383) - VarcInt.baseY; // L: 357 - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 358 - var4.resetPath(var10, var11); // L: 359 - var4.field1070 = false; // L: 360 - } else if (var2) { // L: 362 - var4.field1070 = true; // L: 363 - var4.tileX = var10; // L: 364 - var4.tileY = var11; // L: 365 - } else { - var4.field1070 = false; // L: 368 - var4.method2125(var10, var11, Players.field1286[var1]); // L: 369 - } - - var4.plane = (byte)(var7 + var4.plane & 3); // L: 371 - if (Client.localPlayerIndex == var1) { // L: 372 - class18.Client_plane = var4.plane; - } - } } } - } // L: 204 213 252 323 350 373 + + } // L: 90 } diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index 72615ad0fe..915bccb1ec 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -3,76 +3,80 @@ 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("ka") +@ObfuscatedName("kg") @Implements("PlayerType") public enum PlayerType implements MouseWheel { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lkg;" ) @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lkg;" ) @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lkg;" ) @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lkg;" ) @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lkg;" ) @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lkg;" ) @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true), + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lkg;" + ) + field3989(6, 22, false, false, true), @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lkg;" ) - field3923(6, 22, false, false, true), - @ObfuscatedName("l") + field3984(7, 41, false, false, true), + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lkg;" ) - field3927(7, 41, false, false, true), - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lka;" - ) - field3920(8, 42, false, false, true); + field3990(8, 42, false, false, true); - @ObfuscatedName("o") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1109984117 + intValue = -455840439 + ) + static int field3985; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1489316805 ) @Export("id") final int id; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 571102393 + intValue = -468786571 ) @Export("modIcon") public final int modIcon; - @ObfuscatedName("p") + @ObfuscatedName("c") @Export("isPrivileged") public final boolean isPrivileged; @ObfuscatedName("w") @@ -81,347 +85,18 @@ public enum PlayerType implements MouseWheel { PlayerType(int var3, int var4, boolean var5, boolean var6, boolean var7) { this.id = var3; // L: 26 - this.modIcon = var4; - this.isPrivileged = var6; - this.isUser = var7; - } + this.modIcon = var4; // L: 27 + this.isPrivileged = var6; // L: 28 + this.isUser = var7; // L: 29 + } // L: 30 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 33 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Llo;I)I", - garbageValue = "-380323275" - ) - @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 - byte var7 = 0; // L: 15 - byte var8 = 0; // L: 16 - - 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 = (char)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 - byte var12; - if (var10 == 198) { // L: 60 - var12 = 69; // L: 61 - } else if (var10 == 230) { // L: 64 - var12 = 101; // L: 65 - } else if (var10 == 223) { // L: 68 - var12 = 115; // L: 69 - } else if (var10 == 338) { // L: 72 - var12 = 69; // L: 73 - } else if (var10 == 339) { // L: 76 - var12 = 101; // L: 77 - } else { - var12 = 0; // L: 80 - } - - var8 = var12; // L: 82 - var9 = class291.standardizeChar(var9, var2); // L: 83 - var10 = class291.standardizeChar(var10, var2); // L: 84 - if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 85 - var9 = Character.toLowerCase(var9); // L: 86 - var10 = Character.toLowerCase(var10); // L: 87 - if (var10 != var9) { // L: 88 - return SecureRandomCallable.lowercaseChar(var9, var2) - SecureRandomCallable.lowercaseChar(var10, var2); - } - } - } - - int var16 = Math.min(var3, var4); // L: 91 - - int var17; - char var20; - for (var17 = 0; var17 < var16; ++var17) { // L: 92 - if (var2 == Language.Language_FR) { // L: 93 - var5 = var3 - 1 - var17; // L: 94 - var6 = var4 - 1 - var17; // L: 95 - } else { - var6 = var17; // L: 97 - var5 = var17; - } - - char var18 = var0.charAt(var5); // L: 98 - var20 = var1.charAt(var6); // L: 99 - if (var20 != var18 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) { // L: 100 - var18 = Character.toLowerCase(var18); // L: 101 - var20 = Character.toLowerCase(var20); // L: 102 - if (var18 != var20) { - return SecureRandomCallable.lowercaseChar(var18, var2) - SecureRandomCallable.lowercaseChar(var20, var2); // L: 103 - } - } - } - - var17 = var3 - var4; // L: 106 - if (var17 != 0) { // L: 107 - return var17; - } else { - for (int var19 = 0; var19 < var16; ++var19) { // L: 108 - var20 = var0.charAt(var19); // L: 109 - char var13 = var1.charAt(var19); // L: 110 - if (var13 != var20) { // L: 111 - return SecureRandomCallable.lowercaseChar(var20, var2) - SecureRandomCallable.lowercaseChar(var13, var2); - } - } - - return 0; // L: 113 - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "1428968028" - ) - static int method5803(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1882 - Interpreter.Interpreter_intStackSize -= 3; // L: 1883 - Actor.queueSoundEffect(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]); // L: 1884 - return 1; // L: 1885 - } else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1887 - SoundCache.playSong(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1888 - return 1; // L: 1889 - } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1891 - Interpreter.Interpreter_intStackSize -= 2; // L: 1892 - Players.method2419(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 1893 - return 1; // L: 1894 - } else { - class83 var3; - class82 var4; - int var5; - int var6; - String var7; - if (var0 != 3212 && var0 != 3213 && var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { // L: 1896 - if (var0 != 3214 && var0 != 3215 && var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { // L: 2008 - return var0 == 3211 ? 1 : 2; // L: 2117 2118 2120 - } else { - var3 = class83.field1064; // L: 2009 - var4 = class82.field1055; // L: 2010 - boolean var8 = false; // L: 2011 - if (var0 == 3214) { // L: 2012 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2013 - var3 = (class83)MusicPatchPcmStream.findEnumerated(SpotAnimationDefinition.method3549(), var6); // L: 2014 - if (var3 == null) { // L: 2015 - throw new RuntimeException(String.format("Unrecognized device option %d", var6)); // L: 2016 - } - } - - if (var0 == 3215) { // L: 2019 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2020 - var4 = (class82)MusicPatchPcmStream.findEnumerated(ArchiveDisk.method6935(), var6); // L: 2021 - if (var4 == null) { // L: 2022 - throw new RuntimeException(String.format("Unrecognized game option %d", var6)); // L: 2023 - } - } - - if (var0 == 3210) { // L: 2026 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2027 - var3 = (class83)MusicPatchPcmStream.findEnumerated(SpotAnimationDefinition.method3549(), var6); // L: 2028 - if (var3 == null) { // L: 2029 - var4 = (class82)MusicPatchPcmStream.findEnumerated(ArchiveDisk.method6935(), var6); // L: 2030 - if (var4 == null) { // L: 2031 - throw new RuntimeException(String.format("Unrecognized client option %d", var6)); // L: 2032 - } - } - } else if (var0 == 3182) { // L: 2036 - var3 = class83.field1065; // L: 2037 - } else if (var0 == 3204) { // L: 2039 - var4 = class82.field1059; // L: 2040 - } else if (var0 == 3206) { // L: 2042 - var4 = class82.field1057; // L: 2043 - } else if (var0 == 3208) { // L: 2045 - var4 = class82.field1056; // L: 2046 - } - - if (var4 == class82.field1055) { // L: 2048 - switch(var3.field1060) { // L: 2049 - case 1: - var5 = class131.clientPreferences.method2317() ? 1 : 0; // L: 2057 - break; // L: 2058 - case 2: - var5 = class131.clientPreferences.method2279() ? 1 : 0; // L: 2067 - break; // L: 2068 - case 3: - var5 = class131.clientPreferences.method2236() ? 1 : 0; // L: 2052 - break; - case 4: - var5 = class131.clientPreferences.method2238(); // L: 2062 - break; // L: 2063 - case 5: - var5 = VarbitComposition.method3578(); // L: 2072 - break; // L: 2073 - default: - var7 = String.format("Unkown device option: %s.", var3.toString()); // L: 2077 - throw new RuntimeException(var7); // L: 2078 - } - } else { - switch(var4.field1054) { // L: 2083 - case 1: - var5 = class131.clientPreferences.method2263() ? 1 : 0; // L: 2092 - break; // L: 2093 - case 2: - var6 = class131.clientPreferences.method2321(); // L: 2108 - var5 = Math.round((float)(var6 * 100) / 255.0F); // L: 2109 - break; - case 3: - var6 = class131.clientPreferences.method2243(); // L: 2102 - var5 = Math.round((float)(var6 * 100) / 127.0F); // L: 2103 - break; // L: 2104 - case 4: - var6 = class131.clientPreferences.method2270(); // L: 2086 - var5 = Math.round((float)(var6 * 100) / 127.0F); // L: 2087 - break; // L: 2088 - default: - var7 = String.format("Unkown game option: %s.", var4.toString()); // L: 2097 - throw new RuntimeException(var7); // L: 2098 - } - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5; // L: 2114 - return 1; // L: 2115 - } - } else { - var3 = class83.field1064; // L: 1897 - var4 = class82.field1055; // L: 1898 - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1899 - if (var0 == 3212) { // L: 1900 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1901 - var3 = (class83)MusicPatchPcmStream.findEnumerated(SpotAnimationDefinition.method3549(), var6); // L: 1902 - if (var3 == null) { // L: 1903 - throw new RuntimeException(String.format("Unrecognized device option %d", var6)); // L: 1904 - } - } - - if (var0 == 3213) { // L: 1907 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1908 - var4 = (class82)MusicPatchPcmStream.findEnumerated(ArchiveDisk.method6935(), var6); // L: 1909 - if (var4 == null) { // L: 1910 - throw new RuntimeException(String.format("Unrecognized game option %d", var6)); // L: 1911 - } - } - - if (var0 == 3209) { // L: 1914 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1915 - var3 = (class83)MusicPatchPcmStream.findEnumerated(SpotAnimationDefinition.method3549(), var6); // L: 1916 - if (var3 == null) { // L: 1917 - var4 = (class82)MusicPatchPcmStream.findEnumerated(ArchiveDisk.method6935(), var6); // L: 1918 - if (var4 == null) { // L: 1919 - throw new RuntimeException(String.format("Unrecognized client option %d", var6)); // L: 1920 - } - } - } else if (var0 == 3181) { // L: 1924 - var3 = class83.field1065; // L: 1925 - } else if (var0 == 3203) { // L: 1927 - var4 = class82.field1059; // L: 1928 - } else if (var0 == 3205) { // L: 1930 - var4 = class82.field1057; // L: 1931 - } else if (var0 == 3207) { // L: 1933 - var4 = class82.field1056; // L: 1934 - } - - if (var4 == class82.field1055) { // L: 1936 - switch(var3.field1060) { // L: 1937 - case 1: - class131.clientPreferences.method2230(var5 == 1); // L: 1961 - break; // L: 1962 - case 2: - class131.clientPreferences.method2237(var5 == 1); // L: 1946 - break; // L: 1947 - case 3: - class131.clientPreferences.method2234(var5 == 1); // L: 1966 - break; // L: 1967 - case 4: - if (var5 < 0) { // L: 1940 - var5 = 0; - } - - class131.clientPreferences.method2260(var5); // L: 1941 - break; - case 5: - class113.method2650(var5); // L: 1951 - break; // L: 1952 - default: - var7 = String.format("Unkown device option: %s.", var3.toString()); // L: 1956 - throw new RuntimeException(var7); // L: 1957 - } - } else { - switch(var4.field1054) { // L: 1972 - case 1: - class131.clientPreferences.method2246(var5 == 1); // L: 1980 - break; // L: 1981 - case 2: - var5 = Math.min(Math.max(var5, 0), 100); // L: 1992 - var6 = Math.round((float)(var5 * 255) / 100.0F); // L: 1993 - class1.method11(var6); // L: 1994 - break; // L: 1995 - case 3: - var5 = Math.min(Math.max(var5, 0), 100); // L: 1985 - var6 = Math.round((float)(var5 * 127) / 100.0F); // L: 1986 - class126.method2824(var6); // L: 1987 - break; // L: 1988 - case 4: - var5 = Math.min(Math.max(var5, 0), 100); // L: 1999 - var6 = Math.round((float)(var5 * 127) / 100.0F); // L: 2000 - class127.method2830(var6); // L: 2001 - break; // L: 2002 - default: - var7 = String.format("Unkown game option: %s.", var4.toString()); // L: 1975 - throw new RuntimeException(var7); // L: 1976 - } - } - - return 1; // L: 2006 - } - } + return this.id; // L: 34 } } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index cd71fd6272..fbaaac70eb 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -4,73 +4,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cg") +@ObfuscatedName("cl") @Implements("Players") public class Players { - @ObfuscatedName("i") - static byte[] field1283; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "[Lgm;" - ) - static class193[] field1286; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "[Lpi;" - ) - static Buffer[] field1276; - @ObfuscatedName("n") + @ObfuscatedName("sh") @ObfuscatedGetter( - intValue = 1248043757 + intValue = -419051257 + ) + static int field1317; + @ObfuscatedName("l") + static byte[] field1301; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "[Lgd;" + ) + static class193[] field1302; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "[Lpx;" + ) + static Buffer[] field1307; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -193801041 ) @Export("Players_count") static int Players_count; - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("Players_indices") static int[] Players_indices; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1950904155 + intValue = -1455321023 ) @Export("Players_emptyIdxCount") static int Players_emptyIdxCount; - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("Players_emptyIndices") static int[] Players_emptyIndices; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("Players_regions") static int[] Players_regions; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("Players_orientations") static int[] Players_orientations; - @ObfuscatedName("p") + @ObfuscatedName("c") @Export("Players_targetIndices") static int[] Players_targetIndices; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -2045827781 + intValue = -1176869757 ) @Export("Players_pendingUpdateCount") static int Players_pendingUpdateCount; - @ObfuscatedName("k") + @ObfuscatedName("b") @Export("Players_pendingUpdateIndices") static int[] Players_pendingUpdateIndices; - @ObfuscatedName("d") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lpi;" + descriptor = "Lpx;" ) - static Buffer field1273; - @ObfuscatedName("ef") - @ObfuscatedSignature( - descriptor = "Llx;" - ) - @Export("archive5") - static Archive archive5; + static Buffer field1306; static { - field1283 = new byte[2048]; // L: 18 - field1286 = new class193[2048]; // L: 19 - field1276 = new Buffer[2048]; // L: 20 + field1301 = new byte[2048]; // L: 18 + field1302 = new class193[2048]; // L: 19 + field1307 = new Buffer[2048]; // L: 20 Players_count = 0; // L: 21 Players_indices = new int[2048]; // L: 22 Players_emptyIdxCount = 0; // L: 23 @@ -80,71 +79,225 @@ public class Players { Players_targetIndices = new int[2048]; // L: 27 Players_pendingUpdateCount = 0; // L: 28 Players_pendingUpdateIndices = new int[2048]; // L: 29 - field1273 = new Buffer(new byte[5000]); // L: 30 + field1306 = new Buffer(new byte[5000]); // L: 30 } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "124" + descriptor = "(I)Z", + garbageValue = "-145581238" ) - public static int method2420(int var0) { - return var0 >> 17 & 7; // L: 13 + public static boolean method2427() { + try { + if (class273.musicPlayerStatus == 2) { // L: 74 + if (class273.musicTrack == null) { // L: 75 + class273.musicTrack = MusicTrack.readTrack(ClanChannelMember.musicTrackArchive, StructComposition.musicTrackGroupId, FriendsList.musicTrackFileId); // L: 76 + if (class273.musicTrack == null) { // L: 77 + return false; + } + } + + if (class152.soundCache == null) { // L: 79 + class152.soundCache = new SoundCache(class273.soundEffectsArchive, class462.musicSamplesArchive); + } + + if (class273.midiPcmStream.loadMusicTrack(class273.musicTrack, class273.musicPatchesArchive, class152.soundCache, 22050)) { // L: 80 + class273.midiPcmStream.clearAll(); // L: 81 + class273.midiPcmStream.setPcmStreamVolume(Clock.musicTrackVolume); // L: 82 + class273.midiPcmStream.setMusicTrack(class273.musicTrack, VertexNormal.musicTrackBoolean); // L: 83 + class273.musicPlayerStatus = 0; // L: 84 + class273.musicTrack = null; // L: 85 + class152.soundCache = null; // L: 86 + ClanChannelMember.musicTrackArchive = null; // L: 87 + return true; // L: 88 + } + } + } catch (Exception var1) { // L: 92 + var1.printStackTrace(); // L: 93 + class273.midiPcmStream.clear(); // L: 94 + class273.musicPlayerStatus = 0; // L: 95 + class273.musicTrack = null; // L: 96 + class152.soundCache = null; // L: 97 + ClanChannelMember.musicTrackArchive = null; // L: 98 + } + + return false; // L: 100 } - @ObfuscatedName("c") + @ObfuscatedName("jk") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-54" + descriptor = "(Lki;II)I", + garbageValue = "-1939093407" ) - @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 + static final int method2413(Widget var0, int var1) { + if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 10905 + try { + int[] var2 = var0.cs1Instructions[var1]; // L: 10907 + int var3 = 0; // L: 10908 + int var4 = 0; // L: 10909 + byte var5 = 0; // L: 10910 - 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 + while (true) { + int var6 = var2[var4++]; // L: 10912 + int var7 = 0; // L: 10913 + byte var8 = 0; // L: 10914 + if (var6 == 0) { // L: 10915 + return var3; + } + + if (var6 == 1) { // L: 10916 + var7 = Client.currentLevels[var2[var4++]]; + } + + if (var6 == 2) { // L: 10917 + var7 = Client.levels[var2[var4++]]; + } + + if (var6 == 3) { // L: 10918 + var7 = Client.experience[var2[var4++]]; + } + + int var9; + Widget var10; + int var11; + int var12; + if (var6 == 4) { // L: 10919 + var9 = var2[var4++] << 16; // L: 10920 + var9 += var2[var4++]; // L: 10921 + var10 = class92.getWidget(var9); // L: 10922 + var11 = var2[var4++]; // L: 10923 + if (var11 != -1 && (!FileSystem.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10924 + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10925 + if (var11 + 1 == var10.itemIds[var12]) { // L: 10926 + var7 += var10.itemQuantities[var12]; + } + } + } + } + + if (var6 == 5) { // L: 10930 + var7 = Varps.Varps_main[var2[var4++]]; + } + + if (var6 == 6) { // L: 10931 + var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; + } + + if (var6 == 7) { // L: 10932 + var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; + } + + if (var6 == 8) { // L: 10933 + var7 = ModelData0.localPlayer.combatLevel; + } + + if (var6 == 9) { // L: 10934 + for (var9 = 0; var9 < 25; ++var9) { // L: 10935 + if (Skills.Skills_enabled[var9]) { // L: 10936 + var7 += Client.levels[var9]; + } + } + } + + if (var6 == 10) { // L: 10939 + var9 = var2[var4++] << 16; // L: 10940 + var9 += var2[var4++]; // L: 10941 + var10 = class92.getWidget(var9); // L: 10942 + var11 = var2[var4++]; // L: 10943 + if (var11 != -1 && (!FileSystem.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10944 + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10945 + if (var11 + 1 == var10.itemIds[var12]) { // L: 10946 + var7 = 999999999; // L: 10947 + break; // L: 10948 + } + } + } + } + + if (var6 == 11) { // L: 10953 + var7 = Client.runEnergy; + } + + if (var6 == 12) { // L: 10954 + var7 = Client.weight; + } + + if (var6 == 13) { // L: 10955 + var9 = Varps.Varps_main[var2[var4++]]; // L: 10956 + int var13 = var2[var4++]; // L: 10957 + var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 10958 + } + + if (var6 == 14) { // L: 10960 + var9 = var2[var4++]; // L: 10961 + var7 = class18.getVarbit(var9); // L: 10962 + } + + if (var6 == 15) { // L: 10964 + var8 = 1; + } + + if (var6 == 16) { // L: 10965 + var8 = 2; + } + + if (var6 == 17) { // L: 10966 + var8 = 3; + } + + if (var6 == 18) { // L: 10967 + var7 = (ModelData0.localPlayer.x >> 7) + SecureRandomCallable.baseX; + } + + if (var6 == 19) { // L: 10968 + var7 = (ModelData0.localPlayer.y >> 7) + GrandExchangeOfferOwnWorldComparator.baseY; + } + + if (var6 == 20) { // L: 10969 + var7 = var2[var4++]; + } + + if (var8 == 0) { // L: 10970 + if (var5 == 0) { // L: 10971 + var3 += var7; + } + + if (var5 == 1) { // L: 10972 + var3 -= var7; + } + + if (var5 == 2 && var7 != 0) { // L: 10973 + var3 /= var7; + } + + if (var5 == 3) { // L: 10974 + var3 *= var7; + } + + var5 = 0; // L: 10975 + } else { + var5 = var8; // L: 10977 + } + } + } catch (Exception var14) { // L: 10980 + return -1; // L: 10981 } + } else { + return -2; } + } - World.World_sortOption1 = var2; // L: 75 - World.World_sortOption2 = var3; // L: 76 - class127.sortWorlds(DevicePcmPlayerProvider.World_worlds, 0, DevicePcmPlayerProvider.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77 - } // L: 78 - - @ObfuscatedName("i") + @ObfuscatedName("jl") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1709005821" + descriptor = "(IB)V", + garbageValue = "4" ) - static void method2421() { - if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 240 - if (class131.clientPreferences.method2247() != null) { // L: 241 - Login.Login_username = class131.clientPreferences.method2247(); // L: 242 - Client.Login_isUsernameRemembered = true; // L: 243 - } else { - Client.Login_isUsernameRemembered = false; // L: 245 - } - - } - } // L: 246 - - @ObfuscatedName("fk") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "2053593928" - ) - static void method2419(int var0, int var1) { - if (class131.clientPreferences.method2321() != 0 && var0 != -1) { // L: 3622 - class18.method266(Message.archive11, var0, 0, class131.clientPreferences.method2321(), false); // L: 3623 - Client.playingJingle = true; // L: 3624 - } - - } // L: 3626 + static void method2426(int var0) { + class116.tempMenuAction = new MenuAction(); // L: 11910 + class116.tempMenuAction.param0 = Client.menuArguments1[var0]; // L: 11911 + class116.tempMenuAction.param1 = Client.menuArguments2[var0]; // L: 11912 + class116.tempMenuAction.opcode = Client.menuOpcodes[var0]; // L: 11913 + class116.tempMenuAction.identifier = Client.menuIdentifiers[var0]; // L: 11914 + class116.tempMenuAction.action = Client.menuActions[var0]; // L: 11915 + } // L: 11916 } diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java index 5269101bab..894c873f00 100644 --- a/runescape-client/src/main/java/PrivateChatMode.java +++ b/runescape-client/src/main/java/PrivateChatMode.java @@ -3,37 +3,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qa") +@ObfuscatedName("qb") @Implements("PrivateChatMode") public class PrivateChatMode { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lqa;" + descriptor = "Lqb;" ) - static final PrivateChatMode field4741; - @ObfuscatedName("c") + static final PrivateChatMode field4795; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lqa;" + descriptor = "Lqb;" ) - public static final PrivateChatMode field4739; - @ObfuscatedName("i") + public static final PrivateChatMode field4794; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lqa;" + descriptor = "Lqb;" ) - static final PrivateChatMode field4738; - @ObfuscatedName("f") + static final PrivateChatMode field4793; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1733713795 + intValue = -1775266883 ) - public final int field4740; + public final int field4796; static { - field4741 = new PrivateChatMode(0); // L: 5 - field4739 = new PrivateChatMode(1); // L: 6 - field4738 = new PrivateChatMode(2); + field4795 = new PrivateChatMode(0); // L: 5 + field4794 = new PrivateChatMode(1); // L: 6 + field4793 = new PrivateChatMode(2); } // L: 7 PrivateChatMode(int var1) { - this.field4740 = var1; // L: 11 + this.field4796 = var1; // L: 11 } // L: 12 } diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index b3c3d420b8..2434b8aba6 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -3,131 +3,136 @@ 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("by") +@ObfuscatedName("bq") @Implements("Projectile") public final class Projectile extends Renderable { - @ObfuscatedName("v") + @ObfuscatedName("is") + @ObfuscatedSignature( + descriptor = "[Lqr;" + ) + @Export("crossSprites") + static SpritePixels[] crossSprites; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1442012707 + intValue = -1270230427 ) @Export("id") int id; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 895014891 + intValue = -2041826239 ) @Export("plane") int plane; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -420653117 + intValue = -1745093525 ) @Export("sourceX") int sourceX; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1496061701 + intValue = -1313084137 ) @Export("sourceY") int sourceY; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1469136561 + intValue = -771723281 ) @Export("sourceZ") int sourceZ; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1839040857 + intValue = 1417687011 ) @Export("endHeight") int endHeight; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1959449499 + intValue = 1939828539 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1003905831 + intValue = -269487725 ) @Export("cycleEnd") int cycleEnd; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -466516667 + intValue = -1305552491 ) @Export("slope") int slope; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1789079227 + intValue = -717216545 ) @Export("startHeight") int startHeight; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1371380693 + intValue = -2047363817 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("p") + @ObfuscatedName("c") @Export("isMoving") boolean isMoving; @ObfuscatedName("w") @Export("x") double x; - @ObfuscatedName("k") + @ObfuscatedName("b") @Export("y") double y; - @ObfuscatedName("d") + @ObfuscatedName("t") @Export("z") double z; - @ObfuscatedName("m") + @ObfuscatedName("g") @Export("speedX") double speedX; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("speedY") double speedY; - @ObfuscatedName("t") + @ObfuscatedName("n") @Export("speed") double speed; - @ObfuscatedName("g") + @ObfuscatedName("e") @Export("speedZ") double speedZ; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("accelerationZ") double accelerationZ; - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1968761335 + intValue = 1944098901 ) @Export("yaw") int yaw; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1799408283 + intValue = 932506569 ) @Export("pitch") int pitch; @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Lgq;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -957445753 + intValue = 804241453 ) @Export("frame") int frame; - @ObfuscatedName("z") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 75771285 + intValue = 1940243561 ) @Export("frameCycle") int frameCycle; @@ -148,19 +153,19 @@ public final class Projectile extends Renderable { this.targetIndex = var10; // L: 45 this.endHeight = var11; // L: 46 this.isMoving = false; // L: 47 - int var12 = ClientPreferences.SpotAnimationDefinition_get(this.id).sequence; // L: 48 + int var12 = class136.SpotAnimationDefinition_get(this.id).sequence; // L: 48 if (var12 != -1) { // L: 49 - this.sequenceDefinition = class163.SequenceDefinition_get(var12); + this.sequenceDefinition = class114.SequenceDefinition_get(var12); } else { this.sequenceDefinition = null; // L: 50 } } // L: 51 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "5" + descriptor = "(IIIII)V", + garbageValue = "253345363" ) @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { @@ -168,9 +173,9 @@ public final class Projectile extends Renderable { 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.sourceX + var5 * (double)this.startHeight / var9; // 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.startHeight * var5 / var9 + (double)this.sourceX; // L: 58 + this.y = (double)this.startHeight * var7 / var9 + (double)this.sourceY; // L: 59 this.z = (double)this.sourceZ; // L: 60 } @@ -185,16 +190,16 @@ public final class Projectile extends Renderable { this.accelerationZ = ((double)var3 - this.z - this.speedZ * var5) * 2.0D / (var5 * var5); // L: 67 } // L: 68 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)Liq;", - garbageValue = "103" + descriptor = "(I)Lhv;", + garbageValue = "-238822980" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = ClientPreferences.SpotAnimationDefinition_get(this.id); - Model var2 = var1.getModel(this.frame); - if (var2 == null) { + SpotAnimationDefinition var1 = class136.SpotAnimationDefinition_get(this.id); // L: 101 + Model var2 = var1.getModel(this.frame); // L: 102 + if (var2 == null) { // L: 103 return null; } else { var2.rotateZ(this.pitch); // L: 104 @@ -202,596 +207,58 @@ public final class Projectile extends Renderable { } } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "385748138" + garbageValue = "1804737749" ) @Export("advance") final void advance(int var1) { - this.isMoving = true; - this.x += this.speedX * (double)var1; - this.y += this.speedY * (double)var1; // L: 73 - this.z += (double)var1 * this.speedZ + (double)var1 * 0.5D * this.accelerationZ * (double)var1; - this.speedZ += this.accelerationZ * (double)var1; - this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047; - this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; - if (this.sequenceDefinition != null) { - if (!this.sequenceDefinition.isCachedModelIdSet()) { - this.frameCycle += var1; + this.isMoving = true; // L: 71 + this.x += (double)var1 * this.speedX; // L: 72 + this.y += (double)var1 * this.speedY; // L: 73 + this.z += (double)var1 * this.speedZ + (double)var1 * this.accelerationZ * 0.5D * (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 + if (this.sequenceDefinition != null) { // L: 78 + if (!this.sequenceDefinition.isCachedModelIdSet()) { // L: 79 + this.frameCycle += var1; // L: 80 while (true) { do { do { - if (this.frameCycle <= this.sequenceDefinition.frameLengths[this.frame]) { - return; + if (this.frameCycle <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 81 + return; // L: 98 } this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; // L: 82 ++this.frame; // L: 83 - } while(this.frame < this.sequenceDefinition.frameIds.length); + } while(this.frame < this.sequenceDefinition.frameIds.length); // L: 84 - this.frame -= this.sequenceDefinition.frameCount; - } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); + this.frame -= this.sequenceDefinition.frameCount; // L: 85 + } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); // L: 86 this.frame = 0; } } else { this.frame += var1; // L: 91 - int var2 = this.sequenceDefinition.method3844(); // L: 92 - if (this.frame >= var2) { - this.frame = var2 - this.sequenceDefinition.frameCount; + int var2 = this.sequenceDefinition.method3729(); // L: 92 + if (this.frame >= var2) { // L: 93 + this.frame = var2 - this.sequenceDefinition.frameCount; // L: 94 } } } } - @ObfuscatedName("c") + @ObfuscatedName("ia") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-17" + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", + garbageValue = "1000139939" ) - static void method1975(int var0, int var1) { - long var2 = (long)((var0 << 16) + var1); - NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); - if (var4 != null) { - NetCache.NetCache_pendingWritesQueue.addLast(var4); - } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lpz;II)V", - garbageValue = "168694674" - ) - @Export("updatePlayers") - 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.field1283[var7] & 1) == 0) { // L: 78 - if (var3 > 0) { // L: 79 - --var3; // L: 80 - var10000 = Players.field1283; // L: 81 - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - var6 = var0.readBits(1); // L: 84 - if (var6 == 0) { // L: 85 - var3 = LoginPacket.method5195(var0); // L: 86 - var10000 = Players.field1283; // L: 87 - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - PlayerComposition.readPlayerUpdate(var0, var7); // L: 90 - } - } - } - } - - var0.exportIndex(); // L: 93 - if (var3 != 0) { // L: 94 - throw new RuntimeException(); // L: 95 - } else { - var0.importIndex(); // L: 97 - - for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 98 - var7 = Players.Players_indices[var4]; // L: 99 - if ((Players.field1283[var7] & 1) != 0) { // L: 100 - if (var3 > 0) { // L: 101 - --var3; // L: 102 - var10000 = Players.field1283; // L: 103 - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - var6 = var0.readBits(1); // L: 106 - if (var6 == 0) { // L: 107 - var3 = LoginPacket.method5195(var0); // L: 108 - var10000 = Players.field1283; // L: 109 - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - PlayerComposition.readPlayerUpdate(var0, var7); // L: 112 - } - } - } - } - - var0.exportIndex(); // L: 115 - if (var3 != 0) { // L: 116 - throw new RuntimeException(); // L: 117 - } else { - var0.importIndex(); // L: 119 - - for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 120 - var7 = Players.Players_emptyIndices[var4]; // L: 121 - if ((Players.field1283[var7] & 1) != 0) { // L: 122 - if (var3 > 0) { // L: 123 - --var3; // L: 124 - var10000 = Players.field1283; // L: 125 - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - var6 = var0.readBits(1); // L: 128 - if (var6 == 0) { // L: 129 - var3 = LoginPacket.method5195(var0); // L: 130 - var10000 = Players.field1283; // L: 131 - var10000[var7] = (byte)(var10000[var7] | 2); - } else if (class175.updateExternalPlayer(var0, var7)) { // L: 134 - var10000 = Players.field1283; - var10000[var7] = (byte)(var10000[var7] | 2); - } - } - } - } - - var0.exportIndex(); // L: 137 - if (var3 != 0) { // L: 138 - throw new RuntimeException(); // L: 139 - } else { - var0.importIndex(); // L: 141 - - for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 142 - var7 = Players.Players_emptyIndices[var4]; // L: 143 - if ((Players.field1283[var7] & 1) == 0) { // L: 144 - if (var3 > 0) { // L: 145 - --var3; // L: 146 - var10000 = Players.field1283; // L: 147 - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - var6 = var0.readBits(1); // L: 150 - if (var6 == 0) { // L: 151 - var3 = LoginPacket.method5195(var0); // L: 152 - var10000 = Players.field1283; // L: 153 - var10000[var7] = (byte)(var10000[var7] | 2); - } else if (class175.updateExternalPlayer(var0, var7)) { // L: 156 - var10000 = Players.field1283; - var10000[var7] = (byte)(var10000[var7] | 2); - } - } - } - } - - 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 - - Player var5; - for (var4 = 1; var4 < 2048; ++var4) { // L: 165 - var10000 = Players.field1283; // L: 166 - var10000[var4] = (byte)(var10000[var4] >> 1); - 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 - } - } - - for (var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { // L: 173 - var4 = Players.Players_pendingUpdateIndices[var3]; // L: 174 - var5 = Client.players[var4]; // L: 175 - var6 = var0.readUnsignedByte(); // L: 176 - if ((var6 & 64) != 0) { // L: 177 - var6 += var0.readUnsignedByte() << 8; - } - - Login.method1932(var0, var4, var5, var6); // L: 178 - } - - if (var0.offset - var2 != var1) { // L: 181 - throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 182 - } - } - } - } - } - } // L: 184 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-574030857" - ) - static int method1976(int var0, Script var1, boolean var2) { - String var7; - if (var0 == ScriptOpcodes.MES) { // L: 1470 - var7 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 1471 - Actor.addGameMessage(0, "", var7); // L: 1472 - return 1; // L: 1473 - } else if (var0 == ScriptOpcodes.ANIM) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1476 - GrandExchangeOfferOwnWorldComparator.performPlayerAnimation(GrandExchangeEvents.localPlayer, Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 1477 - return 1; // L: 1478 - } else if (var0 == ScriptOpcodes.IF_CLOSE) { - if (!Interpreter.field842) { // L: 1481 - Interpreter.field841 = true; // L: 1482 - } - - return 1; // L: 1484 - } else { - int var15; - if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 1487 - var15 = 0; // L: 1488 - if (class300.isNumber(var7)) { // L: 1489 - var15 = class19.method288(var7); - } - - PacketBufferNode var13 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2937, Client.packetWriter.isaacCipher); // L: 1491 - var13.packetBuffer.writeInt(var15); // L: 1492 - Client.packetWriter.addNode(var13); // L: 1493 - return 1; // L: 1494 - } else { - PacketBufferNode var11; - if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 1497 - var11 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2992, Client.packetWriter.isaacCipher); // L: 1499 - var11.packetBuffer.writeByte(var7.length() + 1); // L: 1500 - var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1501 - Client.packetWriter.addNode(var11); // L: 1502 - return 1; // L: 1503 - } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 1506 - var11 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2980, Client.packetWriter.isaacCipher); // L: 1508 - var11.packetBuffer.writeByte(var7.length() + 1); // L: 1509 - var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1510 - Client.packetWriter.addNode(var11); // L: 1511 - return 1; // L: 1512 - } else { - String var4; - int var10; - if (var0 == ScriptOpcodes.OPPLAYER) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1515 - var4 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 1516 - MidiPcmStream.method5366(var10, var4); // L: 1517 - return 1; // L: 1518 - } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { - Interpreter.Interpreter_intStackSize -= 3; // L: 1521 - var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1522 - var15 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1523 - int var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 1524 - Widget var14 = class127.getWidget(var9); // L: 1525 - ParamComposition.clickWidget(var14, var10, var15); // L: 1526 - return 1; // L: 1527 - } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1530 - var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1531 - var15 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1532 - Widget var12 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1533 - ParamComposition.clickWidget(var12, var10, var15); // L: 1534 - return 1; // L: 1535 - } else if (var0 == ScriptOpcodes.MOUSECAM) { - GameBuild.mouseCam = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1538 - return 1; // L: 1539 - } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class131.clientPreferences.method2263() ? 1 : 0; // L: 1542 - return 1; // L: 1543 - } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { - class131.clientPreferences.method2246(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1); // L: 1546 - return 1; // L: 1547 - } else if (var0 == ScriptOpcodes.OPENURL) { - var7 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 1550 - boolean var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1551 - class391.openURL(var7, var8, false); // L: 1552 - return 1; // L: 1553 - } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1556 - var11 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2962, Client.packetWriter.isaacCipher); // L: 1558 - var11.packetBuffer.writeShort(var10); // L: 1559 - Client.packetWriter.addNode(var11); // L: 1560 - return 1; // L: 1561 - } else if (var0 == ScriptOpcodes.BUG_REPORT) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1564 - class122.Interpreter_stringStackSize -= 2; // L: 1565 - var4 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize]; // L: 1566 - String var5 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize + 1]; // L: 1567 - if (var4.length() > 500) { // L: 1568 - return 1; - } else if (var5.length() > 500) { // L: 1569 - return 1; - } else { - PacketBufferNode var6 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2926, Client.packetWriter.isaacCipher); // L: 1570 - var6.packetBuffer.writeShort(1 + class425.stringCp1252NullTerminatedByteSize(var4) + class425.stringCp1252NullTerminatedByteSize(var5)); // L: 1571 - var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1572 - var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1573 - var6.packetBuffer.method7703(var10); // L: 1574 - Client.packetWriter.addNode(var6); // L: 1575 - return 1; // L: 1576 - } - } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { - Client.shiftClickDrop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1579 - return 1; // L: 1580 - } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { - Client.showMouseOverText = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1583 - return 1; // L: 1584 - } else if (var0 == ScriptOpcodes.RENDERSELF) { - Client.renderSelf = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1587 - return 1; // L: 1588 - } else if (var0 == 3120) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1591 - Client.drawPlayerNames |= 1; - } else { - Client.drawPlayerNames &= -2; // L: 1592 - } - - return 1; // L: 1593 - } else if (var0 == 3121) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1596 - Client.drawPlayerNames |= 2; - } else { - Client.drawPlayerNames &= -3; // L: 1597 - } - - return 1; // L: 1598 - } else if (var0 == 3122) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1601 - Client.drawPlayerNames |= 4; - } else { - Client.drawPlayerNames &= -5; // L: 1602 - } - - return 1; // L: 1603 - } else if (var0 == 3123) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1606 - Client.drawPlayerNames |= 8; - } else { - Client.drawPlayerNames &= -9; // L: 1607 - } - - return 1; // L: 1608 - } else if (var0 == 3124) { - Client.drawPlayerNames = 0; // L: 1611 - return 1; // L: 1612 - } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { - Client.showMouseCross = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1615 - return 1; // L: 1616 - } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { - Client.showLoadingMessages = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1619 - return 1; // L: 1620 - } else if (var0 == ScriptOpcodes.SETTAPTODROP) { - setTapToDrop(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1); // L: 1623 - return 1; // L: 1624 - } else if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = User.getTapToDrop() ? 1 : 0; // L: 1627 - return 1; // L: 1628 - } else if (var0 == 3129) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1631 - Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1632 - Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1633 - return 1; // L: 1634 - } else if (var0 == 3130) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1637 - return 1; // L: 1638 - } else if (var0 == 3131) { - --Interpreter.Interpreter_intStackSize; // L: 1641 - return 1; // L: 1642 - } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = InvDefinition.canvasWidth; // L: 1645 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class321.canvasHeight; // L: 1646 - return 1; // L: 1647 - } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { - --Interpreter.Interpreter_intStackSize; // L: 1650 - return 1; // L: 1651 - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { - return 1; // L: 1654 - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1657 - return 1; // L: 1658 - } else if (var0 == 3136) { - Client.field668 = 3; // L: 1661 - Client.field628 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1662 - return 1; // L: 1663 - } else if (var0 == 3137) { - Client.field668 = 2; // L: 1666 - Client.field628 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1667 - return 1; // L: 1668 - } else if (var0 == 3138) { - Client.field668 = 0; // L: 1671 - return 1; // L: 1672 - } else if (var0 == 3139) { - Client.field668 = 1; // L: 1675 - return 1; // L: 1676 - } else if (var0 == 3140) { - Client.field668 = 3; // L: 1679 - Client.field628 = var2 ? WorldMapID.scriptDotWidget.id * 1389111653 * 785571949 : Interpreter.scriptActiveWidget.id * 1389111653 * 785571949; // L: 1680 - return 1; // L: 1681 - } else { - boolean var3; - if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1684 - class131.clientPreferences.method2230(var3); // L: 1685 - return 1; // L: 1686 - } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class131.clientPreferences.method2317() ? 1 : 0; // L: 1689 - return 1; // L: 1690 - } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1693 - Client.Login_isUsernameRemembered = var3; // L: 1694 - if (!var3) { // L: 1695 - class131.clientPreferences.method2286(""); // L: 1696 - } - - return 1; // L: 1698 - } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1701 - return 1; // L: 1702 - } else if (var0 == ScriptOpcodes.SHOW_IOS_REVIEW) { - return 1; // L: 1705 - } else if (var0 == 3146) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1708 - class131.clientPreferences.method2237(!var3); // L: 1709 - return 1; // L: 1710 - } else if (var0 == 3147) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class131.clientPreferences.method2279() ? 0 : 1; // L: 1713 - return 1; // L: 1714 - } else if (var0 == 3148) { - return 1; // L: 1717 - } else if (var0 == 3149) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1720 - return 1; // L: 1721 - } else if (var0 == 3150) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1724 - return 1; // L: 1725 - } else if (var0 == 3151) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1728 - return 1; // L: 1729 - } else if (var0 == 3152) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1732 - return 1; // L: 1733 - } else if (var0 == 3153) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1736 - return 1; // L: 1737 - } else if (var0 == 3154) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class166.method3342(); // L: 1740 - return 1; // L: 1741 - } else if (var0 == 3155) { - --class122.Interpreter_stringStackSize; // L: 1744 - return 1; // L: 1745 - } else if (var0 == 3156) { - return 1; // L: 1748 - } else if (var0 == 3157) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1751 - return 1; // L: 1752 - } else if (var0 == 3158) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1755 - return 1; // L: 1756 - } else if (var0 == 3159) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1759 - return 1; // L: 1760 - } else if (var0 == 3160) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1763 - return 1; // L: 1764 - } else if (var0 == 3161) { - --Interpreter.Interpreter_intStackSize; // L: 1767 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1768 - return 1; // L: 1769 - } else if (var0 == 3162) { - --Interpreter.Interpreter_intStackSize; // L: 1772 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1773 - return 1; // L: 1774 - } else if (var0 == 3163) { - --class122.Interpreter_stringStackSize; // L: 1777 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1778 - return 1; // L: 1779 - } else if (var0 == 3164) { - --Interpreter.Interpreter_intStackSize; // L: 1782 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 1783 - return 1; // L: 1784 - } else if (var0 == 3165) { - --Interpreter.Interpreter_intStackSize; // L: 1787 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1788 - return 1; // L: 1789 - } else if (var0 == 3166) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1792 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1793 - return 1; // L: 1794 - } else if (var0 == 3167) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1797 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1798 - return 1; // L: 1799 - } else if (var0 == 3168) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1802 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 1803 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 1804 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 1805 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 1806 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 1807 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 1808 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 1809 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 1810 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 1811 - return 1; // L: 1812 - } else if (var0 == 3169) { - return 1; // L: 1815 - } else if (var0 == 3170) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1818 - return 1; // L: 1819 - } else if (var0 == 3171) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1822 - return 1; // L: 1823 - } else if (var0 == 3172) { - --Interpreter.Interpreter_intStackSize; // L: 1826 - return 1; // L: 1827 - } else if (var0 == 3173) { - --Interpreter.Interpreter_intStackSize; // L: 1830 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1831 - return 1; // L: 1832 - } else if (var0 == 3174) { - --Interpreter.Interpreter_intStackSize; // L: 1835 - return 1; // L: 1836 - } else if (var0 == 3175) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1839 - return 1; // L: 1840 - } else if (var0 == 3176) { - return 1; // L: 1843 - } else if (var0 == 3177) { - return 1; // L: 1846 - } else if (var0 == 3178) { - --class122.Interpreter_stringStackSize; // L: 1849 - return 1; // L: 1850 - } else if (var0 == 3179) { - return 1; // L: 1853 - } else if (var0 == 3180) { - --class122.Interpreter_stringStackSize; // L: 1856 - return 1; // L: 1857 - } else if (var0 == 3181) { - class113.method2650(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1860 - return 1; // L: 1861 - } else if (var0 == 3182) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = VarbitComposition.method3578(); // L: 1864 - return 1; // L: 1865 - } else if (var0 != 3183 && var0 != 3184) { - if (var0 == 3187) { - class122.Interpreter_stringStackSize -= 2; // L: 1872 - return 1; // L: 1873 - } else { - return var0 == 3188 ? 1 : 2; // L: 1876 1878 - } - } else { - --Interpreter.Interpreter_intStackSize; // L: 1868 - return 1; // L: 1869 - } - } - } - } - } - } - - @ObfuscatedName("jn") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-875242540" - ) - @Export("setTapToDrop") - static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; // L: 11171 - } // L: 11172 + @Export("insertMenuItemNoShift") + public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { + class175.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 9907 + } // L: 9908 } diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index ccb6c897ee..c7bfc17782 100644 --- a/runescape-client/src/main/java/RasterProvider.java +++ b/runescape-client/src/main/java/RasterProvider.java @@ -14,13 +14,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ak") +@ObfuscatedName("ab") @Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("component") Component component; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("image") Image image; @@ -36,66 +36,66 @@ public final class RasterProvider extends AbstractRasterProvider { this.apply(); // L: 31 } // L: 32 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;B)V", - garbageValue = "13" + garbageValue = "-88" ) @Export("setComponent") final void setComponent(Component var1) { this.component = var1; // L: 35 } // L: 36 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IIS)V", - garbageValue = "131" + descriptor = "(III)V", + garbageValue = "1511692839" ) @Export("drawFull") public final void drawFull(int var1, int var2) { - this.drawFull0(this.component.getGraphics(), var1, var2); // L: 39 - } // L: 40 + this.drawFull0(this.component.getGraphics(), var1, var2); // L: 40 + } // L: 41 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-1598391098" + garbageValue = "-1899949578" ) @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 + this.draw0(this.component.getGraphics(), var1, var2, var3, var4); // L: 45 + } // L: 46 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Graphics;III)V", - garbageValue = "-1968025029" + descriptor = "(Ljava/awt/Graphics;IIB)V", + garbageValue = "-56" ) @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { try { - var1.drawImage(this.image, var2, var3, this.component); // L: 48 - } catch (Exception var5) { // L: 50 - this.component.repaint(); // L: 51 + var1.drawImage(this.image, var2, var3, this.component); // L: 50 + } catch (Exception var5) { // L: 52 + this.component.repaint(); // L: 53 } - } // L: 53 + } // L: 55 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(Ljava/awt/Graphics;IIIII)V", - garbageValue = "-1773855404" + garbageValue = "-1218744296" ) @Export("draw0") final void draw0(Graphics var1, int var2, int var3, int var4, int var5) { try { - Shape var6 = var1.getClip(); // L: 57 - var1.clipRect(var2, var3, var4, var5); // L: 58 - var1.drawImage(this.image, 0, 0, this.component); // L: 59 - var1.setClip(var6); // L: 60 - } catch (Exception var7) { // L: 62 - this.component.repaint(); // L: 63 + Shape var6 = var1.getClip(); // L: 59 + var1.clipRect(var2, var3, var4, var5); // L: 60 + var1.drawImage(this.image, 0, 0, this.component); // L: 61 + var1.setClip(var6); // L: 62 + } catch (Exception var7) { // L: 64 + this.component.repaint(); // L: 65 } - } // L: 65 + } // L: 67 } diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index f2f526f1f8..12d3843343 100644 --- a/runescape-client/src/main/java/Rasterizer2D.java +++ b/runescape-client/src/main/java/Rasterizer2D.java @@ -3,28 +3,28 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ql") +@ObfuscatedName("qc") @Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { - @ObfuscatedName("aq") + @ObfuscatedName("ar") @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; - @ObfuscatedName("aw") + @ObfuscatedName("am") @Export("Rasterizer2D_width") public static int Rasterizer2D_width; - @ObfuscatedName("am") + @ObfuscatedName("ac") @Export("Rasterizer2D_height") public static int Rasterizer2D_height; - @ObfuscatedName("ak") + @ObfuscatedName("ab") @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; - @ObfuscatedName("ao") + @ObfuscatedName("aj") @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; - @ObfuscatedName("aj") + @ObfuscatedName("ae") @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; - @ObfuscatedName("al") + @ObfuscatedName("az") @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; @@ -38,7 +38,7 @@ public class Rasterizer2D extends DualNode { protected Rasterizer2D() { } // L: 16 - @ObfuscatedName("ds") + @ObfuscatedName("de") @Export("Rasterizer2D_replace") public static void Rasterizer2D_replace(int[] var0, int var1, int var2) { Rasterizer2D_pixels = var0; // L: 19 @@ -47,7 +47,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_setClip(0, 0, var1, var2); // L: 22 } // L: 23 - @ObfuscatedName("dc") + @ObfuscatedName("db") @Export("Rasterizer2D_resetClip") public static void Rasterizer2D_resetClip() { Rasterizer2D_xClipStart = 0; // L: 26 @@ -56,7 +56,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = Rasterizer2D_height; // L: 29 } // L: 30 - @ObfuscatedName("dm") + @ObfuscatedName("dn") @Export("Rasterizer2D_setClip") public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) { if (var0 < 0) { // L: 33 @@ -81,7 +81,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = var3; // L: 40 } // L: 41 - @ObfuscatedName("dv") + @ObfuscatedName("dz") @Export("Rasterizer2D_expandClip") public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) { if (Rasterizer2D_xClipStart < var0) { // L: 44 @@ -102,7 +102,7 @@ public class Rasterizer2D extends DualNode { } // L: 48 - @ObfuscatedName("da") + @ObfuscatedName("dl") @Export("Rasterizer2D_getClipArray") public static void Rasterizer2D_getClipArray(int[] var0) { var0[0] = Rasterizer2D_xClipStart; // L: 51 @@ -111,7 +111,7 @@ public class Rasterizer2D extends DualNode { var0[3] = Rasterizer2D_yClipEnd; // L: 54 } // L: 55 - @ObfuscatedName("di") + @ObfuscatedName("da") @Export("Rasterizer2D_setClipArray") public static void Rasterizer2D_setClipArray(int[] var0) { Rasterizer2D_xClipStart = var0[0]; // L: 58 @@ -120,7 +120,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = var0[3]; // L: 61 } // L: 62 - @ObfuscatedName("dt") + @ObfuscatedName("dv") @Export("Rasterizer2D_clear") public static void Rasterizer2D_clear() { int var0 = 0; // L: 65 @@ -141,7 +141,7 @@ public class Rasterizer2D extends DualNode { } // L: 79 - @ObfuscatedName("df") + @ObfuscatedName("dr") @Export("drawCircle") static void drawCircle(int var0, int var1, int var2, int var3) { if (var2 == 0) { // L: 82 @@ -236,7 +236,7 @@ public class Rasterizer2D extends DualNode { } } // L: 84 133 - @ObfuscatedName("dk") + @ObfuscatedName("ds") @Export("Rasterizer2D_drawCircleAlpha") public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) { if (var4 != 0) { // L: 136 @@ -349,7 +349,7 @@ public class Rasterizer2D extends DualNode { } } // L: 139 207 - @ObfuscatedName("du") + @ObfuscatedName("dt") @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 @@ -387,7 +387,7 @@ public class Rasterizer2D extends DualNode { } // L: 232 - @ObfuscatedName("dz") + @ObfuscatedName("df") @Export("Rasterizer2D_fillRectangle") public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { if (var0 < Rasterizer2D_xClipStart) { // L: 235 @@ -421,7 +421,7 @@ public class Rasterizer2D extends DualNode { } // L: 253 - @ObfuscatedName("do") + @ObfuscatedName("dm") @Export("Rasterizer2D_fillRectangleGradient") public static void Rasterizer2D_fillRectangleGradient(int var0, int var1, int var2, int var3, int var4, int var5) { if (var2 > 0 && var3 > 0) { // L: 256 @@ -465,7 +465,7 @@ public class Rasterizer2D extends DualNode { } } // L: 282 - @ObfuscatedName("dw") + @ObfuscatedName("dq") @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 @@ -523,7 +523,7 @@ public class Rasterizer2D extends DualNode { } } // L: 326 - @ObfuscatedName("dl") + @ObfuscatedName("dw") @ObfuscatedSignature( descriptor = "(IIIIII[BIZ)V", garbageValue = "1" @@ -604,7 +604,7 @@ public class Rasterizer2D extends DualNode { } } // L: 380 - @ObfuscatedName("dn") + @ObfuscatedName("dk") @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 @@ -613,7 +613,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); // L: 386 } // L: 387 - @ObfuscatedName("db") + @ObfuscatedName("du") @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 @@ -625,7 +625,7 @@ public class Rasterizer2D extends DualNode { } // L: 396 - @ObfuscatedName("dh") + @ObfuscatedName("em") @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 @@ -647,7 +647,7 @@ public class Rasterizer2D extends DualNode { } } // L: 407 - @ObfuscatedName("dq") + @ObfuscatedName("eh") @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 @@ -677,7 +677,7 @@ public class Rasterizer2D extends DualNode { } } // L: 431 - @ObfuscatedName("dy") + @ObfuscatedName("ej") @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 @@ -699,7 +699,7 @@ public class Rasterizer2D extends DualNode { } } // L: 442 - @ObfuscatedName("ec") + @ObfuscatedName("en") @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 @@ -730,7 +730,7 @@ public class Rasterizer2D extends DualNode { } } // L: 467 - @ObfuscatedName("es") + @ObfuscatedName("eb") @Export("Rasterizer2D_drawLine") public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { var2 -= var0; // L: 470 @@ -812,7 +812,7 @@ public class Rasterizer2D extends DualNode { } } // L: 475 480 524 - @ObfuscatedName("el") + @ObfuscatedName("ea") @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 @@ -820,7 +820,7 @@ public class Rasterizer2D extends DualNode { } } // L: 529 - @ObfuscatedName("ej") + @ObfuscatedName("er") @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 591feb82b2..7cbfc81d5c 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -3,92 +3,92 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hb") +@ObfuscatedName("gr") @Implements("Rasterizer3D") public class Rasterizer3D extends Rasterizer2D { - @ObfuscatedName("v") - static boolean field2562; - @ObfuscatedName("c") - static boolean field2558; - @ObfuscatedName("i") + @ObfuscatedName("o") + static boolean field2395; + @ObfuscatedName("q") + static boolean field2400; + @ObfuscatedName("l") @Export("Rasterizer3D_isLowDetailTexture") static boolean Rasterizer3D_isLowDetailTexture; - @ObfuscatedName("f") - public static boolean field2553; - @ObfuscatedName("b") + @ObfuscatedName("k") + public static boolean field2379; + @ObfuscatedName("a") @Export("Rasterizer3D_alpha") static int Rasterizer3D_alpha; - @ObfuscatedName("p") + @ObfuscatedName("c") @Export("Rasterizer3D_zoom") public static int Rasterizer3D_zoom; @ObfuscatedName("w") @Export("Rasterizer3D_clipMidX") static int Rasterizer3D_clipMidX; - @ObfuscatedName("k") + @ObfuscatedName("b") @Export("Rasterizer3D_clipMidY") static int Rasterizer3D_clipMidY; - @ObfuscatedName("d") + @ObfuscatedName("t") @Export("Rasterizer3D_clipWidth") static int Rasterizer3D_clipWidth; - @ObfuscatedName("m") + @ObfuscatedName("g") @Export("Rasterizer3D_clipHeight") static int Rasterizer3D_clipHeight; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("Rasterizer3D_clipNegativeMidX") static int Rasterizer3D_clipNegativeMidX; - @ObfuscatedName("t") + @ObfuscatedName("n") @Export("Rasterizer3D_clipMidX2") static int Rasterizer3D_clipMidX2; - @ObfuscatedName("g") + @ObfuscatedName("e") @Export("Rasterizer3D_clipNegativeMidY") static int Rasterizer3D_clipNegativeMidY; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("Rasterizer3D_clipMidY2") static int Rasterizer3D_clipMidY2; - @ObfuscatedName("a") + @ObfuscatedName("f") @Export("Rasterizer3D_rowOffsets") static int[] Rasterizer3D_rowOffsets; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("Rasterizer3D_colorPalette") public static int[] Rasterizer3D_colorPalette; @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Liw;" + descriptor = "Lhk;" ) @Export("Rasterizer3D_textureLoader") public static TextureLoader Rasterizer3D_textureLoader; - @ObfuscatedName("e") - static int[] field2573; @ObfuscatedName("z") - static int[] field2571; - @ObfuscatedName("h") + static int[] field2402; + @ObfuscatedName("i") + static int[] field2385; + @ObfuscatedName("u") @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; static { - field2562 = false; // L: 8 - field2558 = false; // L: 9 + field2395 = false; // L: 8 + field2400 = false; // L: 9 Rasterizer3D_isLowDetailTexture = false; // L: 10 - field2553 = true; // L: 11 + field2379 = 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 - field2573 = new int[512]; // L: 31 - field2571 = new int[2048]; // L: 32 + field2402 = new int[512]; // L: 31 + field2385 = 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 - field2573[var0] = 32768 / var0; // L: 38 + field2402[var0] = 32768 / var0; // L: 38 } for (var0 = 1; var0 < 2048; ++var0) { // L: 40 - field2571[var0] = 65536 / var0; // L: 41 + field2385[var0] = 65536 / var0; // L: 41 } for (var0 = 0; var0 < 2048; ++var0) { // L: 43 @@ -98,20 +98,20 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 47 - @ObfuscatedName("v") + @ObfuscatedName("o") @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("c") + @ObfuscatedName("q") @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[class67.method1909(Rasterizer3D_clipHeight)]; + Rasterizer3D_rowOffsets = new int[FontName.method7228(Rasterizer3D_clipHeight)]; } int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; // L: 62 @@ -123,7 +123,7 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 67 - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("Rasterizer3D_method3") public static final void Rasterizer3D_method3() { Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; // L: 70 @@ -134,8 +134,8 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 75 } // L: 76 - @ObfuscatedName("f") - public static final void method4631(int var0, int var1) { + @ObfuscatedName("k") + public static final void method3939(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 @@ -147,22 +147,22 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 87 } // L: 88 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Liw;)V" + descriptor = "(Lhk;)V" ) @Export("Rasterizer3D_setTextureLoader") public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { Rasterizer3D_textureLoader = var0; // L: 91 } // L: 92 - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("Rasterizer3D_setBrightness") public static final void Rasterizer3D_setBrightness(double var0) { Rasterizer3D_buildPalette(var0, 0, 512); // L: 95 } // L: 96 - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("Rasterizer3D_buildPalette") static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { int var4 = var2 * 128; // L: 99 @@ -241,7 +241,7 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 140 - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("Rasterizer3D_brighten") static int Rasterizer3D_brighten(int var0, double var1) { double var3 = (double)(var0 >> 16) / 256.0D; // L: 143 @@ -256,13 +256,13 @@ public class Rasterizer3D extends Rasterizer2D { return var11 + (var10 << 8) + (var9 << 16); // L: 152 } - @ObfuscatedName("q") - public static void method4673(int var0, int var1, int var2) { - field2562 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 156 + @ObfuscatedName("r") + public static void method3976(int var0, int var1, int var2) { + field2395 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 156 } // L: 157 - @ObfuscatedName("o") - static final void method4613(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + @ObfuscatedName("v") + static final void method3915(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 @@ -767,16 +767,16 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("r") - static final void method4614(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, byte var9, byte var10, byte var11, byte var12) { - var6 = method4615(var6, var9, var10, var11, var12); // L: 544 - var7 = method4615(var7, var9, var10, var11, var12); // L: 545 - var8 = method4615(var8, var9, var10, var11, var12); // L: 546 - method4613(var0, var1, var2, var3, var4, var5, var6, var7, var8); // L: 547 + @ObfuscatedName("y") + static final void method3916(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, byte var9, byte var10, byte var11, byte var12) { + var6 = method3923(var6, var9, var10, var11, var12); // L: 544 + var7 = method3923(var7, var9, var10, var11, var12); // L: 545 + var8 = method3923(var8, var9, var10, var11, var12); // L: 546 + method3915(var0, var1, var2, var3, var4, var5, var6, var7, var8); // L: 547 } // L: 548 - @ObfuscatedName("p") - static int method4615(int var0, byte var1, byte var2, byte var3, byte var4) { + @ObfuscatedName("c") + static int method3923(int var0, byte var1, byte var2, byte var3, byte var4) { int var5 = var0 >> 10 & 63; // L: 551 int var6 = var0 >> 7 & 7; // L: 552 int var7 = var0 & 127; // L: 553 @@ -799,7 +799,7 @@ public class Rasterizer3D extends Rasterizer2D { @ObfuscatedName("w") @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 (field2562) { // L: 568 + if (field2395) { // L: 568 if (var5 > Rasterizer3D_clipWidth) { // L: 569 var5 = Rasterizer3D_clipWidth; } @@ -816,7 +816,7 @@ public class Rasterizer3D extends Rasterizer2D { int var9; int var10; int var11; - if (field2553) { // L: 575 + if (field2379) { // L: 575 var3 = var5 - var4 >> 2; // L: 576 var7 <<= 2; // L: 577 if (Rasterizer3D_alpha == 0) { // L: 578 @@ -906,8 +906,8 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 629 652 - @ObfuscatedName("k") - public static final void method4617(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("b") + public static final void method3919(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { int var7 = 0; // L: 657 if (var0 != var1) { // L: 658 var7 = (var4 - var3 << 14) / (var1 - var0); // L: 659 @@ -1362,17 +1362,17 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("d") - static final void method4618(int var0, int var1, int var2, int var3, int var4, int var5, int var6, byte var7, byte var8, byte var9, byte var10) { - int var11 = method4615(var6, var7, var8, var9, var10); // L: 981 + @ObfuscatedName("t") + static final void method3993(int var0, int var1, int var2, int var3, int var4, int var5, int var6, byte var7, byte var8, byte var9, byte var10) { + int var11 = method3923(var6, var7, var8, var9, var10); // L: 981 var6 = Rasterizer3D_colorPalette[var11]; // L: 982 - method4617(var0, var1, var2, var3, var4, var5, var6); // L: 983 + method3919(var0, var1, var2, var3, var4, var5, var6); // L: 983 } // L: 984 - @ObfuscatedName("m") + @ObfuscatedName("g") @Export("Rasterizer3D_horizAlpha") static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { - if (field2562) { // L: 987 + if (field2395) { // L: 987 if (var5 > Rasterizer3D_clipWidth) { // L: 988 var5 = Rasterizer3D_clipWidth; } @@ -1464,16 +1464,16 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("u") - static final void method4620(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 method3922(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: 1041 int var20; if (var19 == null) { // L: 1042 var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1043 - method4613(var0, var1, var2, var3, var4, var5, method4648(var20, var6), method4648(var20, var7), method4648(var20, var8)); // L: 1044 + method3915(var0, var1, var2, var3, var4, var5, method3965(var20, var6), method3965(var20, var7), method3965(var20, var8)); // L: 1044 } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1047 - field2558 = Rasterizer3D_textureLoader.vmethod5096(var18); // L: 1048 + field2400 = Rasterizer3D_textureLoader.vmethod4381(var18); // L: 1048 var20 = var4 - var3; // L: 1049 int var21 = var1 - var0; // L: 1050 int var22 = var5 - var3; // L: 1051 @@ -1633,41 +1633,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; // L: 1169 var35 += var37 * var41; // L: 1170 var38 += var40 * var41; // L: 1171 - if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { // L: 1172 - var1 -= var2; // L: 1173 - var2 -= var0; // L: 1174 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1175 - - while (true) { - --var2; // L: 1176 - if (var2 < 0) { - while (true) { - --var1; // L: 1186 - if (var1 < 0) { - return; // L: 1196 - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1187 - var5 += var27; // L: 1188 - var3 += var26; // L: 1189 - var6 += var31; // L: 1190 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1191 - var32 += var34; // L: 1192 - var35 += var37; // L: 1193 - var38 += var40; // L: 1194 - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1177 - var4 += var28; // L: 1178 - var3 += var26; // L: 1179 - var6 += var31; // L: 1180 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1181 - var32 += var34; // L: 1182 - var35 += var37; // L: 1183 - var38 += var40; // L: 1184 - } - } else { + if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { // L: 1172 var1 -= var2; // L: 1199 var2 -= var0; // L: 1200 var0 = Rasterizer3D_rowOffsets[var0]; // L: 1201 @@ -1701,6 +1667,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; // L: 1209 var38 += var40; // L: 1210 } + } else { + var1 -= var2; // L: 1173 + var2 -= var0; // L: 1174 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1175 + + while (true) { + --var2; // L: 1176 + if (var2 < 0) { + while (true) { + --var1; // L: 1186 + if (var1 < 0) { + return; // L: 1196 + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1187 + var5 += var27; // L: 1188 + var3 += var26; // L: 1189 + var6 += var31; // L: 1190 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1191 + var32 += var34; // L: 1192 + var35 += var37; // L: 1193 + var38 += var40; // L: 1194 + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1177 + var4 += var28; // L: 1178 + var3 += var26; // L: 1179 + var6 += var31; // L: 1180 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1181 + var32 += var34; // L: 1182 + var35 += var37; // L: 1183 + var38 += var40; // L: 1184 + } } } } @@ -1734,41 +1734,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; // L: 1245 var35 += var37 * var41; // L: 1246 var38 += var40 * var41; // L: 1247 - if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { // L: 1248 - var0 -= var2; // L: 1275 - var2 -= var1; // L: 1276 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 1277 - - while (true) { - --var2; // L: 1278 - if (var2 < 0) { - while (true) { - --var0; // L: 1288 - if (var0 < 0) { - return; // L: 1298 - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1289 - var3 += var26; // L: 1290 - var5 += var28; // L: 1291 - var7 += var31; // L: 1292 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1293 - var32 += var34; // L: 1294 - var35 += var37; // L: 1295 - var38 += var40; // L: 1296 - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1279 - var3 += var26; // L: 1280 - var4 += var27; // L: 1281 - var7 += var31; // L: 1282 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1283 - var32 += var34; // L: 1284 - var35 += var37; // L: 1285 - var38 += var40; // L: 1286 - } - } else { + if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { // L: 1248 var0 -= var2; // L: 1249 var2 -= var1; // L: 1250 var1 = Rasterizer3D_rowOffsets[var1]; // L: 1251 @@ -1802,6 +1768,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; // L: 1259 var38 += var40; // L: 1260 } + } else { + var0 -= var2; // L: 1275 + var2 -= var1; // L: 1276 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1277 + + while (true) { + --var2; // L: 1278 + if (var2 < 0) { + while (true) { + --var0; // L: 1288 + if (var0 < 0) { + return; // L: 1298 + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1289 + var3 += var26; // L: 1290 + var5 += var28; // L: 1291 + var7 += var31; // L: 1292 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1293 + var32 += var34; // L: 1294 + var35 += var37; // L: 1295 + var38 += var40; // L: 1296 + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1279 + var3 += var26; // L: 1280 + var4 += var27; // L: 1281 + var7 += var31; // L: 1282 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1283 + var32 += var34; // L: 1284 + var35 += var37; // L: 1285 + var38 += var40; // L: 1286 + } } } else { var5 = var4 <<= 14; // L: 1302 @@ -2085,10 +2085,10 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 1045 - @ObfuscatedName("t") + @ObfuscatedName("n") @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 (field2562) { // L: 1523 + if (field2395) { // L: 1523 if (var6 > Rasterizer3D_clipWidth) { // L: 1524 var6 = Rasterizer3D_clipWidth; } @@ -2152,7 +2152,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; // L: 1568 var8 <<= 3; // L: 1569 var15 = var7 >> 8; // L: 1570 - if (field2558) { // L: 1571 + if (field2400) { // L: 1571 if (var17 > 0) { // L: 1572 do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1574 @@ -2347,7 +2347,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; // L: 1743 var8 <<= 3; // L: 1744 var15 = var7 >> 8; // L: 1745 - if (field2558) { // L: 1746 + if (field2400) { // L: 1746 if (var17 > 0) { // L: 1747 do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1749 @@ -2506,17 +2506,17 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 1881 - @ObfuscatedName("g") + @ObfuscatedName("e") @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: 1884 int var20; if (var19 == null) { // L: 1885 var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1886 - method4613(var0, var1, var2, var3, var4, var5, method4648(var20, var6), method4648(var20, var7), method4648(var20, var8)); // L: 1887 + method3915(var0, var1, var2, var3, var4, var5, method3965(var20, var6), method3965(var20, var7), method3965(var20, var8)); // L: 1887 } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1890 - field2558 = Rasterizer3D_textureLoader.vmethod5096(var18); // L: 1891 + field2400 = Rasterizer3D_textureLoader.vmethod4381(var18); // L: 1891 var20 = var4 - var3; // L: 1892 int var21 = var1 - var0; // L: 1893 int var22 = var5 - var3; // L: 1894 @@ -2588,41 +2588,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; // L: 1942 var35 += var37 * var41; // L: 1943 var38 += var40 * var41; // L: 1944 - if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { // L: 1945 - var2 -= var1; // L: 1972 - var1 -= var0; // L: 1973 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1974 - - while (true) { - --var1; // L: 1975 - if (var1 < 0) { - while (true) { - --var2; // L: 1985 - if (var2 < 0) { - return; // L: 1995 - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1986 - var5 += var28; // L: 1987 - var4 += var27; // L: 1988 - var6 += var31; // L: 1989 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1990 - var32 += var34; // L: 1991 - var35 += var37; // L: 1992 - var38 += var40; // L: 1993 - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1976 - var5 += var28; // L: 1977 - var3 += var26; // L: 1978 - var6 += var31; // L: 1979 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1980 - var32 += var34; // L: 1981 - var35 += var37; // L: 1982 - var38 += var40; // L: 1983 - } - } else { + if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { // L: 1945 var2 -= var1; // L: 1946 var1 -= var0; // L: 1947 var0 = Rasterizer3D_rowOffsets[var0]; // L: 1948 @@ -2656,6 +2622,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; // L: 1956 var38 += var40; // L: 1957 } + } else { + var2 -= var1; // L: 1972 + var1 -= var0; // L: 1973 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1974 + + while (true) { + --var1; // L: 1975 + if (var1 < 0) { + while (true) { + --var2; // L: 1985 + if (var2 < 0) { + return; // L: 1995 + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1986 + var5 += var28; // L: 1987 + var4 += var27; // L: 1988 + var6 += var31; // L: 1989 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1990 + var32 += var34; // L: 1991 + var35 += var37; // L: 1992 + var38 += var40; // L: 1993 + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1976 + var5 += var28; // L: 1977 + var3 += var26; // L: 1978 + var6 += var31; // L: 1979 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1980 + var32 += var34; // L: 1981 + var35 += var37; // L: 1982 + var38 += var40; // L: 1983 + } } } else { var4 = var3 <<= 14; // L: 1999 @@ -2676,41 +2676,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; // L: 2012 var35 += var37 * var41; // L: 2013 var38 += var40 * var41; // L: 2014 - if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { // L: 2015 - var1 -= var2; // L: 2042 - var2 -= var0; // L: 2043 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 2044 - - while (true) { - --var2; // L: 2045 - if (var2 < 0) { - while (true) { - --var1; // L: 2055 - if (var1 < 0) { - return; // L: 2065 - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 2056 - var5 += var27; // L: 2057 - var3 += var26; // L: 2058 - var6 += var31; // L: 2059 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 2060 - var32 += var34; // L: 2061 - var35 += var37; // L: 2062 - var38 += var40; // L: 2063 - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 2046 - var4 += var28; // L: 2047 - var3 += var26; // L: 2048 - var6 += var31; // L: 2049 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 2050 - var32 += var34; // L: 2051 - var35 += var37; // L: 2052 - var38 += var40; // L: 2053 - } - } else { + if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { // L: 2015 var1 -= var2; // L: 2016 var2 -= var0; // L: 2017 var0 = Rasterizer3D_rowOffsets[var0]; // L: 2018 @@ -2744,6 +2710,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; // L: 2026 var38 += var40; // L: 2027 } + } else { + var1 -= var2; // L: 2042 + var2 -= var0; // L: 2043 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 2044 + + while (true) { + --var2; // L: 2045 + if (var2 < 0) { + while (true) { + --var1; // L: 2055 + if (var1 < 0) { + return; // L: 2065 + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 2056 + var5 += var27; // L: 2057 + var3 += var26; // L: 2058 + var6 += var31; // L: 2059 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 2060 + var32 += var34; // L: 2061 + var35 += var37; // L: 2062 + var38 += var40; // L: 2063 + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 2046 + var4 += var28; // L: 2047 + var3 += var26; // L: 2048 + var6 += var31; // L: 2049 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 2050 + var32 += var34; // L: 2051 + var35 += var37; // L: 2052 + var38 += var40; // L: 2053 + } } } } @@ -2777,41 +2777,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; // L: 2088 var35 += var37 * var41; // L: 2089 var38 += var40 * var41; // L: 2090 - if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { // L: 2091 - var0 -= var2; // L: 2092 - var2 -= var1; // L: 2093 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 2094 - - while (true) { - --var2; // L: 2095 - if (var2 < 0) { - while (true) { - --var0; // L: 2105 - if (var0 < 0) { - return; // L: 2115 - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2106 - var3 += var26; // L: 2107 - var5 += var28; // L: 2108 - var7 += var31; // L: 2109 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2110 - var32 += var34; // L: 2111 - var35 += var37; // L: 2112 - var38 += var40; // L: 2113 - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2096 - var3 += var26; // L: 2097 - var4 += var27; // L: 2098 - var7 += var31; // L: 2099 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2100 - var32 += var34; // L: 2101 - var35 += var37; // L: 2102 - var38 += var40; // L: 2103 - } - } else { + if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { // L: 2091 var0 -= var2; // L: 2118 var2 -= var1; // L: 2119 var1 = Rasterizer3D_rowOffsets[var1]; // L: 2120 @@ -2845,6 +2811,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; // L: 2128 var38 += var40; // L: 2129 } + } else { + var0 -= var2; // L: 2092 + var2 -= var1; // L: 2093 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2094 + + while (true) { + --var2; // L: 2095 + if (var2 < 0) { + while (true) { + --var0; // L: 2105 + if (var0 < 0) { + return; // L: 2115 + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2106 + var3 += var26; // L: 2107 + var5 += var28; // L: 2108 + var7 += var31; // L: 2109 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2110 + var32 += var34; // L: 2111 + var35 += var37; // L: 2112 + var38 += var40; // L: 2113 + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2096 + var3 += var26; // L: 2097 + var4 += var27; // L: 2098 + var7 += var31; // L: 2099 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2100 + var32 += var34; // L: 2101 + var35 += var37; // L: 2102 + var38 += var40; // L: 2103 + } } } else { var5 = var4 <<= 14; // L: 2145 @@ -3128,10 +3128,10 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 1888 - @ObfuscatedName("x") + @ObfuscatedName("h") @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 (field2562) { // L: 2366 + if (field2395) { // L: 2366 if (var6 > Rasterizer3D_clipWidth) { // L: 2367 var6 = Rasterizer3D_clipWidth; } @@ -3184,7 +3184,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; // L: 2408 var8 <<= 3; // L: 2409 var15 = var7 >> 8; // L: 2410 - if (field2558) { // L: 2412 + if (field2400) { // L: 2412 if (var17 > 0) { // L: 2413 do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2415 @@ -3327,7 +3327,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; // L: 2545 var8 <<= 3; // L: 2546 var15 = var7 >> 8; // L: 2547 - if (field2558) { // L: 2549 + if (field2400) { // L: 2549 if (var17 > 0) { // L: 2550 do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2552 @@ -3444,8 +3444,8 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 2648 - @ObfuscatedName("a") - static final int method4648(int var0, int var1) { + @ObfuscatedName("f") + static final int method3965(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; // L: 2651 if (var1 < 2) { // L: 2652 var1 = 2; @@ -3456,33 +3456,33 @@ public class Rasterizer3D extends Rasterizer2D { return (var0 & 65408) + var1; // L: 2654 } - @ObfuscatedName("y") - static final int method4626(int var0, int var1, int var2, int var3) { + @ObfuscatedName("d") + static final int method3927(int var0, int var1, int var2, int var3) { return var0 * var2 + var3 * var1 >> 16; // L: 2658 } @ObfuscatedName("j") - static final int method4663(int var0, int var1, int var2, int var3) { + static final int method3951(int var0, int var1, int var2, int var3) { return var2 * var1 - var3 * var0 >> 16; // L: 2662 } - @ObfuscatedName("e") - static final int method4627(int var0, int var1, int var2, int var3) { + @ObfuscatedName("z") + static final int method3929(int var0, int var1, int var2, int var3) { return var0 * var2 - var3 * var1 >> 16; // L: 2666 } - @ObfuscatedName("z") - static final int method4628(int var0, int var1, int var2, int var3) { + @ObfuscatedName("i") + static final int method3980(int var0, int var1, int var2, int var3) { return var3 * var0 + var2 * var1 >> 16; // L: 2670 } - @ObfuscatedName("h") - static final int method4656(int var0, int var1, int var2, int var3) { + @ObfuscatedName("u") + static final int method3930(int var0, int var1, int var2, int var3) { return var0 * var2 + var3 * var1 >> 16; // L: 2674 } - @ObfuscatedName("ae") - static final int method4630(int var0, int var1, int var2, int var3) { + @ObfuscatedName("ag") + static final int method3931(int var0, int var1, int var2, int var3) { return var2 * var1 - var3 * var0 >> 16; // L: 2678 } } diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java index 8ef7aa1205..e1fd2af1a8 100644 --- a/runescape-client/src/main/java/RawPcmStream.java +++ b/runescape-client/src/main/java/RawPcmStream.java @@ -3,107 +3,107 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("au") +@ObfuscatedName("ah") @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { - @ObfuscatedName("v") - int field329; - @ObfuscatedName("c") - int field328; - @ObfuscatedName("i") - int field335; - @ObfuscatedName("f") - int field330; - @ObfuscatedName("b") - int field331; - @ObfuscatedName("n") + @ObfuscatedName("o") int field336; - @ObfuscatedName("s") + @ObfuscatedName("q") int field333; @ObfuscatedName("l") - @Export("numLoops") - int numLoops; - @ObfuscatedName("q") - @Export("start") - int start; - @ObfuscatedName("o") - @Export("end") - int end; - @ObfuscatedName("r") - boolean field337; + int field339; + @ObfuscatedName("k") + int field334; + @ObfuscatedName("a") + int field335; + @ObfuscatedName("m") + int field337; @ObfuscatedName("p") int field338; - @ObfuscatedName("k") - int field339; - @ObfuscatedName("d") - int field340; - @ObfuscatedName("m") - int field327; + @ObfuscatedName("s") + @Export("numLoops") + int numLoops; + @ObfuscatedName("r") + @Export("start") + int start; + @ObfuscatedName("v") + @Export("end") + int end; + @ObfuscatedName("y") + boolean field342; + @ObfuscatedName("c") + int field343; + @ObfuscatedName("b") + int field332; + @ObfuscatedName("t") + int field345; + @ObfuscatedName("g") + int field346; @ObfuscatedSignature( - descriptor = "(Lat;III)V" + descriptor = "(Lak;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.field337 = var1.field254; // L: 54 - this.field328 = var2; // L: 55 - this.field335 = var3; // L: 56 - this.field330 = var4; // L: 57 - this.field329 = 0; // L: 58 - this.method816(); // L: 59 + this.field342 = var1.field266; // L: 54 + this.field333 = var2; // L: 55 + this.field339 = var3; // L: 56 + this.field334 = var4; // L: 57 + this.field336 = 0; // L: 58 + this.method800(); // L: 59 } // L: 60 @ObfuscatedSignature( - descriptor = "(Lat;II)V" + descriptor = "(Lak;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.field337 = var1.field254; // L: 42 - this.field328 = var2; // L: 43 - this.field335 = var3; // L: 44 - this.field330 = 8192; // L: 45 - this.field329 = 0; // L: 46 - this.method816(); // L: 47 + this.field342 = var1.field266; // L: 42 + this.field333 = var2; // L: 43 + this.field339 = var3; // L: 44 + this.field334 = 8192; // L: 45 + this.field336 = 0; // L: 46 + this.method800(); // L: 47 } // L: 48 - @ObfuscatedName("b") - void method816() { - this.field331 = this.field335; // L: 73 - this.field336 = method955(this.field335, this.field330); // L: 74 - this.field333 = method832(this.field335, this.field330); // L: 75 + @ObfuscatedName("a") + void method800() { + this.field335 = this.field339; // L: 73 + this.field337 = method827(this.field339, this.field334); // L: 74 + this.field338 = method925(this.field339, this.field334); // L: 75 } // L: 76 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "()Laf;" + descriptor = "()Lao;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return null; // L: 200 } - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "()Laf;" + descriptor = "()Lao;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return null; // L: 204 } - @ObfuscatedName("l") - protected int vmethod5441() { - return this.field335 == 0 && this.field338 == 0 ? 0 : 1; // L: 208 209 + @ObfuscatedName("s") + protected int vmethod5295() { + return this.field339 == 0 && this.field343 == 0 ? 0 : 1; // L: 208 209 } - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field335 == 0 && this.field338 == 0) { // L: 213 + if (this.field339 == 0 && this.field343 == 0) { // L: 213 this.skip(var3); // L: 214 } else { RawSound var4 = (RawSound)super.sound; // L: 217 @@ -117,163 +117,163 @@ public class RawPcmStream extends PcmStream { int var9 = var2; // L: 223 var3 += var2; // L: 224 - if (this.field329 < 0) { // L: 225 - if (this.field328 <= 0) { // L: 226 - this.method801(); // L: 228 + if (this.field336 < 0) { // L: 225 + if (this.field333 <= 0) { // L: 226 + this.method809(); // L: 228 this.remove(); // L: 229 return; // L: 230 } - this.field329 = 0; + this.field336 = 0; } - if (this.field329 >= var7) { // L: 233 - if (this.field328 >= 0) { // L: 234 - this.method801(); // L: 236 + if (this.field336 >= var7) { // L: 233 + if (this.field333 >= 0) { // L: 234 + this.method809(); // L: 236 this.remove(); // L: 237 return; // L: 238 } - this.field329 = var7 - 1; + this.field336 = var7 - 1; } if (this.numLoops < 0) { // L: 241 - if (this.field337) { // L: 242 - if (this.field328 < 0) { // L: 243 - var9 = this.method947(var1, var2, var5, var3, var4.samples[this.start]); // L: 244 - if (this.field329 >= var5) { // L: 245 + if (this.field342) { // L: 242 + if (this.field333 < 0) { // L: 243 + var9 = this.method934(var1, var2, var5, var3, var4.samples[this.start]); // L: 244 + if (this.field336 >= var5) { // L: 245 return; } - this.field329 = var5 + var5 - 1 - this.field329; // L: 246 - this.field328 = -this.field328; // L: 247 + this.field336 = var5 + var5 - 1 - this.field336; // L: 246 + this.field333 = -this.field333; // L: 247 } while (true) { - var9 = this.method814(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250 - if (this.field329 < var6) { // L: 251 + var9 = this.method822(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250 + if (this.field336 < var6) { // L: 251 return; } - this.field329 = var6 + var6 - 1 - this.field329; // L: 252 - this.field328 = -this.field328; // L: 253 - var9 = this.method947(var1, var9, var5, var3, var4.samples[this.start]); // L: 254 - if (this.field329 >= var5) { // L: 255 + this.field336 = var6 + var6 - 1 - this.field336; // L: 252 + this.field333 = -this.field333; // L: 253 + var9 = this.method934(var1, var9, var5, var3, var4.samples[this.start]); // L: 254 + if (this.field336 >= var5) { // L: 255 return; } - this.field329 = var5 + var5 - 1 - this.field329; // L: 256 - this.field328 = -this.field328; // L: 257 + this.field336 = var5 + var5 - 1 - this.field336; // L: 256 + this.field333 = -this.field333; // L: 257 } - } else if (this.field328 < 0) { // L: 260 + } else if (this.field333 < 0) { // L: 260 while (true) { - var9 = this.method947(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262 - if (this.field329 >= var5) { // L: 263 + var9 = this.method934(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262 + if (this.field336 >= var5) { // L: 263 return; } - this.field329 = var6 - 1 - (var6 - 1 - this.field329) % var8; // L: 264 + this.field336 = var6 - 1 - (var6 - 1 - this.field336) % var8; // L: 264 } } else { while (true) { - var9 = this.method814(var1, var9, var6, var3, var4.samples[this.start]); // L: 269 - if (this.field329 < var6) { // L: 270 + var9 = this.method822(var1, var9, var6, var3, var4.samples[this.start]); // L: 269 + if (this.field336 < var6) { // L: 270 return; } - this.field329 = var5 + (this.field329 - var5) % var8; // L: 271 + this.field336 = var5 + (this.field336 - var5) % var8; // L: 271 } } } else { if (this.numLoops > 0) { // L: 275 - if (this.field337) { // L: 276 + if (this.field342) { // L: 276 label127: { - if (this.field328 < 0) { // L: 277 - var9 = this.method947(var1, var2, var5, var3, var4.samples[this.start]); // L: 278 - if (this.field329 >= var5) { // L: 279 + if (this.field333 < 0) { // L: 277 + var9 = this.method934(var1, var2, var5, var3, var4.samples[this.start]); // L: 278 + if (this.field336 >= var5) { // L: 279 return; } - this.field329 = var5 + var5 - 1 - this.field329; // L: 280 - this.field328 = -this.field328; // L: 281 + this.field336 = var5 + var5 - 1 - this.field336; // L: 280 + this.field333 = -this.field333; // L: 281 if (--this.numLoops == 0) { // L: 282 break label127; } } do { - var9 = this.method814(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285 - if (this.field329 < var6) { // L: 286 + var9 = this.method822(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285 + if (this.field336 < var6) { // L: 286 return; } - this.field329 = var6 + var6 - 1 - this.field329; // L: 287 - this.field328 = -this.field328; // L: 288 + this.field336 = var6 + var6 - 1 - this.field336; // L: 287 + this.field333 = -this.field333; // L: 288 if (--this.numLoops == 0) { // L: 289 break; } - var9 = this.method947(var1, var9, var5, var3, var4.samples[this.start]); // L: 290 - if (this.field329 >= var5) { // L: 291 + var9 = this.method934(var1, var9, var5, var3, var4.samples[this.start]); // L: 290 + if (this.field336 >= var5) { // L: 291 return; } - this.field329 = var5 + var5 - 1 - this.field329; // L: 292 - this.field328 = -this.field328; // L: 293 + this.field336 = var5 + var5 - 1 - this.field336; // L: 292 + this.field333 = -this.field333; // L: 293 } while(--this.numLoops != 0); // L: 294 } } else { int var10; - if (this.field328 < 0) { // L: 297 + if (this.field333 < 0) { // L: 297 while (true) { - var9 = this.method947(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299 - if (this.field329 >= var5) { // L: 300 + var9 = this.method934(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299 + if (this.field336 >= var5) { // L: 300 return; } - var10 = (var6 - 1 - this.field329) / var8; // L: 301 + var10 = (var6 - 1 - this.field336) / var8; // L: 301 if (var10 >= this.numLoops) { // L: 302 - this.field329 += var8 * this.numLoops; // L: 303 + this.field336 += var8 * this.numLoops; // L: 303 this.numLoops = 0; // L: 304 break; // L: 305 } - this.field329 += var8 * var10; // L: 307 + this.field336 += var8 * var10; // L: 307 this.numLoops -= var10; // L: 308 } } else { while (true) { - var9 = this.method814(var1, var9, var6, var3, var4.samples[this.start]); // L: 313 - if (this.field329 < var6) { // L: 314 + var9 = this.method822(var1, var9, var6, var3, var4.samples[this.start]); // L: 313 + if (this.field336 < var6) { // L: 314 return; } - var10 = (this.field329 - var5) / var8; // L: 315 + var10 = (this.field336 - var5) / var8; // L: 315 if (var10 >= this.numLoops) { // L: 316 - this.field329 -= var8 * this.numLoops; // L: 317 + this.field336 -= var8 * this.numLoops; // L: 317 this.numLoops = 0; // L: 318 break; // L: 319 } - this.field329 -= var8 * var10; // L: 321 + this.field336 -= var8 * var10; // L: 321 this.numLoops -= var10; // L: 322 } } } } - if (this.field328 < 0) { // L: 326 - this.method947(var1, var9, 0, var3, 0); // L: 327 - if (this.field329 < 0) { // L: 328 - this.field329 = -1; // L: 329 - this.method801(); // L: 330 + if (this.field333 < 0) { // L: 326 + this.method934(var1, var9, 0, var3, 0); // L: 327 + if (this.field336 < 0) { // L: 328 + this.field336 = -1; // L: 329 + this.method809(); // L: 330 this.remove(); // L: 331 } } else { - this.method814(var1, var9, var7, var3, 0); // L: 335 - if (this.field329 >= var7) { // L: 336 - this.field329 = var7; // L: 337 - this.method801(); // L: 338 + this.method822(var1, var9, var7, var3, 0); // L: 335 + if (this.field336 >= var7) { // L: 336 + this.field336 = var7; // L: 337 + this.method809(); // L: 338 this.remove(); // L: 339 } } @@ -282,33 +282,33 @@ public class RawPcmStream extends PcmStream { } } // L: 215 342 - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("setNumLoops") public synchronized void setNumLoops(int var1) { this.numLoops = var1; // L: 79 } // L: 80 - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("skip") public synchronized void skip(int var1) { - if (this.field338 > 0) { // L: 345 - if (var1 >= this.field338) { // L: 346 - if (this.field335 == Integer.MIN_VALUE) { // L: 347 - this.field335 = 0; // L: 348 - this.field333 = 0; // L: 349 - this.field336 = 0; // L: 350 - this.field331 = 0; // L: 351 + if (this.field343 > 0) { // L: 345 + if (var1 >= this.field343) { // L: 346 + if (this.field339 == Integer.MIN_VALUE) { // L: 347 + this.field339 = 0; // L: 348 + this.field338 = 0; // L: 349 + this.field337 = 0; // L: 350 + this.field335 = 0; // L: 351 this.remove(); // L: 352 - var1 = this.field338; // L: 353 + var1 = this.field343; // L: 353 } - this.field338 = 0; // L: 355 - this.method816(); // L: 356 + this.field343 = 0; // L: 355 + this.method800(); // L: 356 } else { - this.field331 += this.field339 * var1; // L: 359 - this.field336 += this.field340 * var1; // L: 360 - this.field333 += this.field327 * var1; // L: 361 - this.field338 -= var1; // L: 362 + this.field335 += this.field332 * var1; // L: 359 + this.field337 += this.field345 * var1; // L: 360 + this.field338 += this.field346 * var1; // L: 361 + this.field343 -= var1; // L: 362 } } @@ -321,130 +321,130 @@ public class RawPcmStream extends PcmStream { this.numLoops = 0; } - if (this.field329 < 0) { // L: 371 - if (this.field328 <= 0) { // L: 372 - this.method801(); // L: 374 + if (this.field336 < 0) { // L: 371 + if (this.field333 <= 0) { // L: 372 + this.method809(); // L: 374 this.remove(); // L: 375 return; // L: 376 } - this.field329 = 0; + this.field336 = 0; } - if (this.field329 >= var5) { // L: 379 - if (this.field328 >= 0) { // L: 380 - this.method801(); // L: 382 + if (this.field336 >= var5) { // L: 379 + if (this.field333 >= 0) { // L: 380 + this.method809(); // L: 382 this.remove(); // L: 383 return; // L: 384 } - this.field329 = var5 - 1; + this.field336 = var5 - 1; } - this.field329 += this.field328 * var1; // L: 387 + this.field336 += this.field333 * var1; // L: 387 if (this.numLoops < 0) { // L: 388 - if (!this.field337) { // L: 389 - if (this.field328 < 0) { // L: 404 - if (this.field329 >= var3) { // L: 405 + if (!this.field342) { // L: 389 + if (this.field333 < 0) { // L: 404 + if (this.field336 >= var3) { // L: 405 return; } - this.field329 = var4 - 1 - (var4 - 1 - this.field329) % var6; // L: 406 + this.field336 = var4 - 1 - (var4 - 1 - this.field336) % var6; // L: 406 } else { - if (this.field329 < var4) { // L: 409 + if (this.field336 < var4) { // L: 409 return; } - this.field329 = var3 + (this.field329 - var3) % var6; // L: 410 + this.field336 = var3 + (this.field336 - var3) % var6; // L: 410 } } else { - if (this.field328 < 0) { // L: 390 - if (this.field329 >= var3) { // L: 391 + if (this.field333 < 0) { // L: 390 + if (this.field336 >= var3) { // L: 391 return; } - this.field329 = var3 + var3 - 1 - this.field329; // L: 392 - this.field328 = -this.field328; // L: 393 + this.field336 = var3 + var3 - 1 - this.field336; // L: 392 + this.field333 = -this.field333; // L: 393 } - while (this.field329 >= var4) { // L: 396 - this.field329 = var4 + var4 - 1 - this.field329; // L: 397 - this.field328 = -this.field328; // L: 398 - if (this.field329 >= var3) { // L: 399 + while (this.field336 >= var4) { // L: 396 + this.field336 = var4 + var4 - 1 - this.field336; // L: 397 + this.field333 = -this.field333; // L: 398 + if (this.field336 >= var3) { // L: 399 return; } - this.field329 = var3 + var3 - 1 - this.field329; // L: 400 - this.field328 = -this.field328; // L: 401 + this.field336 = var3 + var3 - 1 - this.field336; // L: 400 + this.field333 = -this.field333; // L: 401 } } } else { if (this.numLoops > 0) { // L: 414 - if (this.field337) { // L: 415 + if (this.field342) { // L: 415 label129: { - if (this.field328 < 0) { // L: 416 - if (this.field329 >= var3) { // L: 417 + if (this.field333 < 0) { // L: 416 + if (this.field336 >= var3) { // L: 417 return; } - this.field329 = var3 + var3 - 1 - this.field329; // L: 418 - this.field328 = -this.field328; // L: 419 + this.field336 = var3 + var3 - 1 - this.field336; // L: 418 + this.field333 = -this.field333; // L: 419 if (--this.numLoops == 0) { // L: 420 break label129; } } do { - if (this.field329 < var4) { // L: 423 + if (this.field336 < var4) { // L: 423 return; } - this.field329 = var4 + var4 - 1 - this.field329; // L: 424 - this.field328 = -this.field328; // L: 425 + this.field336 = var4 + var4 - 1 - this.field336; // L: 424 + this.field333 = -this.field333; // L: 425 if (--this.numLoops == 0) { // L: 426 break; } - if (this.field329 >= var3) { // L: 427 + if (this.field336 >= var3) { // L: 427 return; } - this.field329 = var3 + var3 - 1 - this.field329; // L: 428 - this.field328 = -this.field328; // L: 429 + this.field336 = var3 + var3 - 1 - this.field336; // L: 428 + this.field333 = -this.field333; // L: 429 } while(--this.numLoops != 0); // L: 430 } } else { label161: { int var7; - if (this.field328 < 0) { // L: 433 - if (this.field329 >= var3) { // L: 434 + if (this.field333 < 0) { // L: 433 + if (this.field336 >= var3) { // L: 434 return; } - var7 = (var4 - 1 - this.field329) / var6; // L: 435 + var7 = (var4 - 1 - this.field336) / var6; // L: 435 if (var7 >= this.numLoops) { // L: 436 - this.field329 += var6 * this.numLoops; // L: 437 + this.field336 += var6 * this.numLoops; // L: 437 this.numLoops = 0; // L: 438 break label161; // L: 439 } - this.field329 += var6 * var7; // L: 441 + this.field336 += var6 * var7; // L: 441 this.numLoops -= var7; // L: 442 } else { - if (this.field329 < var4) { // L: 445 + if (this.field336 < var4) { // L: 445 return; } - var7 = (this.field329 - var3) / var6; // L: 446 + var7 = (this.field336 - var3) / var6; // L: 446 if (var7 >= this.numLoops) { // L: 447 - this.field329 -= var6 * this.numLoops; // L: 448 + this.field336 -= var6 * this.numLoops; // L: 448 this.numLoops = 0; // L: 449 break label161; // L: 450 } - this.field329 -= var6 * var7; // L: 452 + this.field336 -= var6 * var7; // L: 452 this.numLoops -= var7; // L: 453 } @@ -453,51 +453,51 @@ public class RawPcmStream extends PcmStream { } } - if (this.field328 < 0) { // L: 457 - if (this.field329 < 0) { // L: 458 - this.field329 = -1; // L: 459 - this.method801(); // L: 460 + if (this.field333 < 0) { // L: 457 + if (this.field336 < 0) { // L: 458 + this.field336 = -1; // L: 459 + this.method809(); // L: 460 this.remove(); // L: 461 } - } else if (this.field329 >= var5) { // L: 465 - this.field329 = var5; // L: 466 - this.method801(); // L: 467 + } else if (this.field336 >= var5) { // L: 465 + this.field336 = var5; // L: 466 + this.method809(); // L: 467 this.remove(); // L: 468 } } } // L: 412 471 - @ObfuscatedName("p") - public synchronized void method929(int var1) { - this.method921(var1 << 6, this.method798()); // L: 83 + @ObfuscatedName("c") + public synchronized void method802(int var1) { + this.method804(var1 << 6, this.method806()); // L: 83 } // L: 84 @ObfuscatedName("w") - synchronized void method942(int var1) { - this.method921(var1, this.method798()); // L: 87 + synchronized void method803(int var1) { + this.method804(var1, this.method806()); // L: 87 } // L: 88 - @ObfuscatedName("k") - synchronized void method921(int var1, int var2) { - this.field335 = var1; // L: 91 - this.field330 = var2; // L: 92 - this.field338 = 0; // L: 93 - this.method816(); // L: 94 + @ObfuscatedName("b") + synchronized void method804(int var1, int var2) { + this.field339 = var1; // L: 91 + this.field334 = var2; // L: 92 + this.field343 = 0; // L: 93 + this.method800(); // L: 94 } // L: 95 - @ObfuscatedName("d") - public synchronized int method797() { - return this.field335 == Integer.MIN_VALUE ? 0 : this.field335; // L: 98 + @ObfuscatedName("t") + public synchronized int method805() { + return this.field339 == Integer.MIN_VALUE ? 0 : this.field339; // L: 98 } - @ObfuscatedName("m") - public synchronized int method798() { - return this.field330 < 0 ? -1 : this.field330; // L: 102 + @ObfuscatedName("g") + public synchronized int method806() { + return this.field334 < 0 ? -1 : this.field334; // L: 102 } - @ObfuscatedName("u") - public synchronized void method799(int var1) { + @ObfuscatedName("x") + public synchronized void method807(int var1) { int var2 = ((RawSound)super.sound).samples.length << 8; // L: 106 if (var1 < -1) { // L: 107 var1 = -1; @@ -507,257 +507,257 @@ public class RawPcmStream extends PcmStream { var1 = var2; } - this.field329 = var1; // L: 109 + this.field336 = var1; // L: 109 } // L: 110 - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(Z)V", garbageValue = "1" ) - public synchronized void method800() { - this.field328 = (this.field328 ^ this.field328 >> 31) + (this.field328 >>> 31); // L: 113 - this.field328 = -this.field328; // L: 114 + public synchronized void method811() { + this.field333 = (this.field333 ^ this.field333 >> 31) + (this.field333 >>> 31); // L: 113 + this.field333 = -this.field333; // L: 114 } // L: 115 - @ObfuscatedName("g") - void method801() { - if (this.field338 != 0) { // L: 118 - if (this.field335 == Integer.MIN_VALUE) { - this.field335 = 0; // L: 119 + @ObfuscatedName("e") + void method809() { + if (this.field343 != 0) { // L: 118 + if (this.field339 == Integer.MIN_VALUE) { + this.field339 = 0; // L: 119 } - this.field338 = 0; // L: 120 - this.method816(); // L: 121 + this.field343 = 0; // L: 120 + this.method800(); // L: 121 } } // L: 123 - @ObfuscatedName("x") - public synchronized void method802(int var1, int var2) { - this.method880(var1, var2, this.method798()); // L: 126 + @ObfuscatedName("h") + public synchronized void method810(int var1, int var2) { + this.method799(var1, var2, this.method806()); // L: 126 } // L: 127 - @ObfuscatedName("a") - public synchronized void method880(int var1, int var2, int var3) { + @ObfuscatedName("f") + public synchronized void method799(int var1, int var2, int var3) { if (var1 == 0) { // L: 130 - this.method921(var2, var3); // L: 131 + this.method804(var2, var3); // L: 131 } else { - int var4 = method955(var2, var3); // L: 134 - int var5 = method832(var2, var3); // L: 135 - if (var4 == this.field336 && var5 == this.field333) { // L: 136 - this.field338 = 0; // L: 137 + int var4 = method827(var2, var3); // L: 134 + int var5 = method925(var2, var3); // L: 135 + if (var4 == this.field337 && var5 == this.field338) { // L: 136 + this.field343 = 0; // L: 137 } else { - int var6 = var2 - this.field331; // L: 140 - if (this.field331 - var2 > var6) { // L: 141 - var6 = this.field331 - var2; + int var6 = var2 - this.field335; // L: 140 + if (this.field335 - var2 > var6) { // L: 141 + var6 = this.field335 - var2; } - if (var4 - this.field336 > var6) { // L: 142 - var6 = var4 - this.field336; + if (var4 - this.field337 > var6) { // L: 142 + var6 = var4 - this.field337; } - if (this.field336 - var4 > var6) { // L: 143 - var6 = this.field336 - var4; + if (this.field337 - var4 > var6) { // L: 143 + var6 = this.field337 - var4; } - if (var5 - this.field333 > var6) { - var6 = var5 - this.field333; // L: 144 + if (var5 - this.field338 > var6) { + var6 = var5 - this.field338; // L: 144 } - if (this.field333 - var5 > var6) { // L: 145 - var6 = this.field333 - var5; + if (this.field338 - var5 > var6) { // L: 145 + var6 = this.field338 - var5; } if (var1 > var6) { // L: 146 var1 = var6; } - this.field338 = var1; // L: 147 - this.field335 = var2; // L: 148 - this.field330 = var3; // L: 149 - this.field339 = (var2 - this.field331) / var1; // L: 150 - this.field340 = (var4 - this.field336) / var1; // L: 151 - this.field327 = (var5 - this.field333) / var1; // L: 152 + this.field343 = var1; // L: 147 + this.field339 = var2; // L: 148 + this.field334 = var3; // L: 149 + this.field332 = (var2 - this.field335) / var1; // L: 150 + this.field345 = (var4 - this.field337) / var1; // L: 151 + this.field346 = (var5 - this.field338) / var1; // L: 152 } } } // L: 132 138 153 - @ObfuscatedName("y") - public synchronized void method882(int var1) { + @ObfuscatedName("d") + public synchronized void method812(int var1) { if (var1 == 0) { // L: 156 - this.method942(0); // L: 157 + this.method803(0); // L: 157 this.remove(); // L: 158 - } else if (this.field336 == 0 && this.field333 == 0) { // L: 161 - this.field338 = 0; // L: 162 - this.field335 = 0; // L: 163 - this.field331 = 0; // L: 164 + } else if (this.field337 == 0 && this.field338 == 0) { // L: 161 + this.field343 = 0; // L: 162 + this.field339 = 0; // L: 163 + this.field335 = 0; // L: 164 this.remove(); // L: 165 } else { - int var2 = -this.field331; // L: 168 - if (this.field331 > var2) { // L: 169 - var2 = this.field331; + int var2 = -this.field335; // L: 168 + if (this.field335 > var2) { // L: 169 + var2 = this.field335; } - if (-this.field336 > var2) { // L: 170 - var2 = -this.field336; + if (-this.field337 > var2) { // L: 170 + var2 = -this.field337; } - if (this.field336 > var2) { // L: 171 - var2 = this.field336; + if (this.field337 > var2) { // L: 171 + var2 = this.field337; } - if (-this.field333 > var2) { // L: 172 - var2 = -this.field333; + if (-this.field338 > var2) { // L: 172 + var2 = -this.field338; } - if (this.field333 > var2) { // L: 173 - var2 = this.field333; + if (this.field338 > var2) { // L: 173 + var2 = this.field338; } if (var1 > var2) { // L: 174 var1 = var2; } - this.field338 = var1; // L: 175 - this.field335 = Integer.MIN_VALUE; // L: 176 - this.field339 = -this.field331 / var1; // L: 177 - this.field340 = -this.field336 / var1; // L: 178 - this.field327 = -this.field333 / var1; // L: 179 + this.field343 = var1; // L: 175 + this.field339 = Integer.MIN_VALUE; // L: 176 + this.field332 = -this.field335 / var1; // L: 177 + this.field345 = -this.field337 / var1; // L: 178 + this.field346 = -this.field338 / var1; // L: 179 } } // L: 159 166 180 @ObfuscatedName("j") - public synchronized void method896(int var1) { - if (this.field328 < 0) { // L: 183 - this.field328 = -var1; + public synchronized void method813(int var1) { + if (this.field333 < 0) { // L: 183 + this.field333 = -var1; } else { - this.field328 = var1; // L: 184 + this.field333 = var1; // L: 184 } } // L: 185 + @ObfuscatedName("z") + public synchronized int method884() { + return this.field333 < 0 ? -this.field333 : this.field333; // L: 188 + } + + @ObfuscatedName("ab") + public boolean method815() { + return this.field336 < 0 || this.field336 >= ((RawSound)super.sound).samples.length << 8; // L: 192 + } + @ObfuscatedName("aj") - public synchronized int method866() { - return this.field328 < 0 ? -this.field328 : this.field328; // L: 188 + public boolean method935() { + return this.field343 != 0; // L: 196 } - @ObfuscatedName("al") - public boolean method830() { - return this.field329 < 0 || this.field329 >= ((RawSound)super.sound).samples.length << 8; // L: 192 - } - - @ObfuscatedName("at") - public boolean method808() { - return this.field338 != 0; // L: 196 - } - - @ObfuscatedName("an") - int method814(int[] var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("as") + int method822(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field338 > 0) { // L: 474 - int var6 = var2 + this.field338; // L: 475 + if (this.field343 > 0) { // L: 474 + int var6 = var2 + this.field343; // L: 475 if (var6 > var4) { // L: 476 var6 = var4; } - this.field338 += var2; // L: 477 - if (this.field328 == 256 && (this.field329 & 255) == 0) { // L: 478 - if (PcmPlayer.PcmPlayer_stereo) { // L: 479 - var2 = method826(0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field336, this.field333, this.field340, this.field327, 0, var6, var3, this); + this.field343 += var2; // L: 477 + if (this.field333 == 256 && (this.field336 & 255) == 0) { // L: 478 + if (ArchiveDiskAction.PcmPlayer_stereo) { // L: 479 + var2 = method888(0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field337, this.field338, this.field345, this.field346, 0, var6, var3, this); } else { - var2 = method874(((RawSound)super.sound).samples, var1, this.field329, var2, this.field331, this.field339, 0, var6, var3, this); // L: 480 + var2 = method833(((RawSound)super.sound).samples, var1, this.field336, var2, this.field335, this.field332, 0, var6, var3, this); // L: 480 } - } else if (PcmPlayer.PcmPlayer_stereo) { // L: 483 - var2 = method951(0, 0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field336, this.field333, this.field340, this.field327, 0, var6, var3, this, this.field328, var5); + } else if (ArchiveDiskAction.PcmPlayer_stereo) { // L: 483 + var2 = method838(0, 0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field337, this.field338, this.field345, this.field346, 0, var6, var3, this, this.field333, var5); } else { - var2 = method831(0, 0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field331, this.field339, 0, var6, var3, this, this.field328, var5); // L: 484 + var2 = method837(0, 0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field335, this.field332, 0, var6, var3, this, this.field333, var5); // L: 484 } - this.field338 -= var2; // L: 486 - if (this.field338 != 0) { // L: 487 + this.field343 -= var2; // L: 486 + if (this.field343 != 0) { // L: 487 return var2; } - if (!this.method956()) { // L: 488 + if (!this.method824()) { // L: 488 continue; } return var4; } - if (this.field328 == 256 && (this.field329 & 255) == 0) { // L: 490 - if (PcmPlayer.PcmPlayer_stereo) { // L: 491 - return method818(0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field336, this.field333, 0, var4, var3, this); + if (this.field333 == 256 && (this.field336 & 255) == 0) { // L: 490 + if (ArchiveDiskAction.PcmPlayer_stereo) { // L: 491 + return method826(0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field337, this.field338, 0, var4, var3, this); } - return method817(((RawSound)super.sound).samples, var1, this.field329, var2, this.field331, 0, var4, var3, this); // L: 492 + return method853(((RawSound)super.sound).samples, var1, this.field336, var2, this.field335, 0, var4, var3, this); // L: 492 } - if (PcmPlayer.PcmPlayer_stereo) { // L: 495 - return method822(0, 0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field336, this.field333, 0, var4, var3, this, this.field328, var5); + if (ArchiveDiskAction.PcmPlayer_stereo) { // L: 495 + return method928(0, 0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field337, this.field338, 0, var4, var3, this, this.field333, var5); } - return method889(0, 0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field331, 0, var4, var3, this, this.field328, var5); // L: 496 + return method936(0, 0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field335, 0, var4, var3, this, this.field333, var5); // L: 496 } } - @ObfuscatedName("ay") - int method947(int[] var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("au") + int method934(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field338 > 0) { // L: 501 - int var6 = var2 + this.field338; // L: 502 + if (this.field343 > 0) { // L: 501 + int var6 = var2 + this.field343; // L: 502 if (var6 > var4) { // L: 503 var6 = var4; } - this.field338 += var2; // L: 504 - if (this.field328 == -256 && (this.field329 & 255) == 0) { // L: 505 - if (PcmPlayer.PcmPlayer_stereo) { // L: 506 - var2 = method828(0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field336, this.field333, this.field340, this.field327, 0, var6, var3, this); + this.field343 += var2; // L: 504 + if (this.field333 == -256 && (this.field336 & 255) == 0) { // L: 505 + if (ArchiveDiskAction.PcmPlayer_stereo) { // L: 506 + var2 = method863(0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field337, this.field338, this.field345, this.field346, 0, var6, var3, this); } else { - var2 = method827(((RawSound)super.sound).samples, var1, this.field329, var2, this.field331, this.field339, 0, var6, var3, this); // L: 507 + var2 = method916(((RawSound)super.sound).samples, var1, this.field336, var2, this.field335, this.field332, 0, var6, var3, this); // L: 507 } - } else if (PcmPlayer.PcmPlayer_stereo) { // L: 510 - var2 = method858(0, 0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field336, this.field333, this.field340, this.field327, 0, var6, var3, this, this.field328, var5); + } else if (ArchiveDiskAction.PcmPlayer_stereo) { // L: 510 + var2 = method840(0, 0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field337, this.field338, this.field345, this.field346, 0, var6, var3, this, this.field333, var5); } else { - var2 = method919(0, 0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field331, this.field339, 0, var6, var3, this, this.field328, var5); // L: 511 + var2 = method839(0, 0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field335, this.field332, 0, var6, var3, this, this.field333, var5); // L: 511 } - this.field338 -= var2; // L: 513 - if (this.field338 != 0) { // L: 514 + this.field343 -= var2; // L: 513 + if (this.field343 != 0) { // L: 514 return var2; } - if (!this.method956()) { // L: 515 + if (!this.method824()) { // L: 515 continue; } return var4; } - if (this.field328 == -256 && (this.field329 & 255) == 0) { // L: 517 - if (PcmPlayer.PcmPlayer_stereo) { // L: 518 - return method820(0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field336, this.field333, 0, var4, var3, this); + if (this.field333 == -256 && (this.field336 & 255) == 0) { // L: 517 + if (ArchiveDiskAction.PcmPlayer_stereo) { // L: 518 + return method828(0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field337, this.field338, 0, var4, var3, this); } - return method819(((RawSound)super.sound).samples, var1, this.field329, var2, this.field331, 0, var4, var3, this); // L: 519 + return method865(((RawSound)super.sound).samples, var1, this.field336, var2, this.field335, 0, var4, var3, this); // L: 519 } - if (PcmPlayer.PcmPlayer_stereo) { // L: 522 - return method824(0, 0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field336, this.field333, 0, var4, var3, this, this.field328, var5); + if (ArchiveDiskAction.PcmPlayer_stereo) { // L: 522 + return method832(0, 0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field337, this.field338, 0, var4, var3, this, this.field333, var5); } - return method823(0, 0, ((RawSound)super.sound).samples, var1, this.field329, var2, this.field331, 0, var4, var3, this, this.field328, var5); // L: 523 + return method831(0, 0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field335, 0, var4, var3, this, this.field333, var5); // L: 523 } } - @ObfuscatedName("ag") - int vmethod962() { - int var1 = this.field331 * 3 >> 6; // L: 31 + @ObfuscatedName("al") + int vmethod951() { + int var1 = this.field335 * 3 >> 6; // L: 31 var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); // L: 32 if (this.numLoops == 0) { // L: 33 - var1 -= var1 * this.field329 / (((RawSound)super.sound).samples.length << 8); + var1 -= var1 * this.field336 / (((RawSound)super.sound).samples.length << 8); } else if (this.numLoops >= 0) { var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; // L: 34 } @@ -765,9 +765,9 @@ public class RawPcmStream extends PcmStream { return var1 > 255 ? 255 : var1; // L: 35 } - @ObfuscatedName("ah") - boolean method956() { - int var1 = this.field335; // L: 528 + @ObfuscatedName("aq") + boolean method824() { + int var1 = this.field339; // L: 528 int var2; int var3; if (var1 == Integer.MIN_VALUE) { // L: 531 @@ -775,97 +775,97 @@ public class RawPcmStream extends PcmStream { var2 = 0; // L: 533 var1 = 0; // L: 534 } else { - var2 = method955(var1, this.field330); // L: 537 - var3 = method832(var1, this.field330); // L: 538 + var2 = method827(var1, this.field334); // L: 537 + var3 = method925(var1, this.field334); // L: 538 } - if (var1 == this.field331 && var2 == this.field336 && var3 == this.field333) { // L: 540 - if (this.field335 == Integer.MIN_VALUE) { // L: 570 - this.field335 = 0; // L: 571 - this.field333 = 0; // L: 572 - this.field336 = 0; // L: 573 - this.field331 = 0; // L: 574 + if (var1 == this.field335 && var2 == this.field337 && var3 == this.field338) { // L: 540 + if (this.field339 == Integer.MIN_VALUE) { // L: 570 + this.field339 = 0; // L: 571 + this.field338 = 0; // L: 572 + this.field337 = 0; // L: 573 + this.field335 = 0; // L: 574 this.remove(); // L: 575 return true; // L: 576 } else { - this.method816(); // L: 578 + this.method800(); // L: 578 return false; // L: 579 } } else { - if (this.field331 < var1) { // L: 541 - this.field339 = 1; // L: 542 - this.field338 = var1 - this.field331; // L: 543 - } else if (this.field331 > var1) { // L: 545 - this.field339 = -1; // L: 546 - this.field338 = this.field331 - var1; // L: 547 + if (this.field335 < var1) { // L: 541 + this.field332 = 1; // L: 542 + this.field343 = var1 - this.field335; // L: 543 + } else if (this.field335 > var1) { // L: 545 + this.field332 = -1; // L: 546 + this.field343 = this.field335 - var1; // L: 547 } else { - this.field339 = 0; // L: 549 + this.field332 = 0; // L: 549 } - if (this.field336 < var2) { // L: 550 - this.field340 = 1; // L: 551 - if (this.field338 == 0 || this.field338 > var2 - this.field336) { // L: 552 - this.field338 = var2 - this.field336; + if (this.field337 < var2) { // L: 550 + this.field345 = 1; // L: 551 + if (this.field343 == 0 || this.field343 > var2 - this.field337) { // L: 552 + this.field343 = var2 - this.field337; } - } else if (this.field336 > var2) { // L: 554 - this.field340 = -1; // L: 555 - if (this.field338 == 0 || this.field338 > this.field336 - var2) { // L: 556 - this.field338 = this.field336 - var2; + } else if (this.field337 > var2) { // L: 554 + this.field345 = -1; // L: 555 + if (this.field343 == 0 || this.field343 > this.field337 - var2) { // L: 556 + this.field343 = this.field337 - var2; } } else { - this.field340 = 0; // L: 558 + this.field345 = 0; // L: 558 } - if (this.field333 < var3) { // L: 559 - this.field327 = 1; // L: 560 - if (this.field338 == 0 || this.field338 > var3 - this.field333) { // L: 561 - this.field338 = var3 - this.field333; + if (this.field338 < var3) { // L: 559 + this.field346 = 1; // L: 560 + if (this.field343 == 0 || this.field343 > var3 - this.field338) { // L: 561 + this.field343 = var3 - this.field338; } - } else if (this.field333 > var3) { // L: 563 - this.field327 = -1; // L: 564 - if (this.field338 == 0 || this.field338 > this.field333 - var3) { // L: 565 - this.field338 = this.field333 - var3; + } else if (this.field338 > var3) { // L: 563 + this.field346 = -1; // L: 564 + if (this.field343 == 0 || this.field343 > this.field338 - var3) { // L: 565 + this.field343 = this.field338 - var3; } } else { - this.field327 = 0; // L: 567 + this.field346 = 0; // L: 567 } return false; // L: 568 } } - @ObfuscatedName("v") - static int method955(int var0, int var1) { + @ObfuscatedName("o") + static int method827(int var0, int var1) { return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); // L: 23 } - @ObfuscatedName("c") - static int method832(int var0, int var1) { + @ObfuscatedName("q") + static int method925(int var0, int var1) { return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); // L: 27 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lat;II)Lau;" + descriptor = "(Lak;II)Lah;" ) @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.field268 * 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.field300 * 100)), var2 << 6) : null; // L: 63 64 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lat;III)Lau;" + descriptor = "(Lak;III)Lah;" ) - public static RawPcmStream method791(RawSound var0, int var1, int var2, int var3) { + public static RawPcmStream method829(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("ac") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "([B[IIIIIIILau;)I" + descriptor = "([B[IIIIIIILah;)I" ) - static int method817(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method853(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 @@ -888,15 +888,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; // L: 596 } - var8.field329 = var2 << 8; // L: 598 + var8.field336 = var2 << 8; // L: 598 return var3; // L: 599 } - @ObfuscatedName("ab") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILau;)I" + descriptor = "(I[B[IIIIIIIILah;)I" ) - static int method818(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method826(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 @@ -939,15 +939,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field329 = var3 << 8; // L: 631 + var10.field336 = var3 << 8; // L: 631 return var4 >> 1; // L: 632 } - @ObfuscatedName("au") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "([B[IIIIIIILau;)I" + descriptor = "([B[IIIIIIILah;)I" ) - static int method819(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method865(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 @@ -970,15 +970,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; // L: 649 } - var8.field329 = var2 << 8; // L: 651 + var8.field336 = var2 << 8; // L: 651 return var3; // L: 652 } - @ObfuscatedName("af") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILau;)I" + descriptor = "(I[B[IIIIIIIILah;)I" ) - static int method820(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method828(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 @@ -1021,15 +1021,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field329 = var3 << 8; // L: 684 + var10.field336 = var3 << 8; // L: 684 return var4 >> 1; // L: 685 } - @ObfuscatedName("ad") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILau;II)I" + descriptor = "(II[B[IIIIIIILah;II)I" ) - static int method889(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 method936(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; } @@ -1054,15 +1054,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; // L: 700 } - var10.field329 = var4; // L: 703 + var10.field336 = var4; // L: 703 return var5; // L: 704 } - @ObfuscatedName("ai") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILau;II)I" + descriptor = "(II[B[IIIIIIIILah;II)I" ) - static int method822(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 method928(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; } @@ -1096,15 +1096,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field329 = var4; // L: 729 + var11.field336 = var4; // L: 729 return var5 >> 1; // L: 730 } - @ObfuscatedName("ax") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILau;II)I" + descriptor = "(II[B[IIIIIIILah;II)I" ) - static int method823(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 method831(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; } @@ -1129,15 +1129,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; // L: 745 } - var10.field329 = var4; // L: 748 + var10.field336 = var4; // L: 748 return var5; // L: 749 } - @ObfuscatedName("ar") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILau;II)I" + descriptor = "(II[B[IIIIIIIILah;II)I" ) - static int method824(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 method832(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; } @@ -1169,15 +1169,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field329 = var4; // L: 773 + var11.field336 = var4; // L: 773 return var5 >> 1; // L: 774 } - @ObfuscatedName("ap") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILau;)I" + descriptor = "([B[IIIIIIIILah;)I" ) - static int method874(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method833(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 @@ -1186,8 +1186,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field336 += var9.field340 * (var6 - var3); // L: 783 - var9.field333 += var9.field327 * (var6 - var3); // L: 784 + var9.field337 += var9.field345 * (var6 - var3); // L: 783 + var9.field338 += var9.field346 * (var6 - var3); // L: 784 int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { // L: 785 786 794 @@ -1209,16 +1209,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2++] * var4; } - var9.field331 = var4 >> 2; // L: 801 - var9.field329 = var2 << 8; // L: 802 + var9.field335 = var4 >> 2; // L: 801 + var9.field336 = var2 << 8; // L: 802 return var3; // L: 803 } - @ObfuscatedName("az") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILau;)I" + descriptor = "(I[B[IIIIIIIIIILah;)I" ) - static int method826(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 method888(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 @@ -1229,7 +1229,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field331 += var12.field339 * (var9 - var4); // L: 814 + var12.field335 += var12.field332 * (var9 - var4); // L: 814 var4 <<= 1; // L: 815 var9 <<= 1; // L: 816 @@ -1274,17 +1274,17 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field336 = var5 >> 2; // L: 848 - var12.field333 = var6 >> 2; // L: 849 - var12.field329 = var3 << 8; // L: 850 + var12.field337 = var5 >> 2; // L: 848 + var12.field338 = var6 >> 2; // L: 849 + var12.field336 = var3 << 8; // L: 850 return var4 >> 1; // L: 851 } - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILau;)I" + descriptor = "([B[IIIIIIIILah;)I" ) - static int method827(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method916(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 @@ -1293,8 +1293,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field336 += var9.field340 * (var6 - var3); // L: 860 - var9.field333 += var9.field327 * (var6 - var3); // L: 861 + var9.field337 += var9.field345 * (var6 - var3); // L: 860 + var9.field338 += var9.field346 * (var6 - var3); // L: 861 int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { // L: 862 863 871 @@ -1316,16 +1316,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2--] * var4; } - var9.field331 = var4 >> 2; // L: 878 - var9.field329 = var2 << 8; // L: 879 + var9.field335 = var4 >> 2; // L: 878 + var9.field336 = var2 << 8; // L: 879 return var3; // L: 880 } - @ObfuscatedName("aa") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILau;)I" + descriptor = "(I[B[IIIIIIIIIILah;)I" ) - static int method828(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 method863(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 @@ -1336,7 +1336,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field331 += var12.field339 * (var9 - var4); // L: 891 + var12.field335 += var12.field332 * (var9 - var4); // L: 891 var4 <<= 1; // L: 892 var9 <<= 1; // L: 893 @@ -1381,19 +1381,19 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field336 = var5 >> 2; // L: 925 - var12.field333 = var6 >> 2; // L: 926 - var12.field329 = var3 << 8; // L: 927 + var12.field337 = var5 >> 2; // L: 925 + var12.field338 = var6 >> 2; // L: 926 + var12.field336 = var3 << 8; // L: 927 return var4 >> 1; // L: 928 } - @ObfuscatedName("bj") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILau;II)I" + descriptor = "(II[B[IIIIIIIILah;II)I" ) - static int method831(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.field336 -= var11.field340 * var5; // L: 932 - var11.field333 -= var11.field327 * var5; // L: 933 + static int method837(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.field337 -= var11.field345 * var5; // L: 932 + var11.field338 -= var11.field346 * var5; // L: 933 if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 934 var8 = var9; } @@ -1420,19 +1420,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; // L: 947 } - var11.field336 += var11.field340 * var5; // L: 950 - var11.field333 += var11.field327 * var5; // L: 951 - var11.field331 = var6; // L: 952 - var11.field329 = var4; // L: 953 + var11.field337 += var11.field345 * var5; // L: 950 + var11.field338 += var11.field346 * var5; // L: 951 + var11.field335 = var6; // L: 952 + var11.field336 = var4; // L: 953 return var5; // L: 954 } - @ObfuscatedName("bm") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILau;II)I" + descriptor = "(II[B[IIIIIIIIIILah;II)I" ) - static int method951(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.field331 -= var5 * var13.field339; // L: 958 + static int method838(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.field335 -= var5 * var13.field332; // L: 958 if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { // L: 959 var10 = var11; } @@ -1471,20 +1471,20 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; // L: 984 - var13.field331 += var13.field339 * var5; // L: 985 - var13.field336 = var6; // L: 986 - var13.field333 = var7; // L: 987 - var13.field329 = var4; // L: 988 + var13.field335 += var13.field332 * var5; // L: 985 + var13.field337 = var6; // L: 986 + var13.field338 = var7; // L: 987 + var13.field336 = var4; // L: 988 return var5; // L: 989 } - @ObfuscatedName("br") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILau;II)I" + descriptor = "(II[B[IIIIIIIILah;II)I" ) - static int method919(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.field336 -= var11.field340 * var5; // L: 993 - var11.field333 -= var11.field327 * var5; // L: 994 + static int method839(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.field337 -= var11.field345 * var5; // L: 993 + var11.field338 -= var11.field346 * var5; // L: 994 if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 995 var8 = var9; } @@ -1511,19 +1511,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; // L: 1008 } - var11.field336 += var11.field340 * var5; // L: 1011 - var11.field333 += var11.field327 * var5; // L: 1012 - var11.field331 = var6; // L: 1013 - var11.field329 = var4; // L: 1014 + var11.field337 += var11.field345 * var5; // L: 1011 + var11.field338 += var11.field346 * var5; // L: 1012 + var11.field335 = var6; // L: 1013 + var11.field336 = var4; // L: 1014 return var5; // L: 1015 } - @ObfuscatedName("bo") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILau;II)I" + descriptor = "(II[B[IIIIIIIIIILah;II)I" ) - static int method858(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.field331 -= var5 * var13.field339; // L: 1019 + static int method840(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.field335 -= var5 * var13.field332; // L: 1019 if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { // L: 1020 var10 = var11; } @@ -1560,10 +1560,10 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; // L: 1044 - var13.field331 += var13.field339 * var5; // L: 1045 - var13.field336 = var6; // L: 1046 - var13.field333 = var7; // L: 1047 - var13.field329 = var4; // L: 1048 + var13.field335 += var13.field332 * var5; // L: 1045 + var13.field337 = var6; // L: 1046 + var13.field338 = var7; // L: 1047 + var13.field336 = 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 77ba88e758..9357bfac3c 100644 --- a/runescape-client/src/main/java/RawSound.java +++ b/runescape-client/src/main/java/RawSound.java @@ -3,23 +3,23 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("at") +@ObfuscatedName("ak") @Implements("RawSound") public class RawSound extends AbstractSound { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("sampleRate") public int sampleRate; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("samples") public byte[] samples; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("start") public int start; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("end") int end; - @ObfuscatedName("b") - public boolean field254; + @ObfuscatedName("a") + public boolean field266; RawSound(int var1, byte[] var2, int var3, int var4) { this.sampleRate = var1; // L: 13 @@ -33,12 +33,12 @@ public class RawSound extends AbstractSound { this.samples = var2; // L: 21 this.start = var3; // L: 22 this.end = var4; // L: 23 - this.field254 = var5; // L: 24 + this.field266 = var5; // L: 24 } // L: 25 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Las;)Lat;" + descriptor = "(Lbr;)Lak;" ) @Export("resample") public RawSound resample(Decimator var1) { diff --git a/runescape-client/src/main/java/ReflectionCheck.java b/runescape-client/src/main/java/ReflectionCheck.java index 1590f853a3..1da2cd5839 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -6,155 +6,220 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bo") +@ObfuscatedName("ap") @Implements("ReflectionCheck") public class ReflectionCheck extends Node { - @ObfuscatedName("pl") - @ObfuscatedSignature( - descriptor = "Lpj;" - ) - @Export("HitSplatDefinition_cachedSprites") - static class426 HitSplatDefinition_cachedSprites; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1002546903 + intValue = 741550747 ) @Export("id") int id; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1236852851 + intValue = 757684467 ) @Export("size") int size; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("operations") int[] operations; - @ObfuscatedName("f") - @Export("intReplaceValues") - int[] intReplaceValues; - @ObfuscatedName("b") + @ObfuscatedName("k") @Export("creationErrors") int[] creationErrors; - @ObfuscatedName("n") + @ObfuscatedName("a") @Export("fields") Field[] fields; + @ObfuscatedName("m") + @Export("arguments") + byte[][][] arguments; + @ObfuscatedName("p") + @Export("intReplaceValues") + int[] intReplaceValues; @ObfuscatedName("s") @Export("methods") Method[] methods; - @ObfuscatedName("l") - @Export("arguments") - byte[][][] arguments; ReflectionCheck() { } // L: 17 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "950633701" + descriptor = "(Loo;FFFB)F", + garbageValue = "3" ) - public static boolean method1079(int var0) { - return (var0 >> 29 & 1) != 0; // L: 33 + static float method601(class390 var0, float var1, float var2, float var3) { + float var4 = Ignored.method6616(var0.field4416, var0.field4417, var1); // L: 116 + if (Math.abs(var4) < class114.field1435) { // L: 117 + return var1; + } else { + float var5 = Ignored.method6616(var0.field4416, var0.field4417, var2); // L: 118 + if (Math.abs(var5) < class114.field1435) { // L: 119 + return var2; + } else { + float var6 = 0.0F; // L: 120 + float var7 = 0.0F; // L: 121 + float var8 = 0.0F; // L: 122 + float var13 = 0.0F; // L: 127 + boolean var14 = true; // L: 128 + boolean var15 = false; // L: 129 + + do { + var15 = false; // L: 131 + if (var14) { // L: 132 + var6 = var1; // L: 133 + var13 = var4; // L: 134 + var7 = var2 - var1; // L: 135 + var8 = var7; // L: 136 + var14 = false; // L: 137 + } + + if (Math.abs(var13) < Math.abs(var5)) { // L: 139 + var1 = var2; // L: 140 + var2 = var6; // L: 141 + var6 = var1; // L: 142 + var4 = var5; // L: 143 + var5 = var13; // L: 144 + var13 = var4; // L: 145 + } + + float var16 = class114.field1436 * Math.abs(var2) + var3 * 0.5F; // L: 147 + float var17 = 0.5F * (var6 - var2); // L: 148 + boolean var18 = Math.abs(var17) > var16 && var5 != 0.0F; // L: 149 + if (var18) { // L: 150 + if (Math.abs(var8) >= var16 && Math.abs(var4) > Math.abs(var5)) { // L: 151 + float var12 = var5 / var4; // L: 156 + float var9; + float var10; + if (var1 == var6) { // L: 157 + var9 = var12 * 2.0F * var17; // L: 158 + var10 = 1.0F - var12; // L: 159 + } else { + var10 = var4 / var13; // L: 162 + float var11 = var5 / var13; // L: 163 + var9 = var12 * ((var10 - var11) * var10 * var17 * 2.0F - (var11 - 1.0F) * (var2 - var1)); // L: 164 + var10 = (var11 - 1.0F) * (var10 - 1.0F) * (var12 - 1.0F); // L: 165 + } + + if ((double)var9 > 0.0D) { // L: 167 + var10 = -var10; + } else { + var9 = -var9; // L: 168 + } + + var12 = var8; // L: 169 + var8 = var7; // L: 170 + if (2.0F * var9 < var17 * 3.0F * var10 - Math.abs(var16 * var10) && var9 < Math.abs(var10 * var12 * 0.5F)) { // L: 171 + var7 = var9 / var10; // L: 172 + } else { + var7 = var17; // L: 175 + var8 = var17; // L: 176 + } + } else { + var7 = var17; // L: 152 + var8 = var17; // L: 153 + } + + var1 = var2; // L: 179 + var4 = var5; // L: 180 + if (Math.abs(var7) > var16) { // L: 181 + var2 += var7; + } else if ((double)var17 > 0.0D) { // L: 182 + var2 += var16; + } else { + var2 -= var16; // L: 183 + } + + var5 = Ignored.method6616(var0.field4416, var0.field4417, var2); // L: 184 + if ((double)(var5 * (var13 / Math.abs(var13))) > 0.0D) { // L: 185 + var14 = true; // L: 186 + var15 = true; // L: 187 + } else { + var15 = true; // L: 190 + } + } + } while(var15); + + return var2; // L: 194 + } + } } - @ObfuscatedName("fr") + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(ILbb;ZI)I", + garbageValue = "-926243112" + ) + static int method598(int var0, Script var1, boolean var2) { + if (var0 == 6900) { // L: 4535 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 4536 + return 1; // L: 4537 + } else if (var0 == 6950) { // L: 4539 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4540 + return 1; // L: 4541 + } else { + return 2; // L: 4543 + } + } + + @ObfuscatedName("hm") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1315350901" + garbageValue = "92197601" ) - static void method1080() { - Client.packetWriter.clearBuffer(); // L: 2726 - Client.packetWriter.packetBuffer.offset = 0; // L: 2727 - Client.packetWriter.serverPacket = null; // L: 2728 - Client.packetWriter.field1324 = null; // L: 2729 - Client.packetWriter.field1325 = null; // L: 2730 - Client.packetWriter.field1313 = null; // L: 2731 - Client.packetWriter.serverPacketLength = 0; // L: 2732 - Client.packetWriter.field1322 = 0; // L: 2733 - Client.rebootTimer = 0; // L: 2734 - Client.menuOptionsCount = 0; // L: 2736 - Client.isMenuOpen = false; // L: 2737 - Client.minimapState = 0; // L: 2739 - Client.destinationX = 0; // L: 2740 - - int var0; - for (var0 = 0; var0 < 2048; ++var0) { // L: 2741 - Client.players[var0] = null; - } - - GrandExchangeEvents.localPlayer = null; // L: 2742 - - for (var0 = 0; var0 < Client.npcs.length; ++var0) { // L: 2743 - NPC var1 = Client.npcs[var0]; // L: 2744 - if (var1 != null) { // L: 2745 - var1.targetIndex = -1; // L: 2746 - var1.false0 = false; // L: 2747 + static final void method600() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7841 7842 7848 + if (var0.hitpoints == -1) { // L: 7843 + var0.delay = 0; // L: 7844 + UrlRequester.method2536(var0); // L: 7845 + } else { + var0.remove(); // L: 7847 } } - UserComparator10.method2622(); // L: 2750 - Decimator.updateGameState(30); // L: 2751 + } // L: 7850 - for (var0 = 0; var0 < 100; ++var0) { // L: 2752 - Client.field715[var0] = true; - } - - PacketBufferNode var2 = WorldMapSprite.getPacketBufferNode(ClientPacket.field3000, Client.packetWriter.isaacCipher); // L: 2755 - var2.packetBuffer.writeByte(Client.getWindowedMode()); // L: 2756 - var2.packetBuffer.writeShort(InvDefinition.canvasWidth); // L: 2757 - var2.packetBuffer.writeShort(class321.canvasHeight); // L: 2758 - Client.packetWriter.addNode(var2); // L: 2759 - } // L: 2761 - - @ObfuscatedName("ka") + @ObfuscatedName("kr") @ObfuscatedSignature( - descriptor = "(IIIILqi;Lki;I)V", - garbageValue = "1940791589" + descriptor = "(Lki;I)Z", + garbageValue = "1785924836" ) - @Export("worldToMinimap") - static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { - int var6 = var3 * var3 + var2 * var2; // L: 12312 - if (var6 > 4225 && var6 < 90000) { // L: 12313 - int var7 = Client.camAngleY & 2047; // L: 12314 - int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 12315 - int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 12316 - int var10 = var9 * var2 + var3 * var8 >> 16; // L: 12317 - int var11 = var3 * var9 - var8 * var2 >> 16; // L: 12318 - double var12 = Math.atan2((double)var10, (double)var11); // L: 12319 - int var14 = var5.width / 2 - 25; // L: 12320 - int var15 = (int)(Math.sin(var12) * (double)var14); // L: 12321 - int var16 = (int)(Math.cos(var12) * (double)var14); // L: 12322 - byte var17 = 20; // L: 12323 - Canvas.redHintArrowSprite.method8105(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 12324 + static final boolean method599(Widget var0) { + int var1 = var0.contentType; // L: 12260 + if (var1 == 205) { // L: 12261 + Client.logoutTimer = 250; // L: 12262 + return true; // L: 12263 } else { - drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 12326 - } + int var2; + int var3; + if (var1 >= 300 && var1 <= 313) { // L: 12265 + var2 = (var1 - 300) / 2; // L: 12266 + var3 = var1 & 1; // L: 12267 + Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 12268 + } - } // L: 12327 + if (var1 >= 314 && var1 <= 323) { // L: 12270 + var2 = (var1 - 314) / 2; // L: 12271 + var3 = var1 & 1; // L: 12272 + Client.playerAppearance.method5394(var2, var3 == 1); // L: 12273 + } - @ObfuscatedName("kz") - @ObfuscatedSignature( - descriptor = "(IIIILqi;Lki;I)V", - garbageValue = "812723929" - ) - @Export("drawSpriteOnMinimap") - static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { - if (var4 != null) { // L: 12330 - int var6 = Client.camAngleY & 2047; // L: 12331 - int var7 = var3 * var3 + var2 * var2; // L: 12332 - if (var7 <= 6400) { // L: 12333 - int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 12334 - int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 12335 - int var10 = var3 * var8 + var9 * var2 >> 16; // L: 12336 - int var11 = var3 * var9 - var8 * var2 >> 16; // L: 12337 - if (var7 > 2500) { - var4.method8103(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: 12338 - } else { - var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 12339 - } + if (var1 == 324) { // L: 12275 + Client.playerAppearance.changeSex(false); + } + if (var1 == 325) { // L: 12276 + Client.playerAppearance.changeSex(true); + } + + if (var1 == 326) { // L: 12277 + PacketBufferNode var4 = WallDecoration.getPacketBufferNode(ClientPacket.field3012, Client.packetWriter.isaacCipher); // L: 12279 + Client.playerAppearance.write(var4.packetBuffer); // L: 12280 + Client.packetWriter.addNode(var4); // L: 12281 + return true; // L: 12282 + } else { + return false; // L: 12284 } } - } // L: 12340 + } } diff --git a/runescape-client/src/main/java/RefreshAccessTokenRequester.java b/runescape-client/src/main/java/RefreshAccessTokenRequester.java new file mode 100644 index 0000000000..77cc0d7739 --- /dev/null +++ b/runescape-client/src/main/java/RefreshAccessTokenRequester.java @@ -0,0 +1,11 @@ +package com.jagex.oldscape.pub; + +import java.net.URL; +import java.util.Map; +import java.util.concurrent.Future; +import net.runelite.mapping.Implements; + +@Implements("RefreshAccessTokenRequester") +public interface RefreshAccessTokenRequester { + Future request(String var1, URL var2, Map var3, String var4); +} diff --git a/runescape-client/src/main/java/Renderable.java b/runescape-client/src/main/java/Renderable.java index 687db685bf..a7ad70053d 100644 --- a/runescape-client/src/main/java/Renderable.java +++ b/runescape-client/src/main/java/Renderable.java @@ -1,17 +1,15 @@ -import java.awt.Component; -import java.util.Arrays; import 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("ix") +@ObfuscatedName("gx") @Implements("Renderable") public abstract class Renderable extends DualNode { - @ObfuscatedName("ck") + @ObfuscatedName("dy") @ObfuscatedGetter( - intValue = -268241925 + intValue = 1243608959 ) @Export("height") public int height; @@ -20,17 +18,17 @@ public abstract class Renderable extends DualNode { this.height = 1000; // L: 6 } // L: 8 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)Liq;", - garbageValue = "103" + descriptor = "(I)Lhv;", + garbageValue = "-238822980" ) @Export("getModel") protected Model getModel() { return null; // L: 19 } - @ObfuscatedName("co") + @ObfuscatedName("cd") @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 @@ -41,215 +39,29 @@ public abstract class Renderable extends DualNode { } // L: 16 - @ObfuscatedName("v") + @ObfuscatedName("ie") @ObfuscatedSignature( - descriptor = "(Lln;Lln;Lln;Lln;I)V", - garbageValue = "2037776497" + descriptor = "(IB)V", + garbageValue = "110" ) - public static void method4917(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { - Widget.Widget_archive = var0; // L: 220 - class162.Widget_modelsArchive = var1; // L: 221 - SoundCache.Widget_spritesArchive = var2; // L: 222 - class17.Widget_fontsArchive = var3; // L: 223 - Widget.Widget_interfaceComponents = new Widget[Widget.Widget_archive.getGroupCount()][]; // L: 224 - WorldMapSectionType.Widget_loadedInterfaces = new boolean[Widget.Widget_archive.getGroupCount()]; // L: 225 - } // L: 226 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;B)V", - garbageValue = "39" - ) - static void method4928(Component var0) { - var0.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 155 - var0.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 156 - KeyHandler.field128 = -1; // L: 157 - } // L: 158 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1452098348" - ) - public static void method4926(int var0, int var1) { - VarbitComposition var2 = UserComparator6.method2643(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; + static final void method4211(int var0) { + if (var0 >= 0) { // L: 8911 + int var1 = Client.menuArguments1[var0]; // L: 8912 + int var2 = Client.menuArguments2[var0]; // L: 8913 + int var3 = Client.menuOpcodes[var0]; // L: 8914 + int var4 = Client.menuIdentifiers[var0]; // L: 8915 + String var5 = Client.menuActions[var0]; // L: 8916 + String var6 = Client.menuTargets[var0]; // L: 8917 + ModeWhere.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 8918 } + } // L: 8919 - var6 <<= var4; // L: 39 - Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; // L: 40 - } // L: 41 - - @ObfuscatedName("fy") + @ObfuscatedName("ko") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1929107749" + garbageValue = "2137628055" ) - static void method4925() { - Client.mouseLastLastPressedTimeMillis = -1L; // L: 2613 - class120.mouseRecorder.index = 0; // L: 2614 - Varcs.hasFocus = true; // L: 2615 - Client.hadFocus = true; // L: 2616 - Client.field585 = -1L; // L: 2617 - UrlRequest.method2564(); // L: 2618 - Client.packetWriter.clearBuffer(); // L: 2619 - Client.packetWriter.packetBuffer.offset = 0; // L: 2620 - Client.packetWriter.serverPacket = null; // L: 2621 - Client.packetWriter.field1324 = null; // L: 2622 - Client.packetWriter.field1325 = null; // L: 2623 - Client.packetWriter.field1313 = null; // L: 2624 - Client.packetWriter.serverPacketLength = 0; // L: 2625 - Client.packetWriter.field1322 = 0; // L: 2626 - Client.rebootTimer = 0; // L: 2627 - Client.logoutTimer = 0; // L: 2628 - Client.hintArrowType = 0; // L: 2629 - Client.menuOptionsCount = 0; // L: 2631 - Client.isMenuOpen = false; // L: 2632 - ClientPacket.method5176(0); // L: 2634 - Actor.method2177(); // L: 2635 - Client.isItemSelected = 0; // L: 2636 - Client.isSpellSelected = false; // L: 2637 - Client.soundEffectCount = 0; // L: 2638 - Client.camAngleY = 0; // L: 2639 - Client.oculusOrbState = 0; // L: 2640 - VarcInt.field1841 = null; // L: 2641 - Client.minimapState = 0; // L: 2642 - Client.field714 = -1; // L: 2643 - Client.destinationX = 0; // L: 2644 - Client.destinationY = 0; // L: 2645 - Client.playerAttackOption = AttackOption.AttackOption_hidden; // L: 2646 - Client.npcAttackOption = AttackOption.AttackOption_hidden; // L: 2647 - Client.npcCount = 0; // L: 2648 - Players.Players_count = 0; // L: 2650 - - int var0; - for (var0 = 0; var0 < 2048; ++var0) { // L: 2651 - Players.field1276[var0] = null; // L: 2652 - Players.field1286[var0] = class193.field2185; // L: 2653 - } - - for (var0 = 0; var0 < 2048; ++var0) { // L: 2656 - Client.players[var0] = null; - } - - for (var0 = 0; var0 < 32768; ++var0) { // L: 2657 - Client.npcs[var0] = null; - } - - Client.combatTargetPlayerIndex = -1; // L: 2658 - Client.projectiles.clear(); // L: 2659 - Client.graphicsObjects.clear(); // L: 2660 - - int var2; - for (var0 = 0; var0 < 4; ++var0) { // L: 2661 - for (int var1 = 0; var1 < 104; ++var1) { // L: 2662 - for (var2 = 0; var2 < 104; ++var2) { // L: 2663 - Client.groundItems[var0][var1][var2] = null; // L: 2664 - } - } - } - - Client.pendingSpawns = new NodeDeque(); // L: 2668 - Decimator.friendSystem.clear(); // L: 2669 - - for (var0 = 0; var0 < VarpDefinition.VarpDefinition_fileCount; ++var0) { // L: 2670 - VarpDefinition var4 = class134.VarpDefinition_get(var0); // L: 2671 - if (var4 != null) { // L: 2672 - Varps.Varps_temp[var0] = 0; // L: 2673 - Varps.Varps_main[var0] = 0; // L: 2674 - } - } - - class160.varcs.clearTransient(); // L: 2677 - Client.followerIndex = -1; // L: 2678 - if (Client.rootInterface != -1) { // L: 2679 - var0 = Client.rootInterface; // L: 2680 - if (var0 != -1 && WorldMapSectionType.Widget_loadedInterfaces[var0]) { // L: 2682 2683 - Widget.Widget_archive.clearFilesGroup(var0); // L: 2684 - if (Widget.Widget_interfaceComponents[var0] != null) { // L: 2685 - boolean var5 = true; // L: 2686 - - for (var2 = 0; var2 < Widget.Widget_interfaceComponents[var0].length; ++var2) { // L: 2687 - if (Widget.Widget_interfaceComponents[var0][var2] != null) { // L: 2688 - if (Widget.Widget_interfaceComponents[var0][var2].type != 2) { // L: 2689 - Widget.Widget_interfaceComponents[var0][var2] = null; - } else { - var5 = false; // L: 2690 - } - } - } - - if (var5) { // L: 2693 - Widget.Widget_interfaceComponents[var0] = null; - } - - WorldMapSectionType.Widget_loadedInterfaces[var0] = false; // L: 2694 - } - } - } - - for (InterfaceParent var3 = (InterfaceParent)Client.interfaceParents.first(); var3 != null; var3 = (InterfaceParent)Client.interfaceParents.next()) { // L: 2697 - Script.closeInterface(var3, true); // L: 2698 - } - - Client.rootInterface = -1; // L: 2700 - Client.interfaceParents = new NodeHashTable(8); // L: 2701 - Client.meslayerContinueWidget = null; // L: 2702 - Client.menuOptionsCount = 0; // L: 2704 - Client.isMenuOpen = false; // L: 2705 - Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2707 - - for (var0 = 0; var0 < 8; ++var0) { // L: 2708 - Client.playerMenuActions[var0] = null; // L: 2709 - Client.playerOptionsPriorities[var0] = false; // L: 2710 - } - - UserComparator10.method2622(); // L: 2712 - Client.isLoading = true; // L: 2713 - - for (var0 = 0; var0 < 100; ++var0) { // L: 2714 - Client.field715[var0] = true; - } - - class4.method17(); // L: 2715 - ClientPacket.friendsChat = null; // L: 2716 - class154.guestClanSettings = null; // L: 2717 - Arrays.fill(Client.currentClanSettings, (Object)null); // L: 2718 - class21.guestClanChannel = null; // L: 2719 - Arrays.fill(Client.currentClanChannels, (Object)null); // L: 2720 - - for (var0 = 0; var0 < 8; ++var0) { // L: 2721 - Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); - } - - class83.grandExchangeEvents = null; // L: 2722 - } // L: 2723 - - @ObfuscatedName("ir") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-2093926598" - ) - @Export("selectSpell") - static void selectSpell(int var0, int var1, int var2, int var3) { - Widget var4 = ItemComposition.getWidgetChild(var0, var1); // L: 9650 - if (var4 != null && var4.onTargetEnter != null) { // L: 9651 - ScriptEvent var5 = new ScriptEvent(); // L: 9652 - var5.widget = var4; // L: 9653 - var5.args = var4.onTargetEnter; // L: 9654 - ClanSettings.runScriptEvent(var5); // L: 9655 - } - - Client.selectedSpellItemId = var3; // L: 9657 - Client.isSpellSelected = true; // L: 9658 - Timer.selectedSpellWidget = var0; // L: 9659 - Client.selectedSpellChildIndex = var1; // L: 9660 - class17.selectedSpellFlags = var2; // L: 9661 - class346.invalidateWidget(var4); // L: 9662 - } // L: 9663 + static final void method4210() { + Client.field689 = Client.cycleCntr; // L: 12425 + } // L: 12426 } diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index a328fc7c3d..01f4f8df1a 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -4,36 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gt") +@ObfuscatedName("gw") @Implements("RouteStrategy") public abstract class RouteStrategy { - @ObfuscatedName("he") - @ObfuscatedSignature( - descriptor = "Lmd;" - ) - @Export("fontBold12") - static Font fontBold12; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -280287093 + intValue = -28865855 + ) + static int field2242; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -716123983 ) @Export("approxDestinationX") public int approxDestinationX; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -436525857 + intValue = -1217895239 ) @Export("approxDestinationY") public int approxDestinationY; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1188944539 + intValue = 1357888893 ) @Export("approxDestinationSizeX") public int approxDestinationSizeX; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 865807579 + intValue = -546663349 ) @Export("approxDestinationSizeY") public int approxDestinationSizeY; @@ -41,11 +40,102 @@ public abstract class RouteStrategy { protected RouteStrategy() { } // L: 9 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIILgv;I)Z", - garbageValue = "773884525" + descriptor = "(IIILgh;I)Z", + garbageValue = "-425355466" ) @Export("hasArrived") public abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(CI)C", + garbageValue = "-1536877918" + ) + static char method3795(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 (char)(var0 == 339 ? 'e' : '\u0000'); // L: 99 100 + } + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "([BB)V", + garbageValue = "0" + ) + @Export("SpriteBuffer_decode") + static void SpriteBuffer_decode(byte[] var0) { + Buffer var1 = new Buffer(var0); // L: 179 + var1.offset = var0.length - 2; // L: 180 + class453.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 181 + class453.SpriteBuffer_xOffsets = new int[class453.SpriteBuffer_spriteCount]; // L: 182 + class453.SpriteBuffer_yOffsets = new int[class453.SpriteBuffer_spriteCount]; // L: 183 + ScriptFrame.SpriteBuffer_spriteWidths = new int[class453.SpriteBuffer_spriteCount]; // L: 184 + class453.SpriteBuffer_spriteHeights = new int[class453.SpriteBuffer_spriteCount]; // L: 185 + class127.SpriteBuffer_pixels = new byte[class453.SpriteBuffer_spriteCount][]; // L: 186 + var1.offset = var0.length - 7 - class453.SpriteBuffer_spriteCount * 8; // L: 187 + class453.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 188 + class453.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 189 + int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 190 + + int var3; + for (var3 = 0; var3 < class453.SpriteBuffer_spriteCount; ++var3) { // L: 191 + class453.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class453.SpriteBuffer_spriteCount; ++var3) { // L: 192 + class453.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class453.SpriteBuffer_spriteCount; ++var3) { // L: 193 + ScriptFrame.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class453.SpriteBuffer_spriteCount; ++var3) { // L: 194 + class453.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); + } + + var1.offset = var0.length - 7 - class453.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 195 + Decimator.SpriteBuffer_spritePalette = new int[var2]; // L: 196 + + for (var3 = 1; var3 < var2; ++var3) { // L: 197 + Decimator.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 198 + if (Decimator.SpriteBuffer_spritePalette[var3] == 0) { // L: 199 + Decimator.SpriteBuffer_spritePalette[var3] = 1; + } + } + + var1.offset = 0; // L: 201 + + for (var3 = 0; var3 < class453.SpriteBuffer_spriteCount; ++var3) { // L: 202 + int var4 = ScriptFrame.SpriteBuffer_spriteWidths[var3]; // L: 203 + int var5 = class453.SpriteBuffer_spriteHeights[var3]; // L: 204 + int var6 = var4 * var5; // L: 205 + byte[] var7 = new byte[var6]; // L: 206 + class127.SpriteBuffer_pixels[var3] = var7; // L: 207 + int var8 = var1.readUnsignedByte(); // L: 208 + int var9; + if (var8 == 0) { // L: 209 + for (var9 = 0; var9 < var6; ++var9) { // L: 210 + var7[var9] = var1.readByte(); + } + } else if (var8 == 1) { // L: 212 + for (var9 = 0; var9 < var4; ++var9) { // L: 213 + for (int var10 = 0; var10 < var5; ++var10) { // L: 214 + var7[var9 + var10 * var4] = var1.readByte(); // L: 215 + } + } + } + } + + } // L: 220 } diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index f76e017f3c..98b6248547 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -1,28 +1,23 @@ import java.applet.Applet; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("qo") +@ObfuscatedName("qy") @Implements("RunException") public class RunException extends RuntimeException { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("RunException_applet") public static Applet RunException_applet; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("localPlayerName") public static String localPlayerName; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 176570919 - ) - @Export("RunException_revision") - public static int RunException_revision; - @ObfuscatedName("b") + @ObfuscatedName("p") + static byte[][][] field4812; + @ObfuscatedName("a") @Export("message") String message; - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("throwable") Throwable throwable; diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index a8971ad168..ce70ad2d4a 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -3,188 +3,188 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hv") +@ObfuscatedName("gm") @Implements("Scene") public class Scene { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("Scene_isLowDetail") public static boolean Scene_isLowDetail; - @ObfuscatedName("d") + @ObfuscatedName("t") @Export("tileUpdateCount") static int tileUpdateCount; - @ObfuscatedName("m") + @ObfuscatedName("g") @Export("Scene_plane") static int Scene_plane; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("Scene_drawnCount") static int Scene_drawnCount; - @ObfuscatedName("t") + @ObfuscatedName("n") @Export("Scene_cameraXTileMin") static int Scene_cameraXTileMin; - @ObfuscatedName("g") + @ObfuscatedName("e") @Export("Scene_cameraXTileMax") static int Scene_cameraXTileMax; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("Scene_cameraYTileMin") static int Scene_cameraYTileMin; - @ObfuscatedName("a") + @ObfuscatedName("f") @Export("Scene_cameraYTileMax") static int Scene_cameraYTileMax; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("Scene_cameraXTile") static int Scene_cameraXTile; @ObfuscatedName("j") @Export("Scene_cameraYTile") static int Scene_cameraYTile; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("Scene_cameraX") static int Scene_cameraX; - @ObfuscatedName("z") + @ObfuscatedName("i") @Export("Scene_cameraY") static int Scene_cameraY; - @ObfuscatedName("h") + @ObfuscatedName("u") @Export("Scene_cameraZ") static int Scene_cameraZ; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; - @ObfuscatedName("aq") + @ObfuscatedName("ar") @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; - @ObfuscatedName("aw") + @ObfuscatedName("am") @Export("Scene_cameraYawSine") static int Scene_cameraYawSine; - @ObfuscatedName("am") + @ObfuscatedName("ac") @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; - @ObfuscatedName("ak") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "[Liy;" + descriptor = "[Lhx;" ) @Export("gameObjects") static GameObject[] gameObjects; - @ObfuscatedName("ao") + @ObfuscatedName("aj") @Export("checkClick") static boolean checkClick; - @ObfuscatedName("aj") + @ObfuscatedName("ae") @Export("Scene_selectedPlane") static int Scene_selectedPlane; - @ObfuscatedName("al") + @ObfuscatedName("az") @Export("Scene_selectedScreenX") static int Scene_selectedScreenX; - @ObfuscatedName("av") + @ObfuscatedName("ap") @Export("Scene_selectedScreenY") static int Scene_selectedScreenY; - @ObfuscatedName("at") + @ObfuscatedName("as") @Export("Scene_selectedX") public static int Scene_selectedX; - @ObfuscatedName("an") + @ObfuscatedName("au") @Export("Scene_selectedY") public static int Scene_selectedY; - @ObfuscatedName("ay") + @ObfuscatedName("ak") @Export("viewportWalking") static boolean viewportWalking; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @Export("Scene_planesCount") static int Scene_planesCount; - @ObfuscatedName("ab") + @ObfuscatedName("ad") @Export("Scene_planeOccluderCounts") static int[] Scene_planeOccluderCounts; - @ObfuscatedName("au") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "[[Lip;" + descriptor = "[[Lhy;" ) @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; - @ObfuscatedName("af") + @ObfuscatedName("aw") @Export("Scene_currentOccludersCount") static int Scene_currentOccludersCount; - @ObfuscatedName("ad") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "[Lip;" + descriptor = "[Lhy;" ) @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llv;" ) @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; - @ObfuscatedName("ax") - static final int[] field2617; - @ObfuscatedName("ar") - static final int[] field2638; - @ObfuscatedName("ap") - static final int[] field2650; - @ObfuscatedName("az") - static final int[] field2616; - @ObfuscatedName("as") - static final int[] field2641; + @ObfuscatedName("av") + static final int[] field2464; + @ObfuscatedName("ai") + static final int[] field2475; + @ObfuscatedName("ay") + static final int[] field2466; @ObfuscatedName("aa") - static final int[] field2628; - @ObfuscatedName("bj") - static final int[] field2643; - @ObfuscatedName("bf") + static final int[] field2467; + @ObfuscatedName("ax") + static final int[] field2468; + @ObfuscatedName("at") + static final int[] field2478; + @ObfuscatedName("br") + static final int[] field2470; + @ObfuscatedName("bs") @Export("visibilityMap") static boolean[][][][] visibilityMap; - @ObfuscatedName("bb") + @ObfuscatedName("bx") @Export("visibleTiles") static boolean[][] visibleTiles; - @ObfuscatedName("bw") + @ObfuscatedName("bd") @Export("Scene_viewportXCenter") static int Scene_viewportXCenter; - @ObfuscatedName("bx") + @ObfuscatedName("bj") @Export("Scene_viewportYCenter") static int Scene_viewportYCenter; - @ObfuscatedName("bg") + @ObfuscatedName("be") @Export("Scene_viewportXMin") static int Scene_viewportXMin; - @ObfuscatedName("bn") + @ObfuscatedName("bf") @Export("Scene_viewportYMin") static int Scene_viewportYMin; - @ObfuscatedName("bq") + @ObfuscatedName("bz") @Export("Scene_viewportXMax") static int Scene_viewportXMax; - @ObfuscatedName("ba") + @ObfuscatedName("bv") @Export("Scene_viewportYMax") static int Scene_viewportYMax; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("planes") int planes; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("xSize") int xSize; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("ySize") int ySize; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("tileHeights") int[][][] tileHeights; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "[[[Lhu;" + descriptor = "[[[Lgn;" ) @Export("tiles") Tile[][][] tiles; - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("minPlane") int minPlane; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("tempGameObjectsCount") int tempGameObjectsCount; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "[Liy;" + descriptor = "[Lhx;" ) @Export("tempGameObjects") GameObject[] tempGameObjects; - @ObfuscatedName("o") - int[][][] field2600; - @ObfuscatedName("be") + @ObfuscatedName("v") + int[][][] field2454; + @ObfuscatedName("bo") @Export("tileShape2D") int[][] tileShape2D; - @ObfuscatedName("bh") + @ObfuscatedName("bl") @Export("tileRotation2D") int[][] tileRotation2D; @@ -206,13 +206,13 @@ public class Scene { Scene_currentOccludersCount = 0; // L: 51 Scene_currentOccluders = new Occluder[500]; // L: 52 Scene_tilesDeque = new NodeDeque(); // L: 53 - field2617 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54 - field2638 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55 - field2650 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56 - field2616 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57 - field2641 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58 - field2628 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59 - field2643 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60 + field2464 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54 + field2475 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55 + field2466 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56 + field2467 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57 + field2468 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58 + field2478 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59 + field2470 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60 visibilityMap = new boolean[8][32][51][51]; // L: 86 } @@ -226,12 +226,12 @@ public class Scene { this.xSize = var2; // L: 97 this.ySize = var3; // L: 98 this.tiles = new Tile[var1][var2][var3]; // L: 99 - this.field2600 = new int[var1][var2 + 1][var3 + 1]; // L: 100 + this.field2454 = new int[var1][var2 + 1][var3 + 1]; // L: 100 this.tileHeights = var4; // L: 101 this.clear(); // L: 102 } // L: 103 - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("clear") public void clear() { int var1; @@ -264,7 +264,7 @@ public class Scene { } // L: 120 - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("init") public void init(int var1) { this.minPlane = var1; // L: 123 @@ -279,7 +279,7 @@ public class Scene { } // L: 129 - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { Tile var3 = this.tiles[0][var1][var2]; // L: 132 @@ -291,59 +291,47 @@ public class Scene { for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { // L: 137 GameObject var7 = var5.gameObjects[var6]; // L: 138 - long var9 = var7.tag; // L: 140 - boolean var8 = FloorDecoration.method4592(var9) == 2; // L: 142 - if (var8 && var7.startX == var1 && var2 == var7.startY) { // L: 144 + if (VarcInt.method3323(var7.tag) && var7.startX == var1 && var2 == var7.startY) { // L: 139 --var7.plane; } } } } - if (this.tiles[0][var1][var2] == null) { // L: 148 + if (this.tiles[0][var1][var2] == null) { // L: 143 this.tiles[0][var1][var2] = new Tile(0, var1, var2); } - this.tiles[0][var1][var2].linkedBelowTile = var3; // L: 149 - this.tiles[3][var1][var2] = null; // L: 150 - } // L: 151 + this.tiles[0][var1][var2].linkedBelowTile = var3; // L: 144 + this.tiles[3][var1][var2] = null; // L: 145 + } // L: 146 - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { - Tile var5 = this.tiles[var1][var2][var3]; // L: 170 - if (var5 != null) { // L: 171 - this.tiles[var1][var2][var3].minPlane = var4; // L: 172 + Tile var5 = this.tiles[var1][var2][var3]; // L: 165 + if (var5 != null) { // L: 166 + this.tiles[var1][var2][var3].minPlane = var4; // L: 167 } - } // L: 173 + } // L: 168 - @ObfuscatedName("n") + @ObfuscatedName("m") @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) { SceneTilePaint var21; int var22; - if (var4 == 0) { // L: 176 - var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); // L: 177 + if (var4 == 0) { // L: 171 + var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); // L: 172 - for (var22 = var1; var22 >= 0; --var22) { // L: 178 + for (var22 = var1; var22 >= 0; --var22) { // L: 173 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: 179 - } else if (var4 != 1) { // L: 182 - SceneTileModel var23 = new SceneTileModel(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 SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 183 + this.tiles[var1][var2][var3].paint = var21; // L: 174 + } else if (var4 != 1) { // L: 177 + SceneTileModel var23 = new SceneTileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); // L: 183 for (var22 = var1; var22 >= 0; --var22) { // L: 184 if (this.tiles[var22][var2][var3] == null) { @@ -351,617 +339,621 @@ public class Scene { } } - this.tiles[var1][var2][var3].paint = var21; // L: 185 - } - } // L: 180 186 191 + this.tiles[var1][var2][var3].model = var23; // L: 185 + } else { + var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 178 - @ObfuscatedName("s") + 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 + } + } // L: 175 181 186 + + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IIIILix;JI)V" + descriptor = "(IIIILgx;JI)V" ) @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Renderable var5, long var6, int var8) { - if (var5 != null) { // L: 194 - FloorDecoration var9 = new FloorDecoration(); // L: 195 - var9.renderable = var5; // L: 196 - var9.x = var2 * 128 + 64; // L: 197 - var9.y = var3 * 128 + 64; // L: 198 - var9.z = var4; // L: 199 - var9.tag = var6; // L: 200 - var9.flags = var8; // L: 201 - if (this.tiles[var1][var2][var3] == null) { // L: 202 + if (var5 != null) { // L: 189 + FloorDecoration var9 = new FloorDecoration(); // L: 190 + var9.renderable = var5; // L: 191 + var9.x = var2 * 128 + 64; // L: 192 + var9.y = var3 * 128 + 64; // L: 193 + var9.z = var4; // L: 194 + var9.tag = var6; // L: 195 + var9.flags = var8; // L: 196 + if (this.tiles[var1][var2][var3] == null) { // L: 197 this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); } - this.tiles[var1][var2][var3].floorDecoration = var9; // L: 203 + this.tiles[var1][var2][var3].floorDecoration = var9; // L: 198 } - } // L: 204 + } // L: 199 - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIIILix;JLix;Lix;)V" + descriptor = "(IIIILgx;JLgx;Lgx;)V" ) @Export("newGroundItemPile") public void newGroundItemPile(int var1, int var2, int var3, int var4, Renderable var5, long var6, Renderable var8, Renderable var9) { - ItemLayer var10 = new ItemLayer(); // L: 207 - var10.first = var5; // L: 208 - var10.x = var2 * 128 + 64; // L: 209 - var10.y = var3 * 128 + 64; // L: 210 - var10.z = 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].renderable instanceof Model) { // L: 219 - Model var14 = (Model)var12.gameObjects[var13].renderable; // L: 220 - var14.calculateBoundsCylinder(); // L: 221 - if (var14.height > var11) { // L: 222 + ItemLayer var10 = new ItemLayer(); // L: 202 + var10.first = var5; // L: 203 + var10.x = var2 * 128 + 64; // L: 204 + var10.y = var3 * 128 + 64; // L: 205 + var10.z = 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].renderable instanceof Model) { // L: 214 + Model var14 = (Model)var12.gameObjects[var13].renderable; // L: 215 + var14.calculateBoundsCylinder(); // L: 216 + if (var14.height > var11) { // L: 217 var11 = var14.height; } } } } - var10.height = var11; // L: 226 + var10.height = var11; // L: 221 if (this.tiles[var1][var2][var3] == null) { - this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); // L: 227 + this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); // L: 222 } - this.tiles[var1][var2][var3].itemLayer = var10; // L: 228 - } // L: 229 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(IIIILix;Lix;IIJI)V" - ) - @Export("newBoundaryObject") - public void newBoundaryObject(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, long var9, int var11) { - 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.z = var4; // L: 238 - var12.renderable1 = var5; // L: 239 - var12.renderable2 = 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: 243 - } - } - - this.tiles[var1][var2][var3].boundaryObject = var12; // L: 244 - } - } // L: 245 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IIIILix;Lix;IIIIJI)V" - ) - @Export("newWallDecoration") - public void newWallDecoration(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, long var11, int var13) { - 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.z = var4; // L: 254 - var14.renderable1 = var5; // L: 255 - var14.renderable2 = 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: 261 - } - } - - this.tiles[var1][var2][var3].wallDecoration = var14; // L: 262 - } - } // L: 263 + this.tiles[var1][var2][var3].itemLayer = var10; // L: 223 + } // L: 224 @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IIIIIILix;IJI)Z" + descriptor = "(IIIILgx;Lgx;IIJI)V" ) - public boolean method4882(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { - if (var7 == null) { // L: 266 + @Export("newBoundaryObject") + public void newBoundaryObject(int var1, int var2, int var3, int var4, Renderable var5, Renderable 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.z = var4; // L: 233 + var12.renderable1 = var5; // L: 234 + var12.renderable2 = var6; // L: 235 + var12.orientationA = var7; // L: 236 + var12.orientationB = var8; // L: 237 + + 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[var1][var2][var3].boundaryObject = var12; // L: 239 + } + } // L: 240 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IIIILgx;Lgx;IIIIJI)V" + ) + @Export("newWallDecoration") + public void newWallDecoration(int var1, int var2, int var3, int var4, Renderable var5, Renderable 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.z = var4; // L: 249 + var14.renderable1 = var5; // L: 250 + var14.renderable2 = var6; // L: 251 + var14.orientation = var7; // L: 252 + var14.orientation2 = var8; // L: 253 + var14.xOffset = var9; // L: 254 + var14.yOffset = var10; // L: 255 + + 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[var1][var2][var3].wallDecoration = var14; // L: 257 + } + } // L: 258 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(IIIIIILgx;IJI)Z" + ) + public boolean method4176(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { + if (var7 == null) { // L: 261 return true; } else { - 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 + 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 } } - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIIILix;IJZ)Z" + descriptor = "(IIIIILgx;IJZ)Z" ) @Export("drawEntity") public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, boolean var10) { - if (var6 == null) { // L: 273 + if (var6 == null) { // L: 268 return true; } else { - 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 + 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 var14 += 128; } - if (var7 > 1152 && var7 < 1920) { // L: 280 + if (var7 > 1152 && var7 < 1920) { // L: 275 var13 += 128; } - if (var7 > 1664 || var7 < 384) { // L: 281 + if (var7 > 1664 || var7 < 384) { // L: 276 var12 -= 128; } - if (var7 > 128 && var7 < 896) { // L: 282 + if (var7 > 128 && var7 < 896) { // L: 277 var11 -= 128; } } - 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 + 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 } } @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IIIIILix;IJIIII)Z" + descriptor = "(IIIIILgx;IJIIII)Z" ) @Export("addNullableObject") public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Renderable 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: 292 293 + 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 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIIIIIIILix;IZJI)Z" + descriptor = "(IIIIIIIILgx;IZJI)Z" ) @Export("newGameObject") boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Renderable var9, int var10, boolean var11, long var12, int var14) { int var16; - 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 + 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 return false; } - Tile var23 = this.tiles[var1][var15][var16]; // L: 300 - if (var23 != null && var23.gameObjectsCount >= 5) { // L: 301 + Tile var23 = this.tiles[var1][var15][var16]; // L: 295 + if (var23 != null && var23.gameObjectsCount >= 5) { // L: 296 return false; } } } - 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.z = var8; // L: 310 - var21.renderable = 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 + 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.z = var8; // L: 305 + var21.renderable = 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 - 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 + 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 ++var18; } - if (var16 < var2 + var4 - 1) { // L: 321 + if (var16 < var2 + var4 - 1) { // L: 316 var18 += 4; } - if (var17 > var3) { // L: 322 + if (var17 > var3) { // L: 317 var18 += 8; } - if (var17 < var3 + var5 - 1) { // L: 323 + if (var17 < var3 + var5 - 1) { // L: 318 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: 324 + this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); // L: 319 } } - 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 + 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 } } - if (var11) { // L: 333 + if (var11) { // L: 328 this.tempGameObjects[this.tempGameObjectsCount++] = var21; } - return true; // L: 334 + return true; // L: 329 } - @ObfuscatedName("d") + @ObfuscatedName("t") @Export("clearTempGameObjects") public void clearTempGameObjects() { - 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 + 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 } - this.tempGameObjectsCount = 0; // L: 343 - } // L: 344 + this.tempGameObjectsCount = 0; // L: 338 + } // L: 339 - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Liy;)V" + descriptor = "(Lhx;)V" ) @Export("removeGameObject") void removeGameObject(GameObject var1) { - 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 + 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 int var5; - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 351 - if (var4.gameObjects[var5] == var1) { // L: 352 - --var4.gameObjectsCount; // L: 353 + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 346 + if (var4.gameObjects[var5] == var1) { // L: 347 + --var4.gameObjectsCount; // L: 348 - 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 + 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 } - var4.gameObjects[var4.gameObjectsCount] = null; // L: 358 + var4.gameObjects[var4.gameObjectsCount] = null; // L: 353 break; } } - var4.gameObjectsEdgeMask = 0; // L: 362 + var4.gameObjectsEdgeMask = 0; // L: 357 - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 363 - var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; // L: 365 + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 358 + var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; // L: 360 } } } } - } // L: 370 - - @ObfuscatedName("u") - public void method4748(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: 379 - - @ObfuscatedName("t") - @Export("removeBoundaryObject") - public void removeBoundaryObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 382 - if (var4 != null) { - var4.boundaryObject = null; // L: 384 - } - } // L: 383 385 - - @ObfuscatedName("g") - @Export("removeWallDecoration") - public void removeWallDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 388 - if (var4 != null) { - var4.wallDecoration = null; // L: 390 - } - } // L: 389 391 + } // L: 365 @ObfuscatedName("x") + public void method4180(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 + } + } + } // L: 374 + + @ObfuscatedName("n") + @Export("removeBoundaryObject") + public void removeBoundaryObject(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 377 + if (var4 != null) { + var4.boundaryObject = null; // L: 379 + } + } // L: 378 380 + + @ObfuscatedName("e") + @Export("removeWallDecoration") + public void removeWallDecoration(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 383 + if (var4 != null) { + var4.wallDecoration = null; // L: 385 + } + } // L: 384 386 + + @ObfuscatedName("h") @Export("removeGameObject") public void removeGameObject(int var1, int var2, int var3) { - 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 = FloorDecoration.method4592(var8) == 2; // L: 401 - if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 403 - this.removeGameObject(var6); // L: 404 - return; // L: 405 + 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 (VarcInt.method3323(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 393 + this.removeGameObject(var6); // L: 394 + return; // L: 395 } } } - } // L: 408 + } // L: 398 - @ObfuscatedName("a") + @ObfuscatedName("f") @Export("removeFloorDecoration") public void removeFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 411 + Tile var4 = this.tiles[var1][var2][var3]; // L: 401 if (var4 != null) { - var4.floorDecoration = null; // L: 413 + var4.floorDecoration = null; // L: 403 } - } // L: 412 414 + } // L: 402 404 - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 417 + Tile var4 = this.tiles[var1][var2][var3]; // L: 407 if (var4 != null) { - var4.itemLayer = null; // L: 419 + var4.itemLayer = null; // L: 409 } - } // L: 418 420 + } // L: 408 410 @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(III)Lij;" + descriptor = "(III)Lhc;" ) - public BoundaryObject method4754(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("e") - @ObfuscatedSignature( - descriptor = "(III)Lio;" - ) - public WallDecoration method4860(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 429 - return var4 == null ? null : var4.wallDecoration; // L: 430 431 + public BoundaryObject method4147(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 413 + return var4 == null ? null : var4.boundaryObject; // L: 414 415 } @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(III)Liy;" + descriptor = "(III)Lhf;" + ) + public WallDecoration method4049(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 419 + return var4 == null ? null : var4.wallDecoration; // L: 420 421 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(III)Lhx;" ) @Export("getGameObject") public GameObject getGameObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 435 - if (var4 == null) { // L: 436 + Tile var4 = this.tiles[var1][var2][var3]; // L: 425 + if (var4 == null) { // L: 426 return null; } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 437 - GameObject var6 = var4.gameObjects[var5]; // L: 438 - long var8 = var6.tag; // L: 440 - boolean var7 = FloorDecoration.method4592(var8) == 2; // L: 442 - if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 444 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 427 + GameObject var6 = var4.gameObjects[var5]; // L: 428 + if (VarcInt.method3323(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 429 return var6; } } - return null; // L: 446 + return null; // L: 431 } } - @ObfuscatedName("h") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(III)Lhp;" + descriptor = "(III)Lga;" ) @Export("getFloorDecoration") public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 450 - return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 451 452 + Tile var4 = this.tiles[var1][var2][var3]; // L: 435 + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 436 437 } - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("getBoundaryObjectTag") public long getBoundaryObjectTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 456 - return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 457 458 + Tile var4 = this.tiles[var1][var2][var3]; // L: 441 + return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 442 443 } - @ObfuscatedName("aq") + @ObfuscatedName("ar") @Export("getWallDecorationTag") public long getWallDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 462 - return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 463 464 + Tile var4 = this.tiles[var1][var2][var3]; // L: 447 + return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 448 449 } - @ObfuscatedName("aw") + @ObfuscatedName("am") @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 468 - if (var4 == null) { // L: 469 + Tile var4 = this.tiles[var1][var2][var3]; // L: 453 + if (var4 == null) { // L: 454 return 0L; } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 470 - GameObject var6 = var4.gameObjects[var5]; // L: 471 - long var8 = var6.tag; // L: 473 - boolean var7 = FloorDecoration.method4592(var8) == 2; // L: 475 - if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 477 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 455 + GameObject var6 = var4.gameObjects[var5]; // L: 456 + if (VarcInt.method3323(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 457 return var6.tag; } } - return 0L; // L: 479 + return 0L; // L: 459 } } - @ObfuscatedName("am") + @ObfuscatedName("ac") @Export("getFloorDecorationTag") public long getFloorDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 483 - return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 484 485 + Tile var4 = this.tiles[var1][var2][var3]; // L: 463 + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 464 465 } - @ObfuscatedName("ak") + @ObfuscatedName("ab") @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { - Tile var6 = this.tiles[var1][var2][var3]; // L: 489 - if (var6 == null) { // L: 490 + Tile var6 = this.tiles[var1][var2][var3]; // L: 469 + if (var6 == null) { // L: 470 return -1; - } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { // L: 491 + } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { // L: 471 return var6.boundaryObject.flags & 255; - } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { // L: 492 + } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { // L: 472 return var6.wallDecoration.flags & 255; - } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { // L: 493 + } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { // L: 473 return var6.floorDecoration.flags & 255; } else { - for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { // L: 494 - if (var6.gameObjects[var7].tag == var4) { // L: 495 + for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { // L: 474 + if (var6.gameObjects[var7].tag == var4) { // L: 475 return var6.gameObjects[var7].flags & 255; } } - return -1; // L: 497 + return -1; // L: 477 } } - @ObfuscatedName("ao") - public void method4762(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.planes; ++var4) { // L: 501 - for (int var5 = 0; var5 < this.xSize; ++var5) { // L: 502 - for (int var6 = 0; var6 < this.ySize; ++var6) { // L: 503 - Tile var7 = this.tiles[var4][var5][var6]; // L: 504 - if (var7 != null) { // L: 505 - BoundaryObject var8 = var7.boundaryObject; // L: 506 + @ObfuscatedName("aj") + public void method4057(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 ModelData var10; - if (var8 != null && var8.renderable1 instanceof ModelData) { // L: 507 - ModelData var9 = (ModelData)var8.renderable1; // L: 508 - this.method4764(var9, var4, var5, var6, 1, 1); // L: 509 - if (var8.renderable2 instanceof ModelData) { // L: 510 - var10 = (ModelData)var8.renderable2; // L: 511 - this.method4764(var10, var4, var5, var6, 1, 1); // L: 512 - ModelData.method4531(var9, var10, 0, 0, 0, false); // L: 513 - var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 514 + if (var8 != null && var8.renderable1 instanceof ModelData) { // L: 487 + ModelData var9 = (ModelData)var8.renderable1; // L: 488 + this.method4059(var9, var4, var5, var6, 1, 1); // L: 489 + if (var8.renderable2 instanceof ModelData) { // L: 490 + var10 = (ModelData)var8.renderable2; // L: 491 + this.method4059(var10, var4, var5, var6, 1, 1); // L: 492 + ModelData.method3862(var9, var10, 0, 0, 0, false); // L: 493 + var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 494 } - var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 516 + var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 496 } - for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { // L: 518 - GameObject var14 = var7.gameObjects[var12]; // L: 519 - if (var14 != null && var14.renderable instanceof ModelData) { // L: 520 - ModelData var11 = (ModelData)var14.renderable; // L: 521 - this.method4764(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 522 - var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 523 + for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { // L: 498 + GameObject var14 = var7.gameObjects[var12]; // L: 499 + if (var14 != null && var14.renderable instanceof ModelData) { // L: 500 + ModelData var11 = (ModelData)var14.renderable; // L: 501 + this.method4059(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 502 + var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 503 } } - FloorDecoration var13 = var7.floorDecoration; // L: 526 - if (var13 != null && var13.renderable instanceof ModelData) { // L: 527 - var10 = (ModelData)var13.renderable; // L: 528 - this.method4763(var10, var4, var5, var6); // L: 529 - var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 530 + FloorDecoration var13 = var7.floorDecoration; // L: 506 + if (var13 != null && var13.renderable instanceof ModelData) { // L: 507 + var10 = (ModelData)var13.renderable; // L: 508 + this.method4058(var10, var4, var5, var6); // L: 509 + var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 510 } } } } } - } // L: 536 + } // L: 516 - @ObfuscatedName("aj") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lhc;III)V" + descriptor = "(Lgs;III)V" ) - void method4763(ModelData var1, int var2, int var3, int var4) { + void method4058(ModelData var1, int var2, int var3, int var4) { Tile var5; ModelData var6; - if (var3 < this.xSize) { // L: 539 - var5 = this.tiles[var2][var3 + 1][var4]; // L: 540 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 541 - var6 = (ModelData)var5.floorDecoration.renderable; // L: 542 - ModelData.method4531(var1, var6, 128, 0, 0, true); // L: 543 + if (var3 < this.xSize) { // L: 519 + var5 = this.tiles[var2][var3 + 1][var4]; // L: 520 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 521 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 522 + ModelData.method3862(var1, var6, 128, 0, 0, true); // L: 523 } } - if (var4 < this.xSize) { // L: 546 - var5 = this.tiles[var2][var3][var4 + 1]; // L: 547 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 548 - var6 = (ModelData)var5.floorDecoration.renderable; // L: 549 - ModelData.method4531(var1, var6, 0, 0, 128, true); // L: 550 + if (var4 < this.xSize) { // L: 526 + var5 = this.tiles[var2][var3][var4 + 1]; // L: 527 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 528 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 529 + ModelData.method3862(var1, var6, 0, 0, 128, true); // L: 530 } } - if (var3 < this.xSize && var4 < this.ySize) { // L: 553 - var5 = this.tiles[var2][var3 + 1][var4 + 1]; // L: 554 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 555 - var6 = (ModelData)var5.floorDecoration.renderable; // L: 556 - ModelData.method4531(var1, var6, 128, 0, 128, true); // L: 557 + 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.renderable instanceof ModelData) { // L: 535 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 536 + ModelData.method3862(var1, var6, 128, 0, 128, true); // L: 537 } } - if (var3 < this.xSize && var4 > 0) { // L: 560 - var5 = this.tiles[var2][var3 + 1][var4 - 1]; // L: 561 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 562 - var6 = (ModelData)var5.floorDecoration.renderable; // L: 563 - ModelData.method4531(var1, var6, 128, 0, -128, true); // L: 564 + 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.renderable instanceof ModelData) { // L: 542 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 543 + ModelData.method3862(var1, var6, 128, 0, -128, true); // L: 544 } } - } // L: 567 + } // L: 547 - @ObfuscatedName("al") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Lhc;IIIII)V" + descriptor = "(Lgs;IIIII)V" ) - void method4764(ModelData var1, int var2, int var3, int var4, int var5, int var6) { - boolean var7 = true; // L: 570 - int var8 = var3; // L: 571 - int var9 = var3 + var5; // L: 572 - int var10 = var4 - 1; // L: 573 - int var11 = var4 + var6; // L: 574 + void method4059(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 - for (int var12 = var2; var12 <= var2 + 1; ++var12) { // L: 575 - if (var12 != this.planes) { // L: 576 - for (int var13 = var8; var13 <= var9; ++var13) { // L: 577 - if (var13 >= 0 && var13 < this.xSize) { // L: 578 - for (int var14 = var10; var14 <= var11; ++var14) { // L: 579 - if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { // L: 580 581 - Tile var15 = this.tiles[var12][var13][var14]; // L: 582 - if (var15 != null) { // L: 583 - 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: 584 - BoundaryObject var17 = var15.boundaryObject; // L: 585 - if (var17 != null) { // L: 586 + 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 ModelData var18; - if (var17.renderable1 instanceof ModelData) { // L: 587 - var18 = (ModelData)var17.renderable1; // L: 588 - ModelData.method4531(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 589 + if (var17.renderable1 instanceof ModelData) { // L: 567 + var18 = (ModelData)var17.renderable1; // L: 568 + ModelData.method3862(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 569 } - if (var17.renderable2 instanceof ModelData) { // L: 591 - var18 = (ModelData)var17.renderable2; // L: 592 - ModelData.method4531(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 593 + if (var17.renderable2 instanceof ModelData) { // L: 571 + var18 = (ModelData)var17.renderable2; // L: 572 + ModelData.method3862(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 573 } } - for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { // L: 596 - GameObject var19 = var15.gameObjects[var23]; // L: 597 - if (var19 != null && var19.renderable instanceof ModelData) { // L: 598 - ModelData var20 = (ModelData)var19.renderable; // L: 599 - int var21 = var19.endX - var19.startX + 1; // L: 600 - int var22 = var19.endY - var19.startY + 1; // L: 601 - ModelData.method4531(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 602 + for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { // L: 576 + GameObject var19 = var15.gameObjects[var23]; // L: 577 + if (var19 != null && var19.renderable instanceof ModelData) { // L: 578 + ModelData var20 = (ModelData)var19.renderable; // L: 579 + int var21 = var19.endX - var19.startX + 1; // L: 580 + int var22 = var19.endY - var19.startY + 1; // L: 581 + ModelData.method3862(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 582 } } } @@ -970,179 +962,179 @@ public class Scene { } } - --var8; // L: 607 - var7 = false; // L: 608 + --var8; // L: 587 + var7 = false; // L: 588 } } - } // L: 610 + } // L: 590 - @ObfuscatedName("av") + @ObfuscatedName("ap") @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: 613 - if (var7 != null) { // L: 614 - SceneTilePaint var8 = var7.paint; // L: 615 + Tile var7 = this.tiles[var4][var5][var6]; // L: 593 + if (var7 != null) { // L: 594 + SceneTilePaint var8 = var7.paint; // L: 595 int var10; - if (var8 != null) { // L: 616 - int var18 = var8.rgb; // L: 617 - if (var18 != 0) { // L: 618 - for (var10 = 0; var10 < 4; ++var10) { // L: 619 - var1[var2] = var18; // L: 620 - var1[var2 + 1] = var18; // L: 621 - var1[var2 + 2] = var18; // L: 622 - var1[var2 + 3] = var18; // L: 623 - var2 += var3; // L: 624 + 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 } } } else { - SceneTileModel var9 = var7.model; // L: 628 - if (var9 != null) { // L: 629 - var10 = var9.shape; // L: 630 - int var11 = var9.rotation; // L: 631 - int var12 = var9.underlayRgb; // L: 632 - int var13 = var9.overlayRgb; // L: 633 - int[] var14 = this.tileShape2D[var10]; // L: 634 - int[] var15 = this.tileRotation2D[var11]; // L: 635 - int var16 = 0; // L: 636 + SceneTileModel 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 int var17; - if (var12 != 0) { // L: 637 - for (var17 = 0; var17 < 4; ++var17) { // L: 638 - var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 639 - var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 640 - var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 641 - var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 642 - var2 += var3; // L: 643 + 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 } } else { - for (var17 = 0; var17 < 4; ++var17) { // L: 647 - if (var14[var15[var16++]] != 0) { // L: 648 + for (var17 = 0; var17 < 4; ++var17) { // L: 627 + if (var14[var15[var16++]] != 0) { // L: 628 var1[var2] = var13; } - if (var14[var15[var16++]] != 0) { // L: 649 + if (var14[var15[var16++]] != 0) { // L: 629 var1[var2 + 1] = var13; } - if (var14[var15[var16++]] != 0) { // L: 650 + if (var14[var15[var16++]] != 0) { // L: 630 var1[var2 + 2] = var13; } - if (var14[var15[var16++]] != 0) { // L: 651 + if (var14[var15[var16++]] != 0) { // L: 631 var1[var2 + 3] = var13; } - var2 += var3; // L: 652 + var2 += var3; // L: 632 } } } } } - } // L: 626 655 + } // L: 606 635 - @ObfuscatedName("ay") + @ObfuscatedName("ak") @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { - if (!shouldSendWalk() || var4) { // L: 734 - checkClick = true; // L: 735 - viewportWalking = var4; // L: 736 - Scene_selectedPlane = var1; // L: 737 - Scene_selectedScreenX = var2; // L: 738 - Scene_selectedScreenY = var3; // L: 739 - Scene_selectedX = -1; // L: 740 - Scene_selectedY = -1; // L: 741 + 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 } - } // L: 742 + } // L: 722 - @ObfuscatedName("ag") + @ObfuscatedName("af") @Export("setViewportWalking") public void setViewportWalking() { - viewportWalking = true; // L: 745 - } // L: 746 + viewportWalking = true; // L: 725 + } // L: 726 - @ObfuscatedName("ab") + @ObfuscatedName("ad") @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 < 0) { // L: 758 + if (var1 < 0) { // L: 738 var1 = 0; - } else if (var1 >= this.xSize * 128) { // L: 759 + } else if (var1 >= this.xSize * 128) { // L: 739 var1 = this.xSize * 128 - 1; } - if (var3 < 0) { // L: 760 + if (var3 < 0) { // L: 740 var3 = 0; - } else if (var3 >= this.ySize * 128) { // L: 761 + } else if (var3 >= this.ySize * 128) { // L: 741 var3 = this.ySize * 128 - 1; } - if (var4 < 128) { // L: 762 + if (var4 < 128) { // L: 742 var4 = 128; - } else if (var4 > 383) { // L: 763 + } else if (var4 > 383) { // L: 743 var4 = 383; } - ++Scene_drawnCount; // L: 764 - Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 765 - Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 766 - Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; // L: 767 - Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; // L: 768 - visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; // L: 769 - Scene_cameraX = var1; // L: 770 - Scene_cameraY = var2; // L: 771 - Scene_cameraZ = var3; // L: 772 - Scene_cameraXTile = var1 / 128; // L: 773 - Scene_cameraYTile = var3 / 128; // L: 774 - Scene_plane = var6; // L: 775 - Scene_cameraXTileMin = Scene_cameraXTile - 25; // L: 776 - if (Scene_cameraXTileMin < 0) { // L: 777 + ++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_cameraXTileMin = 0; } - Scene_cameraYTileMin = Scene_cameraYTile - 25; // L: 778 - if (Scene_cameraYTileMin < 0) { // L: 779 + Scene_cameraYTileMin = Scene_cameraYTile - 25; // L: 758 + if (Scene_cameraYTileMin < 0) { // L: 759 Scene_cameraYTileMin = 0; } - Scene_cameraXTileMax = Scene_cameraXTile + 25; // L: 780 - if (Scene_cameraXTileMax > this.xSize) { // L: 781 + Scene_cameraXTileMax = Scene_cameraXTile + 25; // L: 760 + if (Scene_cameraXTileMax > this.xSize) { // L: 761 Scene_cameraXTileMax = this.xSize; } - Scene_cameraYTileMax = Scene_cameraYTile + 25; // L: 782 - if (Scene_cameraYTileMax > this.ySize) { // L: 783 + Scene_cameraYTileMax = Scene_cameraYTile + 25; // L: 762 + if (Scene_cameraYTileMax > this.ySize) { // L: 763 Scene_cameraYTileMax = this.ySize; } - this.occlude(); // L: 784 - tileUpdateCount = 0; // L: 785 + this.occlude(); // L: 764 + tileUpdateCount = 0; // L: 765 int var7; Tile[][] var8; int var9; int var10; - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 786 - var8 = this.tiles[var7]; // L: 787 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 766 + var8 = this.tiles[var7]; // L: 767 - for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { // L: 788 - for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { // L: 789 - Tile var16 = var8[var9][var10]; // L: 790 - if (var16 != null) { // L: 791 - if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { // L: 792 - var16.drawPrimary = true; // L: 798 - var16.drawSecondary = true; // L: 799 - if (var16.gameObjectsCount > 0) { - var16.drawGameObjects = true; // L: 800 + 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; } else { - var16.drawGameObjects = false; // L: 801 + var16.drawGameObjects = false; // L: 781 } - ++tileUpdateCount; // L: 802 + ++tileUpdateCount; // L: 782 } else { - var16.drawPrimary = false; // L: 793 - var16.drawSecondary = false; // L: 794 - var16.drawGameObjectEdges = 0; // L: 795 + var16.drawPrimary = false; // L: 773 + var16.drawSecondary = false; // L: 774 + var16.drawGameObjectEdges = 0; // L: 775 } } } @@ -1154,118 +1146,118 @@ public class Scene { int var13; int var14; Tile var15; - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 808 - var8 = this.tiles[var7]; // L: 809 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 788 + var8 = this.tiles[var7]; // L: 789 - for (var9 = -25; var9 <= 0; ++var9) { // L: 810 - var10 = var9 + Scene_cameraXTile; // L: 811 - var11 = Scene_cameraXTile - var9; // L: 812 - if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 813 - for (var12 = -25; var12 <= 0; ++var12) { // L: 814 - var13 = var12 + Scene_cameraYTile; // L: 815 - var14 = Scene_cameraYTile - var12; // L: 816 - if (var10 >= Scene_cameraXTileMin) { // L: 817 - if (var13 >= Scene_cameraYTileMin) { // L: 818 - var15 = var8[var10][var13]; // L: 819 - if (var15 != null && var15.drawPrimary) { // L: 820 + 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 this.drawTile(var15, true); } } - if (var14 < Scene_cameraYTileMax) { // L: 822 - var15 = var8[var10][var14]; // L: 823 - if (var15 != null && var15.drawPrimary) { // L: 824 + if (var14 < Scene_cameraYTileMax) { // L: 802 + var15 = var8[var10][var14]; // L: 803 + if (var15 != null && var15.drawPrimary) { // L: 804 this.drawTile(var15, true); } } } - if (var11 < Scene_cameraXTileMax) { // L: 827 - if (var13 >= Scene_cameraYTileMin) { // L: 828 - var15 = var8[var11][var13]; // L: 829 - if (var15 != null && var15.drawPrimary) { // L: 830 + 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 this.drawTile(var15, true); } } - if (var14 < Scene_cameraYTileMax) { // L: 832 - var15 = var8[var11][var14]; // L: 833 - if (var15 != null && var15.drawPrimary) { // L: 834 + if (var14 < Scene_cameraYTileMax) { // L: 812 + var15 = var8[var11][var14]; // L: 813 + if (var15 != null && var15.drawPrimary) { // L: 814 this.drawTile(var15, true); } } } - if (tileUpdateCount == 0) { // L: 837 - checkClick = false; // L: 838 - return; // L: 839 + if (tileUpdateCount == 0) { // L: 817 + checkClick = false; // L: 818 + return; // L: 819 } } } } } - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 845 - var8 = this.tiles[var7]; // L: 846 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 825 + var8 = this.tiles[var7]; // L: 826 - for (var9 = -25; var9 <= 0; ++var9) { // L: 847 - var10 = var9 + Scene_cameraXTile; // L: 848 - var11 = Scene_cameraXTile - var9; // L: 849 - if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 850 - for (var12 = -25; var12 <= 0; ++var12) { // L: 851 - var13 = var12 + Scene_cameraYTile; // L: 852 - var14 = Scene_cameraYTile - var12; // L: 853 - if (var10 >= Scene_cameraXTileMin) { // L: 854 - if (var13 >= Scene_cameraYTileMin) { // L: 855 - var15 = var8[var10][var13]; // L: 856 - if (var15 != null && var15.drawPrimary) { // L: 857 + 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 this.drawTile(var15, false); } } - if (var14 < Scene_cameraYTileMax) { // L: 859 - var15 = var8[var10][var14]; // L: 860 - if (var15 != null && var15.drawPrimary) { // L: 861 + if (var14 < Scene_cameraYTileMax) { // L: 839 + var15 = var8[var10][var14]; // L: 840 + if (var15 != null && var15.drawPrimary) { // L: 841 this.drawTile(var15, false); } } } - if (var11 < Scene_cameraXTileMax) { // L: 864 - if (var13 >= Scene_cameraYTileMin) { // L: 865 - var15 = var8[var11][var13]; // L: 866 - if (var15 != null && var15.drawPrimary) { // L: 867 + 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: 869 - var15 = var8[var11][var14]; // L: 870 - if (var15 != null && var15.drawPrimary) { // L: 871 + 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: 874 - checkClick = false; // L: 875 - return; // L: 876 + if (tileUpdateCount == 0) { // L: 854 + checkClick = false; // L: 855 + return; // L: 856 } } } } } - checkClick = false; // L: 882 - } // L: 883 + checkClick = false; // L: 862 + } // L: 863 - @ObfuscatedName("au") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Lhu;Z)V" + descriptor = "(Lgn;Z)V" ) @Export("drawTile") void drawTile(Tile var1, boolean var2) { - Scene_tilesDeque.addFirst(var1); // L: 886 + Scene_tilesDeque.addFirst(var1); // L: 866 while (true) { Tile var3; @@ -1297,227 +1289,227 @@ public class Scene { Tile var36; while (true) { do { - var3 = (Tile)Scene_tilesDeque.removeLast(); // L: 888 - if (var3 == null) { // L: 889 + var3 = (Tile)Scene_tilesDeque.removeLast(); // L: 868 + if (var3 == null) { // L: 869 return; } - } while(!var3.drawSecondary); // L: 890 + } while(!var3.drawSecondary); // L: 870 - var4 = var3.x; // L: 891 - var5 = var3.y; // L: 892 - var6 = var3.plane; // L: 893 - var7 = var3.originalPlane; // L: 894 - var8 = this.tiles[var6]; // L: 895 - if (!var3.drawPrimary) { // L: 896 + 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 break; } - if (var2) { // L: 897 - if (var6 > 0) { // L: 898 - var9 = this.tiles[var6 - 1][var4][var5]; // L: 899 - if (var9 != null && var9.drawSecondary) { // L: 900 + 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 continue; } } - if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { // L: 902 - var9 = var8[var4 - 1][var5]; // L: 903 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { // L: 904 + 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 continue; } } - if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { // L: 906 - var9 = var8[var4 + 1][var5]; // L: 907 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { // L: 908 + 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 continue; } } - if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { // L: 910 - var9 = var8[var4][var5 - 1]; // L: 911 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { // L: 912 + 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 continue; } } - if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { // L: 914 - var9 = var8[var4][var5 + 1]; // L: 915 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { // L: 916 + 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 continue; } } } else { - var2 = true; // L: 919 + var2 = true; // L: 899 } - var3.drawPrimary = false; // L: 920 - if (var3.linkedBelowTile != null) { // L: 921 - var9 = var3.linkedBelowTile; // L: 922 - if (var9.paint != null) { // L: 923 - if (!this.method4867(0, var4, var5)) { // L: 924 + var3.drawPrimary = false; // L: 900 + if (var3.linkedBelowTile != null) { // L: 901 + var9 = var3.linkedBelowTile; // L: 902 + if (var9.paint != null) { // L: 903 + if (!this.method4074(0, var4, var5)) { // L: 904 this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - } else if (var9.model != null && !this.method4867(0, var4, var5)) { // L: 926 927 + } else if (var9.model != null && !this.method4074(0, var4, var5)) { // L: 906 907 this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - var10 = var9.boundaryObject; // L: 929 - if (var10 != null) { // L: 930 + var10 = var9.boundaryObject; // L: 909 + if (var10 != null) { // L: 910 var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.z - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } - for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 931 - var12 = var9.gameObjects[var11]; // L: 932 - if (var12 != null) { // L: 933 + for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 911 + var12 = var9.gameObjects[var11]; // L: 912 + if (var12 != null) { // L: 913 var12.renderable.draw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.z - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag); } } } - var20 = false; // L: 936 - if (var3.paint != null) { // L: 937 - if (!this.method4867(var7, var4, var5)) { // L: 938 - var20 = true; // L: 939 - if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 940 + var20 = false; // L: 916 + if (var3.paint != null) { // L: 917 + if (!this.method4074(var7, var4, var5)) { // L: 918 + var20 = true; // L: 919 + if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 920 this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } } - } else if (var3.model != null && !this.method4867(var7, var4, var5)) { // L: 943 944 - var20 = true; // L: 945 - this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); // L: 946 + } else if (var3.model != null && !this.method4074(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 } - var21 = 0; // L: 949 - var11 = 0; // L: 950 - BoundaryObject var31 = var3.boundaryObject; // L: 951 - WallDecoration var13 = var3.wallDecoration; // L: 952 - if (var31 != null || var13 != null) { // L: 953 - if (var4 == Scene_cameraXTile) { // L: 954 + 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; - } else if (Scene_cameraXTile < var4) { // L: 955 + } else if (Scene_cameraXTile < var4) { // L: 935 var21 += 2; } - if (var5 == Scene_cameraYTile) { // L: 956 + if (var5 == Scene_cameraYTile) { // L: 936 var21 += 3; - } else if (Scene_cameraYTile > var5) { // L: 957 + } else if (Scene_cameraYTile > var5) { // L: 937 var21 += 6; } - var11 = field2617[var21]; // L: 958 - var3.field2546 = field2650[var21]; // L: 959 + var11 = field2464[var21]; // L: 938 + var3.field2374 = field2466[var21]; // L: 939 } - if (var31 != null) { // L: 961 - if ((var31.orientationA & field2638[var21]) != 0) { // L: 962 - if (var31.orientationA == 16) { // L: 963 - var3.drawGameObjectEdges = 3; // L: 964 - var3.field2544 = field2616[var21]; // L: 965 - var3.field2545 = 3 - var3.field2544; // L: 966 - } else if (var31.orientationA == 32) { // L: 968 - var3.drawGameObjectEdges = 6; // L: 969 - var3.field2544 = field2641[var21]; // L: 970 - var3.field2545 = 6 - var3.field2544; // L: 971 - } else if (var31.orientationA == 64) { // L: 973 - var3.drawGameObjectEdges = 12; // L: 974 - var3.field2544 = field2628[var21]; // L: 975 - var3.field2545 = 12 - var3.field2544; // L: 976 + if (var31 != null) { // L: 941 + if ((var31.orientationA & field2475[var21]) != 0) { // L: 942 + if (var31.orientationA == 16) { // L: 943 + var3.drawGameObjectEdges = 3; // L: 944 + var3.field2372 = field2467[var21]; // L: 945 + var3.field2373 = 3 - var3.field2372; // L: 946 + } else if (var31.orientationA == 32) { // L: 948 + var3.drawGameObjectEdges = 6; // L: 949 + var3.field2372 = field2468[var21]; // L: 950 + var3.field2373 = 6 - var3.field2372; // L: 951 + } else if (var31.orientationA == 64) { // L: 953 + var3.drawGameObjectEdges = 12; // L: 954 + var3.field2372 = field2478[var21]; // L: 955 + var3.field2373 = 12 - var3.field2372; // L: 956 } else { - var3.drawGameObjectEdges = 9; // L: 979 - var3.field2544 = field2643[var21]; // L: 980 - var3.field2545 = 9 - var3.field2544; // L: 981 + var3.drawGameObjectEdges = 9; // L: 959 + var3.field2372 = field2470[var21]; // L: 960 + var3.field2373 = 9 - var3.field2372; // L: 961 } } else { - var3.drawGameObjectEdges = 0; // L: 984 + var3.drawGameObjectEdges = 0; // L: 964 } - if ((var31.orientationA & var11) != 0 && !this.method4780(var7, var4, var5, var31.orientationA)) { // L: 985 + if ((var31.orientationA & var11) != 0 && !this.method4191(var7, var4, var5, var31.orientationA)) { // L: 965 var31.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.z - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } - if ((var31.orientationB & var11) != 0 && !this.method4780(var7, var4, var5, var31.orientationB)) { // L: 986 + if ((var31.orientationB & var11) != 0 && !this.method4191(var7, var4, var5, var31.orientationB)) { // L: 966 var31.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.z - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } } - if (var13 != null && !this.method4781(var7, var4, var5, var13.renderable1.height)) { // L: 988 - if ((var13.orientation & var11) != 0) { // L: 989 - var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.z - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); // L: 990 - } else if (var13.orientation == 256) { // L: 992 - var14 = var13.x - Scene_cameraX; // L: 993 - var15 = var13.z - Scene_cameraY; // L: 994 - var16 = var13.y - Scene_cameraZ; // L: 995 - var17 = var13.orientation2; // L: 996 - if (var17 != 1 && var17 != 2) { // L: 998 - var18 = var14; // L: 999 + if (var13 != null && !this.method4089(var7, var4, var5, var13.renderable1.height)) { // L: 968 + if ((var13.orientation & var11) != 0) { // L: 969 + var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.z - 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.z - 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 } else { var18 = -var14; } int var19; - if (var17 != 2 && var17 != 3) { // L: 1001 - var19 = var16; // L: 1002 + if (var17 != 2 && var17 != 3) { // L: 981 + var19 = var16; // L: 982 } else { var19 = -var16; } - if (var19 < var18) { // L: 1003 - var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); // L: 1004 - } else if (var13.renderable2 != null) { // L: 1006 - var13.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); // L: 1007 + if (var19 < var18) { // L: 983 + var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); // L: 984 + } else if (var13.renderable2 != null) { // L: 986 + var13.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); // L: 987 } } } - if (var20) { // L: 1011 - FloorDecoration var22 = var3.floorDecoration; // L: 1012 - if (var22 != null) { // L: 1013 + if (var20) { // L: 991 + FloorDecoration var22 = var3.floorDecoration; // L: 992 + if (var22 != null) { // L: 993 var22.renderable.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x - Scene_cameraX, var22.z - Scene_cameraY, var22.y - Scene_cameraZ, var22.tag); } - ItemLayer var23 = var3.itemLayer; // L: 1014 - if (var23 != null && var23.height == 0) { // L: 1015 - if (var23.second != null) { // L: 1016 + ItemLayer var23 = var3.itemLayer; // L: 994 + if (var23 != null && var23.height == 0) { // L: 995 + if (var23.second != null) { // L: 996 var23.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.z - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } - if (var23.third != null) { // L: 1017 + if (var23.third != null) { // L: 997 var23.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.z - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } - if (var23.first != null) { // L: 1018 + if (var23.first != null) { // L: 998 var23.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.z - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } } } - var14 = var3.gameObjectsEdgeMask; // L: 1021 - if (var14 != 0) { // L: 1022 - if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { // L: 1023 - var36 = var8[var4 + 1][var5]; // L: 1024 - if (var36 != null && var36.drawSecondary) { // L: 1025 + 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 Scene_tilesDeque.addFirst(var36); } } - if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { // L: 1027 - var36 = var8[var4][var5 + 1]; // L: 1028 - if (var36 != null && var36.drawSecondary) { // L: 1029 + if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { // L: 1007 + var36 = var8[var4][var5 + 1]; // L: 1008 + if (var36 != null && var36.drawSecondary) { // L: 1009 Scene_tilesDeque.addFirst(var36); } } - if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { // L: 1031 - var36 = var8[var4 - 1][var5]; // L: 1032 - if (var36 != null && var36.drawSecondary) { // L: 1033 + if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { // L: 1011 + var36 = var8[var4 - 1][var5]; // L: 1012 + if (var36 != null && var36.drawSecondary) { // L: 1013 Scene_tilesDeque.addFirst(var36); } } - if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { // L: 1035 - var36 = var8[var4][var5 - 1]; // L: 1036 - if (var36 != null && var36.drawSecondary) { // L: 1037 + if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { // L: 1015 + var36 = var8[var4][var5 - 1]; // L: 1016 + if (var36 != null && var36.drawSecondary) { // L: 1017 Scene_tilesDeque.addFirst(var36); } } @@ -1525,372 +1517,372 @@ public class Scene { break; } - if (var3.drawGameObjectEdges != 0) { // L: 1041 - var20 = true; // L: 1042 + if (var3.drawGameObjectEdges != 0) { // L: 1021 + var20 = true; // L: 1022 - for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1043 - if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2544) { // L: 1044 - var20 = false; // L: 1045 - break; // L: 1046 + for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1023 + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2372) { // L: 1024 + var20 = false; // L: 1025 + break; // L: 1026 } } - if (var20) { // L: 1049 - var10 = var3.boundaryObject; // L: 1050 - if (!this.method4780(var7, var4, var5, var10.orientationA)) { // L: 1051 + if (var20) { // L: 1029 + var10 = var3.boundaryObject; // L: 1030 + if (!this.method4191(var7, var4, var5, var10.orientationA)) { // L: 1031 var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.z - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } - var3.drawGameObjectEdges = 0; // L: 1052 + var3.drawGameObjectEdges = 0; // L: 1032 } } - if (!var3.drawGameObjects) { // L: 1055 + if (!var3.drawGameObjects) { // L: 1035 break; } try { - int var34 = var3.gameObjectsCount; // L: 1057 - var3.drawGameObjects = false; // L: 1058 - var21 = 0; // L: 1059 + int var34 = var3.gameObjectsCount; // L: 1037 + var3.drawGameObjects = false; // L: 1038 + var21 = 0; // L: 1039 label563: - for (var11 = 0; var11 < var34; ++var11) { // L: 1060 - var12 = var3.gameObjects[var11]; // L: 1061 - if (var12.lastDrawn != Scene_drawnCount) { // L: 1062 - for (var24 = var12.startX; var24 <= var12.endX; ++var24) { // L: 1063 - for (var14 = var12.startY; var14 <= var12.endY; ++var14) { // L: 1064 - var36 = var8[var24][var14]; // L: 1065 - if (var36.drawPrimary) { // L: 1066 - var3.drawGameObjects = true; // L: 1067 - continue label563; // L: 1068 + 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 } - if (var36.drawGameObjectEdges != 0) { // L: 1070 - var16 = 0; // L: 1071 - if (var24 > var12.startX) { // L: 1072 + if (var36.drawGameObjectEdges != 0) { // L: 1050 + var16 = 0; // L: 1051 + if (var24 > var12.startX) { // L: 1052 ++var16; } - if (var24 < var12.endX) { // L: 1073 + if (var24 < var12.endX) { // L: 1053 var16 += 4; } - if (var14 > var12.startY) { // L: 1074 + if (var14 > var12.startY) { // L: 1054 var16 += 8; } - if (var14 < var12.endY) { // L: 1075 + if (var14 < var12.endY) { // L: 1055 var16 += 2; } - if ((var16 & var36.drawGameObjectEdges) == var3.field2545) { // L: 1076 - var3.drawGameObjects = true; // L: 1077 - continue label563; // L: 1078 + if ((var16 & var36.drawGameObjectEdges) == var3.field2373) { // L: 1056 + var3.drawGameObjects = true; // L: 1057 + continue label563; // L: 1058 } } } } - gameObjects[var21++] = var12; // L: 1083 - var24 = Scene_cameraXTile - var12.startX; // L: 1084 - var14 = var12.endX - Scene_cameraXTile; // L: 1085 - if (var14 > var24) { // L: 1086 + gameObjects[var21++] = var12; // L: 1063 + var24 = Scene_cameraXTile - var12.startX; // L: 1064 + var14 = var12.endX - Scene_cameraXTile; // L: 1065 + if (var14 > var24) { // L: 1066 var24 = var14; } - var15 = Scene_cameraYTile - var12.startY; // L: 1087 - var16 = var12.endY - Scene_cameraYTile; // L: 1088 - if (var16 > var15) { // L: 1089 - var12.field2865 = var24 + var16; + var15 = Scene_cameraYTile - var12.startY; // L: 1067 + var16 = var12.endY - Scene_cameraYTile; // L: 1068 + if (var16 > var15) { // L: 1069 + var12.field2697 = var24 + var16; } else { - var12.field2865 = var24 + var15; // L: 1090 + var12.field2697 = var24 + var15; // L: 1070 } } } - while (var21 > 0) { // L: 1093 - var11 = -50; // L: 1094 - var25 = -1; // L: 1095 + while (var21 > 0) { // L: 1073 + var11 = -50; // L: 1074 + var25 = -1; // L: 1075 - for (var24 = 0; var24 < var21; ++var24) { // L: 1096 - GameObject var35 = gameObjects[var24]; // L: 1097 - if (var35.lastDrawn != Scene_drawnCount) { // L: 1098 - if (var35.field2865 > var11) { // L: 1099 - var11 = var35.field2865; // L: 1100 - var25 = var24; // L: 1101 - } else if (var11 == var35.field2865) { // L: 1103 - var15 = var35.centerX - Scene_cameraX; // L: 1104 - var16 = var35.centerY - Scene_cameraZ; // L: 1105 - var17 = gameObjects[var25].centerX - Scene_cameraX; // L: 1106 - var18 = gameObjects[var25].centerY - Scene_cameraZ; // L: 1107 - if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { // L: 1108 + for (var24 = 0; var24 < var21; ++var24) { // L: 1076 + GameObject var35 = gameObjects[var24]; // L: 1077 + if (var35.lastDrawn != Scene_drawnCount) { // L: 1078 + if (var35.field2697 > var11) { // L: 1079 + var11 = var35.field2697; // L: 1080 + var25 = var24; // L: 1081 + } else if (var11 == var35.field2697) { // 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 var25 = var24; } } } } - if (var25 == -1) { // L: 1112 + if (var25 == -1) { // L: 1092 break; } - GameObject var33 = gameObjects[var25]; // L: 1113 - var33.lastDrawn = Scene_drawnCount; // L: 1114 - if (!this.method4782(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1115 - var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.z - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1116 + GameObject var33 = gameObjects[var25]; // L: 1093 + var33.lastDrawn = Scene_drawnCount; // L: 1094 + if (!this.method4132(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1095 + var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.z - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1096 } - for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1118 - for (var15 = var33.startY; var15 <= var33.endY; ++var15) { // L: 1119 - Tile var26 = var8[var14][var15]; // L: 1120 - if (var26.drawGameObjectEdges != 0) { // L: 1121 + 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 Scene_tilesDeque.addFirst(var26); - } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { // L: 1122 + } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { // L: 1102 Scene_tilesDeque.addFirst(var26); } } } } - if (!var3.drawGameObjects) { // L: 1126 + if (!var3.drawGameObjects) { // L: 1106 break; } - } catch (Exception var28) { // L: 1128 - var3.drawGameObjects = false; // L: 1129 + } catch (Exception var28) { // L: 1108 + var3.drawGameObjects = false; // L: 1109 break; } } - } while(!var3.drawSecondary); // L: 1132 - } while(var3.drawGameObjectEdges != 0); // L: 1133 + } while(!var3.drawSecondary); // L: 1112 + } while(var3.drawGameObjectEdges != 0); // L: 1113 - if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { // L: 1134 + if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { // L: 1114 break; } - var9 = var8[var4 - 1][var5]; // L: 1135 - } while(var9 != null && var9.drawSecondary); // L: 1136 + var9 = var8[var4 - 1][var5]; // L: 1115 + } while(var9 != null && var9.drawSecondary); // L: 1116 - if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { // L: 1138 + if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { // L: 1118 break; } - var9 = var8[var4 + 1][var5]; // L: 1139 - } while(var9 != null && var9.drawSecondary); // L: 1140 + var9 = var8[var4 + 1][var5]; // L: 1119 + } while(var9 != null && var9.drawSecondary); // L: 1120 - if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { // L: 1142 + if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { // L: 1122 break; } - var9 = var8[var4][var5 - 1]; // L: 1143 - } while(var9 != null && var9.drawSecondary); // L: 1144 + var9 = var8[var4][var5 - 1]; // L: 1123 + } while(var9 != null && var9.drawSecondary); // L: 1124 - if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { // L: 1146 + if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { // L: 1126 break; } - var9 = var8[var4][var5 + 1]; // L: 1147 - } while(var9 != null && var9.drawSecondary); // L: 1148 + var9 = var8[var4][var5 + 1]; // L: 1127 + } while(var9 != null && var9.drawSecondary); // L: 1128 - var3.drawSecondary = false; // L: 1150 - --tileUpdateCount; // L: 1151 - ItemLayer var32 = var3.itemLayer; // L: 1152 - if (var32 != null && var32.height != 0) { // L: 1153 - if (var32.second != null) { // L: 1154 + var3.drawSecondary = false; // L: 1130 + --tileUpdateCount; // L: 1131 + ItemLayer var32 = var3.itemLayer; // L: 1132 + if (var32 != null && var32.height != 0) { // L: 1133 + if (var32.second != null) { // L: 1134 var32.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.z - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } - if (var32.third != null) { // L: 1155 + if (var32.third != null) { // L: 1135 var32.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.z - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } - if (var32.first != null) { // L: 1156 + if (var32.first != null) { // L: 1136 var32.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.z - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } } - if (var3.field2546 != 0) { // L: 1158 - WallDecoration var29 = var3.wallDecoration; // L: 1159 - if (var29 != null && !this.method4781(var7, var4, var5, var29.renderable1.height)) { // L: 1160 - if ((var29.orientation & var3.field2546) != 0) { // L: 1161 - var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.z - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); // L: 1162 - } else if (var29.orientation == 256) { // L: 1164 - var11 = var29.x - Scene_cameraX; // L: 1165 - var25 = var29.z - Scene_cameraY; // L: 1166 - var24 = var29.y - Scene_cameraZ; // L: 1167 - var14 = var29.orientation2; // L: 1168 - if (var14 != 1 && var14 != 2) { // L: 1170 - var15 = var11; // L: 1171 + if (var3.field2374 != 0) { // L: 1138 + WallDecoration var29 = var3.wallDecoration; // L: 1139 + if (var29 != null && !this.method4089(var7, var4, var5, var29.renderable1.height)) { // L: 1140 + if ((var29.orientation & var3.field2374) != 0) { // L: 1141 + var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.z - 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.z - 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 } else { var15 = -var11; } - if (var14 != 2 && var14 != 3) { // L: 1173 - var16 = var24; // L: 1174 + if (var14 != 2 && var14 != 3) { // L: 1153 + var16 = var24; // L: 1154 } else { var16 = -var24; } - if (var16 >= var15) { // L: 1175 - var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); // L: 1176 - } else if (var29.renderable2 != null) { // L: 1178 - var29.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); // L: 1179 + if (var16 >= var15) { // L: 1155 + var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); // L: 1156 + } else if (var29.renderable2 != null) { // L: 1158 + var29.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); // L: 1159 } } } - BoundaryObject var27 = var3.boundaryObject; // L: 1183 - if (var27 != null) { // L: 1184 - if ((var27.orientationB & var3.field2546) != 0 && !this.method4780(var7, var4, var5, var27.orientationB)) { // L: 1185 + BoundaryObject var27 = var3.boundaryObject; // L: 1163 + if (var27 != null) { // L: 1164 + if ((var27.orientationB & var3.field2374) != 0 && !this.method4191(var7, var4, var5, var27.orientationB)) { // L: 1165 var27.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.z - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } - if ((var27.orientationA & var3.field2546) != 0 && !this.method4780(var7, var4, var5, var27.orientationA)) { // L: 1186 + if ((var27.orientationA & var3.field2374) != 0 && !this.method4191(var7, var4, var5, var27.orientationA)) { // L: 1166 var27.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.z - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } } } Tile var30; - if (var6 < this.planes - 1) { // L: 1189 - var30 = this.tiles[var6 + 1][var4][var5]; // L: 1190 - if (var30 != null && var30.drawSecondary) { // L: 1191 + if (var6 < this.planes - 1) { // L: 1169 + var30 = this.tiles[var6 + 1][var4][var5]; // L: 1170 + if (var30 != null && var30.drawSecondary) { // L: 1171 Scene_tilesDeque.addFirst(var30); } } - if (var4 < Scene_cameraXTile) { // L: 1193 - var30 = var8[var4 + 1][var5]; // L: 1194 - if (var30 != null && var30.drawSecondary) { // L: 1195 + if (var4 < Scene_cameraXTile) { // L: 1173 + var30 = var8[var4 + 1][var5]; // L: 1174 + if (var30 != null && var30.drawSecondary) { // L: 1175 Scene_tilesDeque.addFirst(var30); } } - if (var5 < Scene_cameraYTile) { // L: 1197 - var30 = var8[var4][var5 + 1]; // L: 1198 - if (var30 != null && var30.drawSecondary) { // L: 1199 + if (var5 < Scene_cameraYTile) { // L: 1177 + var30 = var8[var4][var5 + 1]; // L: 1178 + if (var30 != null && var30.drawSecondary) { // L: 1179 Scene_tilesDeque.addFirst(var30); } } - if (var4 > Scene_cameraXTile) { // L: 1201 - var30 = var8[var4 - 1][var5]; // L: 1202 - if (var30 != null && var30.drawSecondary) { // L: 1203 + if (var4 > Scene_cameraXTile) { // L: 1181 + var30 = var8[var4 - 1][var5]; // L: 1182 + if (var30 != null && var30.drawSecondary) { // L: 1183 Scene_tilesDeque.addFirst(var30); } } - if (var5 > Scene_cameraYTile) { // L: 1205 - var30 = var8[var4][var5 - 1]; // L: 1206 - if (var30 != null && var30.drawSecondary) { // L: 1207 + if (var5 > Scene_cameraYTile) { // L: 1185 + var30 = var8[var4][var5 - 1]; // L: 1186 + if (var30 != null && var30.drawSecondary) { // L: 1187 Scene_tilesDeque.addFirst(var30); } } } } - @ObfuscatedName("af") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(Liv;IIIIIII)V" + descriptor = "(Lhr;IIIIIII)V" ) @Export("drawTileUnderlay") void drawTileUnderlay(SceneTilePaint 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: 1215 + int var10 = var9 = (var7 << 7) - Scene_cameraX; // L: 1195 int var11; - int var12 = var11 = (var8 << 7) - Scene_cameraZ; // L: 1217 + int var12 = var11 = (var8 << 7) - Scene_cameraZ; // L: 1197 int var13; - int var14 = var13 = var10 + 128; // L: 1219 + int var14 = var13 = var10 + 128; // L: 1199 int var15; - int var16 = var15 = var12 + 128; // L: 1221 - int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; // L: 1222 - int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; // L: 1223 - int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; // L: 1224 - int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; // L: 1225 - int var21 = var10 * var6 + var5 * var12 >> 16; // L: 1226 - var12 = var12 * var6 - var5 * var10 >> 16; // L: 1227 - var10 = var21; // L: 1228 - var21 = var17 * var4 - var3 * var12 >> 16; // L: 1229 - var12 = var3 * var17 + var12 * var4 >> 16; // L: 1230 - var17 = var21; // L: 1231 - if (var12 >= 50) { // L: 1232 - var21 = var14 * var6 + var5 * var11 >> 16; // L: 1233 - var11 = var11 * var6 - var5 * var14 >> 16; // L: 1234 - var14 = var21; // L: 1235 - var21 = var18 * var4 - var3 * var11 >> 16; // L: 1236 - var11 = var3 * var18 + var11 * var4 >> 16; // L: 1237 - var18 = var21; // L: 1238 - if (var11 >= 50) { // L: 1239 - var21 = var13 * var6 + var5 * var16 >> 16; // L: 1240 - var16 = var16 * var6 - var5 * var13 >> 16; // L: 1241 - var13 = var21; // L: 1242 - var21 = var19 * var4 - var3 * var16 >> 16; // L: 1243 - var16 = var3 * var19 + var16 * var4 >> 16; // L: 1244 - var19 = var21; // L: 1245 - if (var16 >= 50) { // L: 1246 - var21 = var9 * var6 + var5 * var15 >> 16; // L: 1247 - var15 = var15 * var6 - var5 * var9 >> 16; // L: 1248 - var9 = var21; // L: 1249 - var21 = var20 * var4 - var3 * var15 >> 16; // L: 1250 - var15 = var3 * var20 + var15 * var4 >> 16; // L: 1251 - if (var15 >= 50) { // L: 1253 - int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1254 - int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1255 - int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1256 - int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1257 - int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1258 - int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1259 - int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1260 - int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1261 - Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1262 + 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 var30; - if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1263 - Rasterizer3D.field2562 = false; // L: 1264 - if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1265 - Rasterizer3D.field2562 = true; + if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1243 + Rasterizer3D.field2395 = 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.field2395 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { // L: 1266 - Scene_selectedX = var7; // L: 1267 - Scene_selectedY = var8; // L: 1268 + 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 (var1.texture == -1) { // L: 1270 - if (var1.neColor != 12345678) { // L: 1271 - Rasterizer3D.method4613(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); + if (var1.texture == -1) { // L: 1250 + if (var1.neColor != 12345678) { // L: 1251 + Rasterizer3D.method3915(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); } - } else if (!Scene_isLowDetail) { // L: 1273 - if (var1.isFlat) { // L: 1274 + } else if (!Scene_isLowDetail) { // L: 1253 + if (var1.isFlat) { // L: 1254 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: 1275 + 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 } } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1278 - Rasterizer3D.method4613(var27, var29, var25, var26, var28, var24, method4776(var30, var1.neColor), method4776(var30, var1.nwColor), method4776(var30, var1.seColor)); // L: 1279 + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1258 + Rasterizer3D.method3915(var27, var29, var25, var26, var28, var24, method4071(var30, var1.neColor), method4071(var30, var1.nwColor), method4071(var30, var1.seColor)); // L: 1259 } } - if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1282 - Rasterizer3D.field2562 = false; // L: 1283 - if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1284 - Rasterizer3D.field2562 = true; + if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1262 + Rasterizer3D.field2395 = 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.field2395 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { // L: 1285 - Scene_selectedX = var7; // L: 1286 - Scene_selectedY = var8; // L: 1287 + 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 (var1.texture == -1) { // L: 1289 - if (var1.swColor != 12345678) { // L: 1290 - Rasterizer3D.method4613(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); + if (var1.texture == -1) { // L: 1269 + if (var1.swColor != 12345678) { // L: 1270 + Rasterizer3D.method3915(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); } - } else if (!Scene_isLowDetail) { // L: 1292 - 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: 1293 + } 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 { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1296 - Rasterizer3D.method4613(var23, var25, var29, var22, var24, var28, method4776(var30, var1.swColor), method4776(var30, var1.seColor), method4776(var30, var1.nwColor)); // L: 1297 + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1276 + Rasterizer3D.method3915(var23, var25, var29, var22, var24, var28, method4071(var30, var1.swColor), method4071(var30, var1.seColor), method4071(var30, var1.nwColor)); // L: 1277 } } @@ -1898,566 +1890,566 @@ public class Scene { } } } - } // L: 1300 + } // L: 1280 - @ObfuscatedName("ad") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lik;IIIIII)V" + descriptor = "(Lhu;IIIIII)V" ) @Export("drawTileOverlay") void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { - int var8 = var1.vertexX.length; // L: 1303 + int var8 = var1.vertexX.length; // L: 1283 int var9; int var10; int var11; int var12; int var13; - for (var9 = 0; var9 < var8; ++var9) { // L: 1304 - var10 = var1.vertexX[var9] - Scene_cameraX; // L: 1305 - var11 = var1.vertexY[var9] - Scene_cameraY; // L: 1306 - var12 = var1.vertexZ[var9] - Scene_cameraZ; // L: 1307 - var13 = var12 * var4 + var5 * var10 >> 16; // L: 1308 - var12 = var5 * var12 - var10 * var4 >> 16; // L: 1309 - var10 = var13; // L: 1310 - var13 = var3 * var11 - var12 * var2 >> 16; // L: 1311 - var12 = var11 * var2 + var3 * var12 >> 16; // L: 1312 - if (var12 < 50) { // L: 1314 + 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 return; } - if (var1.triangleTextureId != null) { // L: 1315 - SceneTileModel.field2703[var9] = var10; // L: 1316 - SceneTileModel.field2706[var9] = var13; // L: 1317 - SceneTileModel.field2699[var9] = var12; // L: 1318 + if (var1.triangleTextureId != null) { // L: 1295 + SceneTileModel.field2535[var9] = var10; // L: 1296 + SceneTileModel.field2545[var9] = var13; // L: 1297 + SceneTileModel.field2534[var9] = var12; // L: 1298 } - SceneTileModel.field2712[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1320 - SceneTileModel.field2713[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1321 + SceneTileModel.field2539[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1300 + SceneTileModel.field2540[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1301 } - Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1323 - var8 = var1.faceX.length; // L: 1324 + Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1303 + var8 = var1.faceX.length; // L: 1304 - for (var9 = 0; var9 < var8; ++var9) { // L: 1325 - var10 = var1.faceX[var9]; // L: 1326 - var11 = var1.faceY[var9]; // L: 1327 - var12 = var1.faceZ[var9]; // L: 1328 - var13 = SceneTileModel.field2712[var10]; // L: 1329 - int var14 = SceneTileModel.field2712[var11]; // L: 1330 - int var15 = SceneTileModel.field2712[var12]; // L: 1331 - int var16 = SceneTileModel.field2713[var10]; // L: 1332 - int var17 = SceneTileModel.field2713[var11]; // L: 1333 - int var18 = SceneTileModel.field2713[var12]; // L: 1334 - if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1335 - Rasterizer3D.field2562 = false; // L: 1336 - if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1337 - Rasterizer3D.field2562 = true; + 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 = SceneTileModel.field2539[var10]; // L: 1309 + int var14 = SceneTileModel.field2539[var11]; // L: 1310 + int var15 = SceneTileModel.field2539[var12]; // L: 1311 + int var16 = SceneTileModel.field2540[var10]; // L: 1312 + int var17 = SceneTileModel.field2540[var11]; // L: 1313 + int var18 = SceneTileModel.field2540[var12]; // L: 1314 + if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1315 + Rasterizer3D.field2395 = 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.field2395 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { // L: 1338 - Scene_selectedX = var6; // L: 1339 - Scene_selectedY = var7; // L: 1340 + 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 (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { // L: 1342 - if (!Scene_isLowDetail) { // L: 1346 - if (var1.isFlat) { // L: 1347 - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2703[0], SceneTileModel.field2703[1], SceneTileModel.field2703[3], SceneTileModel.field2706[0], SceneTileModel.field2706[1], SceneTileModel.field2706[3], SceneTileModel.field2699[0], SceneTileModel.field2699[1], SceneTileModel.field2699[3], var1.triangleTextureId[var9]); + 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], SceneTileModel.field2535[0], SceneTileModel.field2535[1], SceneTileModel.field2535[3], SceneTileModel.field2545[0], SceneTileModel.field2545[1], SceneTileModel.field2545[3], SceneTileModel.field2534[0], SceneTileModel.field2534[1], SceneTileModel.field2534[3], var1.triangleTextureId[var9]); } else { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2703[var10], SceneTileModel.field2703[var11], SceneTileModel.field2703[var12], SceneTileModel.field2706[var10], SceneTileModel.field2706[var11], SceneTileModel.field2706[var12], SceneTileModel.field2699[var10], SceneTileModel.field2699[var11], SceneTileModel.field2699[var12], var1.triangleTextureId[var9]); // L: 1348 + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2535[var10], SceneTileModel.field2535[var11], SceneTileModel.field2535[var12], SceneTileModel.field2545[var10], SceneTileModel.field2545[var11], SceneTileModel.field2545[var12], SceneTileModel.field2534[var10], SceneTileModel.field2534[var11], SceneTileModel.field2534[var12], var1.triangleTextureId[var9]); // L: 1328 } } else { - int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1351 - Rasterizer3D.method4613(var16, var17, var18, var13, var14, var15, method4776(var19, var1.triangleColorA[var9]), method4776(var19, var1.triangleColorB[var9]), method4776(var19, var1.triangleColorC[var9])); // L: 1352 + int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1331 + Rasterizer3D.method3915(var16, var17, var18, var13, var14, var15, method4071(var19, var1.triangleColorA[var9]), method4071(var19, var1.triangleColorB[var9]), method4071(var19, var1.triangleColorC[var9])); // L: 1332 } - } else if (var1.triangleColorA[var9] != 12345678) { // L: 1343 - Rasterizer3D.method4613(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); + } else if (var1.triangleColorA[var9] != 12345678) { // L: 1323 + Rasterizer3D.method3915(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } } - } // L: 1357 + } // L: 1337 - @ObfuscatedName("ar") + @ObfuscatedName("ai") @Export("occlude") void occlude() { - int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1384 - Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1385 - Scene_currentOccludersCount = 0; // L: 1386 + int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1364 + Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1365 + Scene_currentOccludersCount = 0; // L: 1366 - for (int var3 = 0; var3 < var1; ++var3) { // L: 1387 - Occluder var4 = var2[var3]; // L: 1388 + for (int var3 = 0; var3 < var1; ++var3) { // L: 1367 + Occluder var4 = var2[var3]; // L: 1368 int var5; int var6; int var7; int var9; boolean var13; - if (var4.type == 1) { // L: 1389 - var5 = var4.minTileX - Scene_cameraXTile + 25; // L: 1390 - if (var5 >= 0 && var5 <= 50) { // L: 1391 - var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1392 - if (var6 < 0) { // L: 1393 + 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 var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1394 - if (var7 > 50) { // L: 1395 + var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1374 + if (var7 > 50) { // L: 1375 var7 = 50; } - var13 = false; // L: 1396 + var13 = false; // L: 1376 - while (var6 <= var7) { // L: 1397 - if (visibleTiles[var5][var6++]) { // L: 1398 - var13 = true; // L: 1399 + while (var6 <= var7) { // L: 1377 + if (visibleTiles[var5][var6++]) { // L: 1378 + var13 = true; // L: 1379 break; } } - if (var13) { // L: 1403 - var9 = Scene_cameraX - var4.minX; // L: 1404 - if (var9 > 32) { // L: 1405 - var4.field2669 = 1; + if (var13) { // L: 1383 + var9 = Scene_cameraX - var4.minX; // L: 1384 + if (var9 > 32) { // L: 1385 + var4.field2510 = 1; } else { - if (var9 >= -32) { // L: 1406 + if (var9 >= -32) { // L: 1386 continue; } - var4.field2669 = 2; // L: 1407 - var9 = -var9; // L: 1408 + var4.field2510 = 2; // L: 1387 + var9 = -var9; // L: 1388 } - var4.field2683 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1411 - var4.field2684 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1412 - var4.field2685 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1413 - var4.field2686 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1414 - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1415 + var4.field2509 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1391 + var4.field2495 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1392 + var4.field2506 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1393 + var4.field2511 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1394 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1395 } } - } else if (var4.type == 2) { // L: 1418 - var5 = var4.minTileY - Scene_cameraYTile + 25; // L: 1419 - if (var5 >= 0 && var5 <= 50) { // L: 1420 - var6 = var4.minTileX - Scene_cameraXTile + 25; // L: 1421 - if (var6 < 0) { // L: 1422 + } 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 var6 = 0; } - var7 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1423 - if (var7 > 50) { // L: 1424 + var7 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1403 + if (var7 > 50) { // L: 1404 var7 = 50; } - var13 = false; // L: 1425 + var13 = false; // L: 1405 - while (var6 <= var7) { // L: 1426 - if (visibleTiles[var6++][var5]) { // L: 1427 - var13 = true; // L: 1428 + while (var6 <= var7) { // L: 1406 + if (visibleTiles[var6++][var5]) { // L: 1407 + var13 = true; // L: 1408 break; } } - if (var13) { // L: 1432 - var9 = Scene_cameraZ - var4.minZ; // L: 1433 - if (var9 > 32) { // L: 1434 - var4.field2669 = 3; + if (var13) { // L: 1412 + var9 = Scene_cameraZ - var4.minZ; // L: 1413 + if (var9 > 32) { // L: 1414 + var4.field2510 = 3; } else { - if (var9 >= -32) { // L: 1435 + if (var9 >= -32) { // L: 1415 continue; } - var4.field2669 = 4; // L: 1436 - var9 = -var9; // L: 1437 + var4.field2510 = 4; // L: 1416 + var9 = -var9; // L: 1417 } - var4.field2681 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1440 - var4.field2682 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1441 - var4.field2685 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1442 - var4.field2686 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1443 - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1444 + var4.field2507 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1420 + var4.field2508 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1421 + var4.field2506 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1422 + var4.field2511 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1423 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1424 } } - } else if (var4.type == 4) { // L: 1447 - var5 = var4.minY - Scene_cameraY; // L: 1448 - if (var5 > 128) { // L: 1449 - var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1450 - if (var6 < 0) { // L: 1451 + } 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 var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1452 - if (var7 > 50) { // L: 1453 + var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1432 + if (var7 > 50) { // L: 1433 var7 = 50; } - if (var6 <= var7) { // L: 1454 - int var8 = var4.minTileX - Scene_cameraXTile + 25; // L: 1455 - if (var8 < 0) { // L: 1456 + if (var6 <= var7) { // L: 1434 + int var8 = var4.minTileX - Scene_cameraXTile + 25; // L: 1435 + if (var8 < 0) { // L: 1436 var8 = 0; } - var9 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1457 - if (var9 > 50) { // L: 1458 + var9 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1437 + if (var9 > 50) { // L: 1438 var9 = 50; } - boolean var10 = false; // L: 1459 + boolean var10 = false; // L: 1439 - label149: - for (int var11 = var8; var11 <= var9; ++var11) { // L: 1460 - for (int var12 = var6; var12 <= var7; ++var12) { // L: 1461 - if (visibleTiles[var11][var12]) { // L: 1462 - var10 = true; // L: 1463 - break label149; + 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 + break label148; } } } - if (var10) { // L: 1468 - var4.field2669 = 5; // L: 1469 - var4.field2681 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1470 - var4.field2682 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1471 - var4.field2683 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1472 - var4.field2684 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1473 - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1474 + if (var10) { // L: 1448 + var4.field2510 = 5; // L: 1449 + var4.field2507 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1450 + var4.field2508 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1451 + var4.field2509 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1452 + var4.field2495 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1453 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1454 } } } } } - } // L: 1478 + } // L: 1458 - @ObfuscatedName("ap") - boolean method4867(int var1, int var2, int var3) { - int var4 = this.field2600[var1][var2][var3]; // L: 1481 - if (var4 == -Scene_drawnCount) { // L: 1482 + @ObfuscatedName("ay") + boolean method4074(int var1, int var2, int var3) { + int var4 = this.field2454[var1][var2][var3]; // L: 1461 + if (var4 == -Scene_drawnCount) { // L: 1462 return false; - } else if (var4 == Scene_drawnCount) { // L: 1483 + } else if (var4 == Scene_drawnCount) { // L: 1463 return true; } else { - int var5 = var2 << 7; // L: 1484 - int var6 = var3 << 7; // L: 1485 - if (this.method4783(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method4783(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method4783(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method4783(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1486 - this.field2600[var1][var2][var3] = Scene_drawnCount; // L: 1487 - return true; // L: 1488 + int var5 = var2 << 7; // L: 1464 + int var6 = var3 << 7; // L: 1465 + if (this.method4109(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method4109(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method4109(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method4109(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1466 + this.field2454[var1][var2][var3] = Scene_drawnCount; // L: 1467 + return true; // L: 1468 } else { - this.field2600[var1][var2][var3] = -Scene_drawnCount; // L: 1491 - return false; // L: 1492 + this.field2454[var1][var2][var3] = -Scene_drawnCount; // L: 1471 + return false; // L: 1472 } } } - @ObfuscatedName("az") - boolean method4780(int var1, int var2, int var3, int var4) { - if (!this.method4867(var1, var2, var3)) { // L: 1497 - return false; - } else { - int var5 = var2 << 7; // L: 1498 - int var6 = var3 << 7; // L: 1499 - int var7 = this.tileHeights[var1][var2][var3] - 1; // L: 1500 - int var8 = var7 - 120; // L: 1501 - int var9 = var7 - 230; // L: 1502 - int var10 = var7 - 238; // L: 1503 - if (var4 < 16) { // L: 1504 - if (var4 == 1) { // L: 1505 - if (var5 > Scene_cameraX) { // L: 1506 - if (!this.method4783(var5, var7, var6)) { // L: 1507 - return false; - } - - if (!this.method4783(var5, var7, var6 + 128)) { // L: 1508 - return false; - } - } - - if (var1 > 0) { // L: 1510 - if (!this.method4783(var5, var8, var6)) { // L: 1511 - return false; - } - - if (!this.method4783(var5, var8, var6 + 128)) { // L: 1512 - return false; - } - } - - if (!this.method4783(var5, var9, var6)) { // L: 1514 - return false; - } - - if (!this.method4783(var5, var9, var6 + 128)) { // L: 1515 - return false; - } - - return true; // L: 1516 - } - - if (var4 == 2) { // L: 1518 - if (var6 < Scene_cameraZ) { // L: 1519 - if (!this.method4783(var5, var7, var6 + 128)) { // L: 1520 - return false; - } - - if (!this.method4783(var5 + 128, var7, var6 + 128)) { // L: 1521 - return false; - } - } - - if (var1 > 0) { // L: 1523 - if (!this.method4783(var5, var8, var6 + 128)) { // L: 1524 - return false; - } - - if (!this.method4783(var5 + 128, var8, var6 + 128)) { // L: 1525 - return false; - } - } - - if (!this.method4783(var5, var9, var6 + 128)) { // L: 1527 - return false; - } - - if (!this.method4783(var5 + 128, var9, var6 + 128)) { // L: 1528 - return false; - } - - return true; // L: 1529 - } - - if (var4 == 4) { // L: 1531 - if (var5 < Scene_cameraX) { // L: 1532 - if (!this.method4783(var5 + 128, var7, var6)) { // L: 1533 - return false; - } - - if (!this.method4783(var5 + 128, var7, var6 + 128)) { // L: 1534 - return false; - } - } - - if (var1 > 0) { // L: 1536 - if (!this.method4783(var5 + 128, var8, var6)) { // L: 1537 - return false; - } - - if (!this.method4783(var5 + 128, var8, var6 + 128)) { // L: 1538 - return false; - } - } - - if (!this.method4783(var5 + 128, var9, var6)) { // L: 1540 - return false; - } - - if (!this.method4783(var5 + 128, var9, var6 + 128)) { // L: 1541 - return false; - } - - return true; // L: 1542 - } - - if (var4 == 8) { // L: 1544 - if (var6 > Scene_cameraZ) { // L: 1545 - if (!this.method4783(var5, var7, var6)) { // L: 1546 - return false; - } - - if (!this.method4783(var5 + 128, var7, var6)) { // L: 1547 - return false; - } - } - - if (var1 > 0) { // L: 1549 - if (!this.method4783(var5, var8, var6)) { // L: 1550 - return false; - } - - if (!this.method4783(var5 + 128, var8, var6)) { // L: 1551 - return false; - } - } - - if (!this.method4783(var5, var9, var6)) { // L: 1553 - return false; - } - - if (!this.method4783(var5 + 128, var9, var6)) { // L: 1554 - return false; - } - - return true; // L: 1555 - } - } - - if (!this.method4783(var5 + 64, var10, var6 + 64)) { // L: 1558 - return false; - } else if (var4 == 16) { // L: 1559 - return this.method4783(var5, var9, var6 + 128); // L: 1560 - } else if (var4 == 32) { // L: 1563 - return this.method4783(var5 + 128, var9, var6 + 128); // L: 1564 - } else if (var4 == 64) { // L: 1567 - return this.method4783(var5 + 128, var9, var6); // L: 1568 - } else if (var4 == 128) { // L: 1571 - return this.method4783(var5, var9, var6); // L: 1572 - } else { - return true; // L: 1575 - } - } - } - - @ObfuscatedName("as") - boolean method4781(int var1, int var2, int var3, int var4) { - if (!this.method4867(var1, var2, var3)) { // L: 1579 - return false; - } else { - int var5 = var2 << 7; // L: 1580 - int var6 = var3 << 7; // L: 1581 - return this.method4783(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method4783(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method4783(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method4783(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1582 - } - } - @ObfuscatedName("aa") - boolean method4782(int var1, int var2, int var3, int var4, int var5, int var6) { + boolean method4191(int var1, int var2, int var3, int var4) { + if (!this.method4074(var1, var2, var3)) { // L: 1477 + 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.method4109(var5, var7, var6)) { // L: 1487 + return false; + } + + if (!this.method4109(var5, var7, var6 + 128)) { // L: 1488 + return false; + } + } + + if (var1 > 0) { // L: 1490 + if (!this.method4109(var5, var8, var6)) { // L: 1491 + return false; + } + + if (!this.method4109(var5, var8, var6 + 128)) { // L: 1492 + return false; + } + } + + if (!this.method4109(var5, var9, var6)) { // L: 1494 + return false; + } + + if (!this.method4109(var5, var9, var6 + 128)) { // L: 1495 + return false; + } + + return true; // L: 1496 + } + + if (var4 == 2) { // L: 1498 + if (var6 < Scene_cameraZ) { // L: 1499 + if (!this.method4109(var5, var7, var6 + 128)) { // L: 1500 + return false; + } + + if (!this.method4109(var5 + 128, var7, var6 + 128)) { // L: 1501 + return false; + } + } + + if (var1 > 0) { // L: 1503 + if (!this.method4109(var5, var8, var6 + 128)) { // L: 1504 + return false; + } + + if (!this.method4109(var5 + 128, var8, var6 + 128)) { // L: 1505 + return false; + } + } + + if (!this.method4109(var5, var9, var6 + 128)) { // L: 1507 + return false; + } + + if (!this.method4109(var5 + 128, var9, var6 + 128)) { // L: 1508 + return false; + } + + return true; // L: 1509 + } + + if (var4 == 4) { // L: 1511 + if (var5 < Scene_cameraX) { // L: 1512 + if (!this.method4109(var5 + 128, var7, var6)) { // L: 1513 + return false; + } + + if (!this.method4109(var5 + 128, var7, var6 + 128)) { // L: 1514 + return false; + } + } + + if (var1 > 0) { // L: 1516 + if (!this.method4109(var5 + 128, var8, var6)) { // L: 1517 + return false; + } + + if (!this.method4109(var5 + 128, var8, var6 + 128)) { // L: 1518 + return false; + } + } + + if (!this.method4109(var5 + 128, var9, var6)) { // L: 1520 + return false; + } + + if (!this.method4109(var5 + 128, var9, var6 + 128)) { // L: 1521 + return false; + } + + return true; // L: 1522 + } + + if (var4 == 8) { // L: 1524 + if (var6 > Scene_cameraZ) { // L: 1525 + if (!this.method4109(var5, var7, var6)) { // L: 1526 + return false; + } + + if (!this.method4109(var5 + 128, var7, var6)) { // L: 1527 + return false; + } + } + + if (var1 > 0) { // L: 1529 + if (!this.method4109(var5, var8, var6)) { // L: 1530 + return false; + } + + if (!this.method4109(var5 + 128, var8, var6)) { // L: 1531 + return false; + } + } + + if (!this.method4109(var5, var9, var6)) { // L: 1533 + return false; + } + + if (!this.method4109(var5 + 128, var9, var6)) { // L: 1534 + return false; + } + + return true; // L: 1535 + } + } + + if (!this.method4109(var5 + 64, var10, var6 + 64)) { // L: 1538 + return false; + } else if (var4 == 16) { // L: 1539 + return this.method4109(var5, var9, var6 + 128); // L: 1540 + } else if (var4 == 32) { // L: 1543 + return this.method4109(var5 + 128, var9, var6 + 128); // L: 1544 + } else if (var4 == 64) { // L: 1547 + return this.method4109(var5 + 128, var9, var6); // L: 1548 + } else if (var4 == 128) { // L: 1551 + return this.method4109(var5, var9, var6); // L: 1552 + } else { + return true; // L: 1555 + } + } + } + + @ObfuscatedName("ax") + boolean method4089(int var1, int var2, int var3, int var4) { + if (!this.method4074(var1, var2, var3)) { // L: 1559 + return false; + } else { + int var5 = var2 << 7; // L: 1560 + int var6 = var3 << 7; // L: 1561 + return this.method4109(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method4109(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method4109(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method4109(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1562 + } + } + + @ObfuscatedName("at") + boolean method4132(int var1, int var2, int var3, int var4, int var5, int var6) { int var7; int var8; - if (var3 == var2 && var5 == var4) { // L: 1587 - if (!this.method4867(var1, var2, var4)) { // L: 1588 + if (var3 == var2 && var5 == var4) { // L: 1567 + if (!this.method4074(var1, var2, var4)) { // L: 1568 return false; } else { - var7 = var2 << 7; // L: 1589 - var8 = var4 << 7; // L: 1590 - return this.method4783(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method4783(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method4783(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method4783(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1591 + var7 = var2 << 7; // L: 1569 + var8 = var4 << 7; // L: 1570 + return this.method4109(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method4109(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method4109(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method4109(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1571 } } else { - for (var7 = var2; var7 <= var3; ++var7) { // L: 1594 - for (var8 = var4; var8 <= var5; ++var8) { // L: 1595 - if (this.field2600[var1][var7][var8] == -Scene_drawnCount) { // L: 1596 + for (var7 = var2; var7 <= var3; ++var7) { // L: 1574 + for (var8 = var4; var8 <= var5; ++var8) { // L: 1575 + if (this.field2454[var1][var7][var8] == -Scene_drawnCount) { // L: 1576 return false; } } } - var7 = (var2 << 7) + 1; // L: 1599 - var8 = (var4 << 7) + 2; // L: 1600 - int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1601 - if (!this.method4783(var7, var9, var8)) { // L: 1602 + var7 = (var2 << 7) + 1; // L: 1579 + var8 = (var4 << 7) + 2; // L: 1580 + int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1581 + if (!this.method4109(var7, var9, var8)) { // L: 1582 return false; } else { - int var10 = (var3 << 7) - 1; // L: 1603 - if (!this.method4783(var10, var9, var8)) { // L: 1604 + int var10 = (var3 << 7) - 1; // L: 1583 + if (!this.method4109(var10, var9, var8)) { // L: 1584 return false; } else { - int var11 = (var5 << 7) - 1; // L: 1605 - if (!this.method4783(var7, var9, var11)) { // L: 1606 + int var11 = (var5 << 7) - 1; // L: 1585 + if (!this.method4109(var7, var9, var11)) { // L: 1586 return false; - } else if (!this.method4783(var10, var9, var11)) { // L: 1607 + } else if (!this.method4109(var10, var9, var11)) { // L: 1587 return false; } else { - return true; // L: 1608 + return true; // L: 1588 } } } } } - @ObfuscatedName("bj") - boolean method4783(int var1, int var2, int var3) { - for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1612 - Occluder var5 = Scene_currentOccluders[var4]; // L: 1613 + @ObfuscatedName("br") + boolean method4109(int var1, int var2, int var3) { + for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1592 + Occluder var5 = Scene_currentOccluders[var4]; // L: 1593 int var6; int var7; int var8; int var9; int var10; - if (var5.field2669 == 1) { // L: 1614 - var6 = var5.minX - var1; // L: 1615 - if (var6 > 0) { // L: 1616 - var7 = (var6 * var5.field2683 >> 8) + var5.minZ; // L: 1617 - var8 = (var6 * var5.field2684 >> 8) + var5.maxZ; // L: 1618 - var9 = (var6 * var5.field2685 >> 8) + var5.minY; // L: 1619 - var10 = (var6 * var5.field2686 >> 8) + var5.maxY; // L: 1620 - if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1621 + if (var5.field2510 == 1) { // L: 1594 + var6 = var5.minX - var1; // L: 1595 + if (var6 > 0) { // L: 1596 + var7 = (var6 * var5.field2509 >> 8) + var5.minZ; // L: 1597 + var8 = (var6 * var5.field2495 >> 8) + var5.maxZ; // L: 1598 + var9 = (var6 * var5.field2506 >> 8) + var5.minY; // L: 1599 + var10 = (var6 * var5.field2511 >> 8) + var5.maxY; // L: 1600 + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1601 return true; } } - } else if (var5.field2669 == 2) { // L: 1625 - var6 = var1 - var5.minX; // L: 1626 - if (var6 > 0) { // L: 1627 - var7 = (var6 * var5.field2683 >> 8) + var5.minZ; // L: 1628 - var8 = (var6 * var5.field2684 >> 8) + var5.maxZ; // L: 1629 - var9 = (var6 * var5.field2685 >> 8) + var5.minY; // L: 1630 - var10 = (var6 * var5.field2686 >> 8) + var5.maxY; // L: 1631 - if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1632 + } else if (var5.field2510 == 2) { // L: 1605 + var6 = var1 - var5.minX; // L: 1606 + if (var6 > 0) { // L: 1607 + var7 = (var6 * var5.field2509 >> 8) + var5.minZ; // L: 1608 + var8 = (var6 * var5.field2495 >> 8) + var5.maxZ; // L: 1609 + var9 = (var6 * var5.field2506 >> 8) + var5.minY; // L: 1610 + var10 = (var6 * var5.field2511 >> 8) + var5.maxY; // L: 1611 + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1612 return true; } } - } else if (var5.field2669 == 3) { // L: 1636 - var6 = var5.minZ - var3; // L: 1637 - if (var6 > 0) { // L: 1638 - var7 = (var6 * var5.field2681 >> 8) + var5.minX; // L: 1639 - var8 = (var6 * var5.field2682 >> 8) + var5.maxX; // L: 1640 - var9 = (var6 * var5.field2685 >> 8) + var5.minY; // L: 1641 - var10 = (var6 * var5.field2686 >> 8) + var5.maxY; // L: 1642 - if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1643 + } else if (var5.field2510 == 3) { // L: 1616 + var6 = var5.minZ - var3; // L: 1617 + if (var6 > 0) { // L: 1618 + var7 = (var6 * var5.field2507 >> 8) + var5.minX; // L: 1619 + var8 = (var6 * var5.field2508 >> 8) + var5.maxX; // L: 1620 + var9 = (var6 * var5.field2506 >> 8) + var5.minY; // L: 1621 + var10 = (var6 * var5.field2511 >> 8) + var5.maxY; // L: 1622 + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1623 return true; } } - } else if (var5.field2669 == 4) { // L: 1647 - var6 = var3 - var5.minZ; // L: 1648 - if (var6 > 0) { // L: 1649 - var7 = (var6 * var5.field2681 >> 8) + var5.minX; // L: 1650 - var8 = (var6 * var5.field2682 >> 8) + var5.maxX; // L: 1651 - var9 = (var6 * var5.field2685 >> 8) + var5.minY; // L: 1652 - var10 = (var6 * var5.field2686 >> 8) + var5.maxY; // L: 1653 - if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1654 + } else if (var5.field2510 == 4) { // L: 1627 + var6 = var3 - var5.minZ; // L: 1628 + if (var6 > 0) { // L: 1629 + var7 = (var6 * var5.field2507 >> 8) + var5.minX; // L: 1630 + var8 = (var6 * var5.field2508 >> 8) + var5.maxX; // L: 1631 + var9 = (var6 * var5.field2506 >> 8) + var5.minY; // L: 1632 + var10 = (var6 * var5.field2511 >> 8) + var5.maxY; // L: 1633 + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1634 return true; } } - } else if (var5.field2669 == 5) { // L: 1658 - var6 = var2 - var5.minY; // L: 1659 - if (var6 > 0) { // L: 1660 - var7 = (var6 * var5.field2681 >> 8) + var5.minX; // L: 1661 - var8 = (var6 * var5.field2682 >> 8) + var5.maxX; // L: 1662 - var9 = (var6 * var5.field2683 >> 8) + var5.minZ; // L: 1663 - var10 = (var6 * var5.field2684 >> 8) + var5.maxZ; // L: 1664 - if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1665 + } else if (var5.field2510 == 5) { // L: 1638 + var6 = var2 - var5.minY; // L: 1639 + if (var6 > 0) { // L: 1640 + var7 = (var6 * var5.field2507 >> 8) + var5.minX; // L: 1641 + var8 = (var6 * var5.field2508 >> 8) + var5.maxX; // L: 1642 + var9 = (var6 * var5.field2509 >> 8) + var5.minZ; // L: 1643 + var10 = (var6 * var5.field2495 >> 8) + var5.maxZ; // L: 1644 + if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1645 return true; } } } } - return false; // L: 1670 + return false; // L: 1650 } - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("Scene_addOccluder") public static void Scene_addOccluder(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - Occluder var8 = new Occluder(); // 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 + 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 - @ObfuscatedName("at") + @ObfuscatedName("as") @Export("Scene_buildVisiblityMap") public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { - Scene_viewportXMin = 0; // L: 658 - Scene_viewportYMin = 0; // L: 659 - Scene_viewportXMax = var3; // L: 660 - Scene_viewportYMax = var4; // L: 661 - Scene_viewportXCenter = var3 / 2; // L: 662 - Scene_viewportYCenter = var4 / 2; // L: 663 - boolean[][][][] var5 = new boolean[var0.length][32][53][53]; // L: 664 + 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 int var6; int var7; @@ -2465,135 +2457,135 @@ public class Scene { int var9; int var11; int var12; - for (var6 = 128; var6 <= 383; var6 += 32) { // L: 665 - for (var7 = 0; var7 < 2048; var7 += 64) { // L: 666 - Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 667 - Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 668 - Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 669 - Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 670 - var8 = (var6 - 128) / 32; // L: 671 - var9 = var7 / 64; // L: 672 + 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 (int var10 = -26; var10 < 26; ++var10) { // L: 673 - for (var11 = -26; var11 < 26; ++var11) { // L: 674 - var12 = var10 * 128; // L: 675 - int var13 = var11 * 128; // L: 676 - boolean var14 = false; // L: 677 + 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 var15 = -var1; var15 <= var2; var15 += 128) { // L: 678 - if (method4767(var12, var0[var8] + var15, var13)) { // L: 679 - var14 = true; // L: 680 + for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 658 + if (method4062(var12, var0[var8] + var15, var13)) { // L: 659 + var14 = true; // L: 660 break; } } - var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; // L: 684 + var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; // L: 664 } } } } - for (var6 = 0; var6 < 8; ++var6) { // L: 689 - for (var7 = 0; var7 < 32; ++var7) { // L: 690 - for (var8 = -25; var8 < 25; ++var8) { // L: 691 - for (var9 = -25; var9 < 25; ++var9) { // L: 692 - boolean var16 = false; // L: 693 + 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 - label83: - for (var11 = -1; var11 <= 1; ++var11) { // L: 694 - for (var12 = -1; var12 <= 1; ++var12) { // L: 695 - if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 696 - var16 = true; // L: 697 - break label83; + 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; } - if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 700 - var16 = true; // L: 701 - break label83; // L: 702 + 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 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 704 - var16 = true; // L: 705 - break label83; // L: 706 + 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 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 708 - var16 = true; // L: 709 - break label83; // L: 710 + 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 } } } - visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; // L: 714 + visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; // L: 694 } } } } - } // L: 719 + } // L: 699 - @ObfuscatedName("an") - static boolean method4767(int var0, int var1, int var2) { - int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; // L: 722 - int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; // L: 723 - int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; // L: 724 - int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; // L: 725 - if (var5 >= 50 && var5 <= 3500) { // L: 726 - int var7 = var3 * 128 / var5 + Scene_viewportXCenter; // L: 727 - int var8 = var6 * 128 / var5 + Scene_viewportYCenter; // L: 728 - return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; // L: 729 + @ObfuscatedName("au") + static boolean method4062(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 } else { - return false; // L: 730 + return false; // L: 710 } } - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("shouldSendWalk") public static boolean shouldSendWalk() { - return viewportWalking && Scene_selectedX != -1; // L: 749 + return viewportWalking && Scene_selectedX != -1; // L: 729 } - @ObfuscatedName("ac") - public static void method4771() { - Scene_selectedX = -1; // L: 753 - viewportWalking = false; // L: 754 - } // L: 755 + @ObfuscatedName("aq") + public static void method4066() { + Scene_selectedX = -1; // L: 733 + viewportWalking = false; // L: 734 + } // L: 735 - @ObfuscatedName("ai") - static final int method4776(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; // L: 1360 - if (var1 < 2) { // L: 1361 + @ObfuscatedName("ao") + static final int method4071(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; // L: 1340 + if (var1 < 2) { // L: 1341 var1 = 2; - } else if (var1 > 126) { // L: 1362 + } else if (var1 > 126) { // L: 1342 var1 = 126; } - return (var0 & 65408) + var1; // L: 1363 + return (var0 & 65408) + var1; // L: 1343 } - @ObfuscatedName("ax") + @ObfuscatedName("av") @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: 1367 + if (var1 < var2 && var1 < var3 && var1 < var4) { // L: 1347 return false; - } else if (var1 > var2 && var1 > var3 && var1 > var4) { // L: 1368 + } else if (var1 > var2 && var1 > var3 && var1 > var4) { // L: 1348 return false; - } else if (var0 < var5 && var0 < var6 && var0 < var7) { // L: 1369 + } else if (var0 < var5 && var0 < var6 && var0 < var7) { // L: 1349 return false; - } else if (var0 > var5 && var0 > var6 && var0 > var7) { // L: 1370 + } else if (var0 > var5 && var0 > var6 && var0 > var7) { // L: 1350 return false; } else { - int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); // L: 1371 - int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); // L: 1372 - int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); // L: 1373 - if (var8 == 0) { // L: 1374 - if (var9 != 0) { // L: 1377 - return var9 < 0 ? var10 <= 0 : var10 >= 0; // L: 1378 + 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 } else { - return true; // L: 1380 + return true; // L: 1360 } } else { - return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; // L: 1375 + return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; // L: 1355 } } } diff --git a/runescape-client/src/main/java/SceneTileModel.java b/runescape-client/src/main/java/SceneTileModel.java index 7efdb3c10f..2f89bd55ab 100644 --- a/runescape-client/src/main/java/SceneTileModel.java +++ b/runescape-client/src/main/java/SceneTileModel.java @@ -2,77 +2,77 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ik") +@ObfuscatedName("hu") @Implements("SceneTileModel") public final class SceneTileModel { - @ObfuscatedName("m") - static int[] field2712; - @ObfuscatedName("u") - static int[] field2713; - @ObfuscatedName("t") - static int[] field2703; @ObfuscatedName("g") - static int[] field2706; + static int[] field2539; @ObfuscatedName("x") - static int[] field2699; - @ObfuscatedName("a") - static final int[][] field2710; - @ObfuscatedName("y") - static final int[][] field2718; - @ObfuscatedName("v") + static int[] field2540; + @ObfuscatedName("n") + static int[] field2535; + @ObfuscatedName("e") + static int[] field2545; + @ObfuscatedName("h") + static int[] field2534; + @ObfuscatedName("f") + static final int[][] field2544; + @ObfuscatedName("d") + static final int[][] field2529; + @ObfuscatedName("o") @Export("vertexX") int[] vertexX; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("vertexY") int[] vertexY; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("vertexZ") int[] vertexZ; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("triangleColorA") int[] triangleColorA; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("triangleColorB") int[] triangleColorB; - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("triangleColorC") int[] triangleColorC; - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("faceX") int[] faceX; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("faceY") int[] faceY; - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("faceZ") int[] faceZ; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("triangleTextureId") int[] triangleTextureId; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("isFlat") boolean isFlat; - @ObfuscatedName("p") + @ObfuscatedName("c") @Export("shape") int shape; @ObfuscatedName("w") @Export("rotation") int rotation; - @ObfuscatedName("k") + @ObfuscatedName("b") @Export("underlayRgb") int underlayRgb; - @ObfuscatedName("d") + @ObfuscatedName("t") @Export("overlayRgb") int overlayRgb; static { - field2712 = new int[6]; // L: 21 - field2713 = new int[6]; // L: 22 - field2703 = new int[6]; // L: 23 - field2706 = new int[6]; // L: 24 - field2699 = new int[6]; // L: 25 - field2710 = 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 - field2718 = 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 + field2539 = new int[6]; // L: 21 + field2540 = new int[6]; // L: 22 + field2535 = new int[6]; // L: 23 + field2545 = new int[6]; // L: 24 + field2534 = new int[6]; // L: 25 + field2544 = 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 + field2529 = 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 } SceneTileModel(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19) { @@ -89,7 +89,7 @@ public final class SceneTileModel { int var21 = var20 / 2; // L: 64 int var22 = var20 / 4; // L: 65 int var23 = var20 * 3 / 4; // L: 66 - int[] var24 = field2710[var1]; // L: 67 + int[] var24 = field2544[var1]; // L: 67 int var25 = var24.length; // L: 68 this.vertexX = new int[var25]; // L: 69 this.vertexY = new int[var25]; // L: 70 @@ -224,7 +224,7 @@ public final class SceneTileModel { var27[var30] = var36; // L: 202 } - int[] var38 = field2718[var1]; // L: 204 + int[] var38 = field2529[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/SceneTilePaint.java b/runescape-client/src/main/java/SceneTilePaint.java index 5df4096f5b..2980900698 100644 --- a/runescape-client/src/main/java/SceneTilePaint.java +++ b/runescape-client/src/main/java/SceneTilePaint.java @@ -3,50 +3,45 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("iv") +@ObfuscatedName("hr") @Implements("SceneTilePaint") public final class SceneTilePaint { - @ObfuscatedName("fy") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1438755039 - ) - static int field2826; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 439734561 + intValue = 1947995877 ) @Export("swColor") int swColor; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 477804517 + intValue = -1030656937 ) @Export("seColor") int seColor; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -818141463 + intValue = -126920151 ) @Export("neColor") int neColor; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1925100489 + intValue = 1841043153 ) @Export("nwColor") int nwColor; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1030512889 + intValue = 1012887619 ) @Export("texture") int texture; - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("isFlat") boolean isFlat; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1121760459 + intValue = 402871861 ) @Export("rgb") int rgb; diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index 31da83f6bb..e514cc1592 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -4,62 +4,51 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bd") +@ObfuscatedName("bb") @Implements("Script") public class Script extends DualNode { - @ObfuscatedName("sv") - @ObfuscatedGetter( - intValue = 1540125023 - ) - static int field955; - @ObfuscatedName("ud") - @ObfuscatedGetter( - intValue = 1431517737 - ) - @Export("foundItemIdCount") - static int foundItemIdCount; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; - @ObfuscatedName("c") - String field954; - @ObfuscatedName("i") + @ObfuscatedName("q") + String field949; + @ObfuscatedName("l") @Export("opcodes") int[] opcodes; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("intOperands") int[] intOperands; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("stringOperands") String[] stringOperands; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -61904285 + intValue = -1638738709 ) @Export("localIntCount") int localIntCount; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -166989853 + intValue = 2011225427 ) @Export("localStringCount") int localStringCount; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 2085074269 + intValue = -1425203371 ) @Export("intArgumentCount") int intArgumentCount; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 832856221 + intValue = 2038288745 ) @Export("stringArgumentCount") int stringArgumentCount; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "[Lpt;" ) @@ -67,111 +56,59 @@ public class Script extends DualNode { IterableNodeHashTable[] switches; static { - Script_cached = new EvictingDualNodeHashTable(128); + Script_cached = new EvictingDualNodeHashTable(128); // L: 12 } Script() { - } + } // L: 23 - @ObfuscatedName("b") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)[Lpt;", - garbageValue = "1023486381" + descriptor = "(IB)[Lpt;", + garbageValue = "0" ) @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { - return new IterableNodeHashTable[var1]; // L: 122 + return new IterableNodeHashTable[var1]; // L: 155 } - @ObfuscatedName("v") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-881844017" + descriptor = "(II)Lfb;", + garbageValue = "16711680" ) - static String method1990(int var0) { - return ""; // L: 18 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "108796867" - ) - public static int method1996(int var0, int var1, int var2) { - var2 &= 3; // L: 9 - if (var2 == 0) { // L: 10 - return var0; - } else if (var2 == 1) { // L: 11 + @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 { - return var2 == 2 ? 7 - var0 : 7 - var1; // L: 12 13 - } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)Lfl;", - garbageValue = "2129001923" - ) - @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 + byte[] var2 = class18.KitDefinition_archive.takeFile(3, var0); // L: 35 + var1 = new KitDefinition(); // L: 36 + if (var2 != null) { // L: 37 var1.decode(new Buffer(var2)); } - InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 26 - return var1; // L: 27 + KitDefinition.KitDefinition_cached.put(var1, (long)var0); // L: 38 + return var1; // L: 39 } } - @ObfuscatedName("kd") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lcc;ZS)V", - garbageValue = "7462" + descriptor = "(Lki;IB)V", + garbageValue = "11" ) - @Export("closeInterface") - static final void closeInterface(InterfaceParent var0, boolean var1) { - int var2 = var0.group; // L: 12167 - int var3 = (int)var0.key; // L: 12168 - var0.remove(); // L: 12169 - if (var1 && var2 != -1 && WorldMapSectionType.Widget_loadedInterfaces[var2]) { // L: 12170 12171 12172 - Widget.Widget_archive.clearFilesGroup(var2); // L: 12173 - if (Widget.Widget_interfaceComponents[var2] != null) { // L: 12174 - boolean var4 = true; // L: 12175 - - for (int var5 = 0; var5 < Widget.Widget_interfaceComponents[var2].length; ++var5) { // L: 12176 - if (Widget.Widget_interfaceComponents[var2][var5] != null) { // L: 12177 - if (Widget.Widget_interfaceComponents[var2][var5].type != 2) { // L: 12178 - Widget.Widget_interfaceComponents[var2][var5] = null; - } else { - var4 = false; // L: 12179 - } - } - } - - if (var4) { // L: 12182 - Widget.Widget_interfaceComponents[var2] = null; - } - - WorldMapSectionType.Widget_loadedInterfaces[var2] = false; // L: 12183 + @Export("Widget_setKeyIgnoreHeld") + static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { + if (var0.field3474 == null) { // L: 1020 + throw new RuntimeException(); // L: 1021 + } else { + if (var0.field3527 == null) { // L: 1023 + var0.field3527 = new int[var0.field3474.length]; // L: 1024 } - } - class29.method403(var2); // L: 12185 - Widget var6 = class127.getWidget(var3); // L: 12186 - if (var6 != null) { // L: 12187 - class346.invalidateWidget(var6); + var0.field3527[var1] = Integer.MAX_VALUE; // L: 1026 } - - if (Client.rootInterface != -1) { // L: 12188 - MouseRecorder.runIntfCloseListeners(Client.rootInterface, 1); - } - - } // L: 12189 + } // L: 1027 } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 5969be5c73..0701e5f15a 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -4,73 +4,74 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ch") +@ObfuscatedName("cr") @Implements("ScriptEvent") public class ScriptEvent extends Node { - @ObfuscatedName("hr") - @ObfuscatedGetter( - intValue = -1925838321 + @ObfuscatedName("ic") + @ObfuscatedSignature( + descriptor = "[Lqd;" ) - static int field1042; - @ObfuscatedName("v") + @Export("modIconSprites") + static IndexedSprite[] modIconSprites; + @ObfuscatedName("o") @Export("args") Object[] args; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("isMouseInputEvent") boolean isMouseInputEvent; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Lki;" ) @Export("widget") Widget widget; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 736658407 + intValue = 1486957431 ) @Export("mouseX") int mouseX; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1446872253 + intValue = -2142202081 ) @Export("mouseY") int mouseY; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -2054800039 + intValue = 19118051 ) @Export("opIndex") int opIndex; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Lki;" ) @Export("dragTarget") Widget dragTarget; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2138407541 + intValue = -337661445 ) @Export("keyTyped") int keyTyped; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 606437039 + intValue = -2123703635 ) @Export("keyPressed") int keyPressed; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("targetName") String targetName; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -2094030297 + intValue = 702616363 ) - int field1031; - @ObfuscatedName("p") + int field1054; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -2085929869 + intValue = -394904135 ) @Export("type") int type; @@ -79,37 +80,67 @@ public class ScriptEvent extends Node { this.type = 76; // L: 19 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([Ljava/lang/Object;I)V", - garbageValue = "-578941506" + descriptor = "([Ljava/lang/Object;B)V", + garbageValue = "3" ) @Export("setArgs") public void setArgs(Object[] var1) { this.args = var1; // L: 22 } // L: 23 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "551800403" + garbageValue = "1156737002" ) @Export("setType") public void setType(int var1) { - this.type = var1; // L: 26 - } // L: 27 + this.type = var1; + } - @ObfuscatedName("iv") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIIS)V", - garbageValue = "-6716" + descriptor = "(I)V", + garbageValue = "520194545" ) - static final void method2092(int var0, int var1, int var2, int var3) { - for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 8661 - if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetYs[var4] + Client.rootWidgetHeights[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { // L: 8662 - Client.field716[var4] = true; + static void method2074() { + class82.field1072 = new int[2000]; // L: 25 + int var0 = 0; // L: 26 + int var1 = 240; + + int var3; + for (byte var2 = 12; var0 < 16; var1 -= var2) { + var3 = class127.method2805((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)(0.075F + (float)var0 * 0.425F / 16.0F)); // L: 30 + class82.field1072[var0] = var3; // L: 31 + ++var0; // L: 29 + } + + var1 = 48; // L: 33 + + for (int var5 = var1 / 6; var0 < class82.field1072.length; var1 -= var5) { // L: 34 35 41 + var3 = var0 * 2; // L: 36 + + for (int var4 = class127.method2805((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < class82.field1072.length; ++var0) { // L: 37 38 + class82.field1072[var0] = var4; // L: 39 } } - } // L: 8664 + } // L: 43 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZZI)V", + garbageValue = "-1817866678" + ) + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { + World.method1663(var0, var1, "openjs", var2); // L: 27 + } // L: 28 + + @ObfuscatedName("p") + public static int method2085(long var0) { + return (int)(var0 >>> 7 & 127L); // L: 68 + } } diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index cf5b9c21c6..3a0ab0ae0c 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -3,33 +3,39 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bl") +@ObfuscatedName("bc") @Implements("ScriptFrame") public class ScriptFrame { - @ObfuscatedName("uq") - @ObfuscatedSignature( - descriptor = "Lov;" + @ObfuscatedName("tq") + @ObfuscatedGetter( + intValue = -1251502185 ) - @Export("worldMap") - static WorldMap worldMap; - @ObfuscatedName("v") + static int field457; + @ObfuscatedName("m") + @Export("SpriteBuffer_spriteWidths") + public static int[] SpriteBuffer_spriteWidths; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1911995335 + ) + static int field449; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lbd;" + descriptor = "Lbb;" ) @Export("script") Script script; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1104135589 + intValue = 1536799167 ) @Export("pc") int pc; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("intLocals") int[] intLocals; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("stringLocals") String[] stringLocals; @@ -37,928 +43,15 @@ public class ScriptFrame { this.pc = -1; // L: 5 } // L: 9 - @ObfuscatedName("au") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "74" + descriptor = "(IB)V", + garbageValue = "125" ) - static int method1085(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3917 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = TileItem.loadWorlds() ? 1 : 0; // L: 3918 - return 1; // L: 3919 - } else { - World var9; - if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3921 - var9 = SecureRandomCallable.worldListStart(); // L: 3922 - if (var9 != null) { // L: 3923 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.id; // L: 3924 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.properties; // L: 3925 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var9.activity; // L: 3926 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.location; // L: 3927 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.population; // L: 3928 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var9.host; // L: 3929 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3932 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3933 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3934 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3935 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3936 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3937 - } - - return 1; // L: 3939 - } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3941 - var9 = class305.getNextWorldListWorld(); // L: 3942 - if (var9 != null) { // L: 3943 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.id; // L: 3944 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.properties; // L: 3945 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var9.activity; // L: 3946 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.location; // L: 3947 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.population; // L: 3948 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var9.host; // L: 3949 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3952 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3953 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3954 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3955 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3956 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3957 - } - - return 1; // L: 3959 - } else { - int var3; - World var7; - int var8; - if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3961 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3962 - var7 = null; // L: 3963 - - for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3964 - if (var3 == DevicePcmPlayerProvider.World_worlds[var8].id) { // L: 3965 - var7 = DevicePcmPlayerProvider.World_worlds[var8]; // L: 3966 - break; - } - } - - if (var7 != null) { // L: 3970 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.id; // L: 3971 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.properties; // L: 3972 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var7.activity; // L: 3973 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.location; // L: 3974 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.population; // L: 3975 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var7.host; // L: 3976 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3979 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3980 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3981 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3982 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3983 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3984 - } - - return 1; // L: 3986 - } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3988 - Interpreter.Interpreter_intStackSize -= 4; // L: 3989 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3990 - boolean var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 3991 - var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3992 - boolean var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3] == 1; // L: 3993 - class204.sortWorldList(var3, var10, var8, var6); // L: 3994 - return 1; // L: 3995 - } else if (var0 != 6511) { // L: 3997 - if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 4018 - Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 4019 - return 1; // L: 4020 - } else { - int var4; - ParamComposition var5; - if (var0 == ScriptOpcodes.NC_PARAM) { // L: 4022 - Interpreter.Interpreter_intStackSize -= 2; // L: 4023 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4024 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 4025 - var5 = class151.getParamDefinition(var4); // L: 4026 - if (var5.isString()) { // L: 4027 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = KeyHandler.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 4028 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = KeyHandler.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 4031 - } - - return 1; // L: 4033 - } else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 4035 - Interpreter.Interpreter_intStackSize -= 2; // L: 4036 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4037 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 4038 - var5 = class151.getParamDefinition(var4); // L: 4039 - if (var5.isString()) { // L: 4040 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = class146.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 4041 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class146.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 4044 - } - - return 1; // L: 4046 - } else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 4048 - Interpreter.Interpreter_intStackSize -= 2; // L: 4049 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4050 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 4051 - var5 = class151.getParamDefinition(var4); // L: 4052 - if (var5.isString()) { // L: 4053 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = class19.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 4054 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class19.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 4057 - } - - return 1; // L: 4059 - } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 4061 - Interpreter.Interpreter_intStackSize -= 2; // L: 4062 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4063 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 4064 - var5 = class151.getParamDefinition(var4); // L: 4065 - if (var5.isString()) { // L: 4066 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ObjectComposition.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 4067 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ObjectComposition.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 4070 - } - - return 1; // L: 4072 - } else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 4074 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 4075 - return 1; // L: 4076 - } else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 4078 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.clientType; // L: 4079 - return 1; // L: 4080 - } else if (var0 == 6520) { // L: 4082 - return 1; // L: 4083 - } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 4085 - return 1; // L: 4086 - } else if (var0 == 6522) { // L: 4088 - --class122.Interpreter_stringStackSize; // L: 4089 - --Interpreter.Interpreter_intStackSize; // L: 4090 - return 1; // L: 4091 - } else if (var0 == 6523) { // L: 4093 - --class122.Interpreter_stringStackSize; // L: 4094 - --Interpreter.Interpreter_intStackSize; // L: 4095 - return 1; // L: 4096 - } else if (var0 == ScriptOpcodes.MOBILE_BATTERYLEVEL) { // L: 4098 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4099 - return 1; // L: 4100 - } else if (var0 == ScriptOpcodes.MOBILE_BATTERYCHARGING) { // L: 4102 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 4103 - return 1; // L: 4104 - } else if (var0 == ScriptOpcodes.MOBILE_WIFIAVAILABLE) { // L: 4106 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 4107 - return 1; // L: 4108 - } else if (var0 == 6527) { // L: 4110 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.field498; // L: 4111 - return 1; // L: 4112 - } else { - return 2; // L: 4114 - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3998 - if (var3 >= 0 && var3 < World.World_count) { // L: 3999 - var7 = DevicePcmPlayerProvider.World_worlds[var3]; // L: 4000 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.id; // L: 4001 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.properties; // L: 4002 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var7.activity; // L: 4003 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.location; // L: 4004 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.population; // L: 4005 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var7.host; // L: 4006 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4009 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4010 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 4011 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4012 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4013 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 4014 - } - - return 1; // L: 4016 - } - } + static void method1066(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72 + if (var1 != null) { + var1.remove(); // L: 74 } - } - - @ObfuscatedName("fj") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "377425883" - ) - @Export("getLoginError") - static void getLoginError(int var0) { - if (var0 == -3) { // L: 2764 - class4.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); - } else if (var0 == -2) { // L: 2765 - class4.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); - } else if (var0 == -1) { // L: 2766 - class4.setLoginResponseString("No response from server.", "Please try using a different world.", ""); - } else if (var0 == 3) { // L: 2767 - Ignored.method6828(3); // L: 2768 - Login.field895 = 1; // L: 2769 - } else if (var0 == 4) { // L: 2771 - class267.method5196(0); // L: 2772 - } else if (var0 == 5) { // L: 2774 - Login.field895 = 2; // L: 2775 - class4.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: 2776 - } else if (var0 == 68 || !Client.onMobile && var0 == 6) { // L: 2778 - class4.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2779 - } else if (var0 == 7) { // L: 2781 - class4.setLoginResponseString("This world is full.", "Please use a different world.", ""); - } else if (var0 == 8) { // L: 2782 - class4.setLoginResponseString("Unable to connect.", "Login server offline.", ""); - } else if (var0 == 9) { // L: 2783 - class4.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); - } else if (var0 == 10) { // L: 2784 - class4.setLoginResponseString("Unable to connect.", "Bad session id.", ""); - } else if (var0 == 11) { // L: 2785 - class4.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); - } else if (var0 == 12) { // L: 2786 - class4.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if (var0 == 13) { // L: 2787 - class4.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); - } else if (var0 == 14) { // L: 2788 - class4.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 16) { // L: 2789 - class4.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); - } else if (var0 == 17) { // L: 2790 - class4.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: 2791 - class267.method5196(1); // L: 2792 - } else if (var0 == 19) { // L: 2794 - class4.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if (var0 == 20) { // L: 2795 - class4.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if (var0 == 22) { // L: 2796 - class4.setLoginResponseString("Malformed login packet.", "Please try again.", ""); - } else if (var0 == 23) { // L: 2797 - class4.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 24) { // L: 2798 - class4.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); - } else if (var0 == 25) { // L: 2799 - class4.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if (var0 == 26) { // L: 2800 - class4.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if (var0 == 27) { // L: 2801 - class4.setLoginResponseString("", "Service unavailable.", ""); - } else if (var0 == 31) { // L: 2802 - class4.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: 2803 - class4.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: 2804 - class4.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if (var0 == 38) { // L: 2805 - class4.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); - } else if (var0 == 55) { // L: 2806 - Ignored.method6828(8); // L: 2807 - } else { - if (var0 == 56) { // L: 2809 - class4.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2810 - Decimator.updateGameState(11); // L: 2811 - return; // L: 2812 - } - - if (var0 == 57) { // L: 2814 - class4.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2815 - Decimator.updateGameState(11); // L: 2816 - return; // L: 2817 - } - - if (var0 == 61) { // L: 2819 - class4.setLoginResponseString("", "Please enter your date of birth (DD/MM/YYYY)", ""); // L: 2820 - Ignored.method6828(7); // L: 2821 - } else { - if (var0 == 62) { // L: 2823 - Decimator.updateGameState(10); // L: 2824 - Ignored.method6828(9); // L: 2825 - class4.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); // L: 2826 - return; // L: 2827 - } - - if (var0 == 63) { // L: 2829 - Decimator.updateGameState(10); // L: 2830 - Ignored.method6828(9); // L: 2831 - class4.setLoginResponseString("You were signed out.", "Please sign in again.", ""); // L: 2832 - return; // L: 2833 - } - - if (var0 == 65 || var0 == 67) { // L: 2835 - Decimator.updateGameState(10); // L: 2836 - Ignored.method6828(9); // L: 2837 - class4.setLoginResponseString("Failed to login.", "Please try again.", ""); // L: 2838 - return; // L: 2839 - } - - if (var0 == 71) { // L: 2841 - Decimator.updateGameState(10); // L: 2842 - Ignored.method6828(7); // L: 2843 - class4.setLoginResponseString("There was a problem updating your DOB.", "Please try again later. If the problem ", "persists, please contact Jagex Support."); // L: 2844 - } else { - class4.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 2846 - } - } - } - - Decimator.updateGameState(10); // L: 2847 - if (Client.field532.method7928()) { // L: 2848 - Ignored.method6828(9); // L: 2849 - } - - } // L: 2851 - - @ObfuscatedName("hr") - @ObfuscatedSignature( - descriptor = "(Lcb;IIIIII)V", - garbageValue = "692099527" - ) - @Export("drawActor2d") - static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { - if (var0 != null && var0.isVisible()) { // L: 4877 - if (var0 instanceof NPC) { // L: 4878 - NPCComposition var6 = ((NPC)var0).definition; // L: 4879 - if (var6.transforms != null) { // L: 4880 - var6 = var6.transform(); - } - - if (var6 == null) { // L: 4881 - return; - } - } - - int var75 = Players.Players_count; // L: 4883 - int[] var7 = Players.Players_indices; // L: 4884 - byte var8 = 0; // L: 4885 - if (var1 < var75 && var0.playerCycle == Client.cycle && PacketBufferNode.method5188((Player)var0)) { // L: 4886 - Player var9 = (Player)var0; // L: 4887 - if (var1 < var75) { // L: 4888 - class93.method2376(var0, var0.defaultHeight + 15); // L: 4889 - AbstractFont var10 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 4890 - byte var11 = 9; // L: 4891 - var10.drawCentered(var9.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var11, 16777215, 0); // L: 4892 - var8 = 18; // L: 4893 - } - } - - int var76 = -2; // L: 4896 - int var15; - int var22; - int var23; - if (!var0.healthBars.method6164()) { // L: 4897 - class93.method2376(var0, var0.defaultHeight + 15); // L: 4898 - - for (HealthBar var87 = (HealthBar)var0.healthBars.last(); var87 != null; var87 = (HealthBar)var0.healthBars.previous()) { // L: 4899 - HealthBarUpdate var79 = var87.get(Client.cycle); // L: 4900 - if (var79 == null) { // L: 4901 - if (var87.isEmpty()) { // L: 4959 - var87.remove(); - } - } else { - HealthBarDefinition var80 = var87.definition; // L: 4902 - SpritePixels var13 = var80.getBackSprite(); // L: 4903 - SpritePixels var81 = var80.getFrontSprite(); // L: 4904 - int var82 = 0; // L: 4906 - if (var13 != null && var81 != null) { // L: 4907 - if (var80.widthPadding * 2 < var81.subWidth) { // L: 4908 - var82 = var80.widthPadding; - } - - var15 = var81.subWidth - var82 * 2; // L: 4909 - } else { - var15 = var80.width; // L: 4911 - } - - int var17 = 255; // L: 4912 - boolean var83 = true; // L: 4913 - int var84 = Client.cycle - var79.cycle; // L: 4914 - int var85 = var15 * var79.health2 / var80.width; // L: 4915 - int var86; - int var93; - if (var79.cycleOffset > var84) { // L: 4916 - var86 = var80.field1866 == 0 ? 0 : var80.field1866 * (var84 / var80.field1866); // L: 4917 - var22 = var15 * var79.health / var80.width; // L: 4918 - var93 = var86 * (var85 - var22) / var79.cycleOffset + var22; // L: 4919 - } else { - var93 = var85; // L: 4922 - var86 = var80.int5 + var79.cycleOffset - var84; // L: 4923 - if (var80.int3 >= 0) { // L: 4924 - var17 = (var86 << 8) / (var80.int5 - var80.int3); - } - } - - if (var79.health2 > 0 && var93 < 1) { // L: 4926 - var93 = 1; - } - - if (var13 != null && var81 != null) { // L: 4927 - if (var15 == var93) { // L: 4928 - var93 += var82 * 2; - } else { - var93 += var82; // L: 4929 - } - - var86 = var13.subHeight; // L: 4930 - var76 += var86; // L: 4931 - var22 = var2 + Client.viewportTempX - (var15 >> 1); // L: 4932 - var23 = var3 + Client.viewportTempY - var76; // L: 4933 - var22 -= var82; // L: 4934 - if (var17 >= 0 && var17 < 255) { // L: 4935 - var13.drawTransAt(var22, var23, var17); // L: 4936 - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var93, var86 + var23); // L: 4937 - var81.drawTransAt(var22, var23, var17); // L: 4938 - } else { - var13.drawTransBgAt(var22, var23); // L: 4941 - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var93, var86 + var23); // L: 4942 - var81.drawTransBgAt(var22, var23); // L: 4943 - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 4945 - var76 += 2; // L: 4946 - } else { - var76 += 5; // L: 4949 - if (Client.viewportTempX > -1) { // L: 4950 - var86 = var2 + Client.viewportTempX - (var15 >> 1); // L: 4951 - var22 = var3 + Client.viewportTempY - var76; // L: 4952 - Rasterizer2D.Rasterizer2D_fillRectangle(var86, var22, var93, 5, 65280); // L: 4953 - Rasterizer2D.Rasterizer2D_fillRectangle(var86 + var93, var22, var15 - var93, 5, 16711680); // L: 4954 - } - - var76 += 2; // L: 4956 - } - } - } - } - - if (var76 == -2) { // L: 4962 - var76 += 7; - } - - var76 += var8; // L: 4963 - if (var1 < var75) { // L: 4964 - Player var88 = (Player)var0; // L: 4965 - if (var88.isHidden) { // L: 4966 - return; - } - - if (var88.headIconPk != -1 || var88.headIconPrayer != -1) { // L: 4967 - class93.method2376(var0, var0.defaultHeight + 15); // L: 4968 - if (Client.viewportTempX > -1) { // L: 4969 - if (var88.headIconPk != -1) { // L: 4970 - var76 += 25; // L: 4971 - class150.headIconPkSprites[var88.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4972 - } - - if (var88.headIconPrayer != -1) { // L: 4974 - var76 += 25; // L: 4975 - WallDecoration.headIconPrayerSprites[var88.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4976 - } - } - } - - if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 4980 - class93.method2376(var0, var0.defaultHeight + 15); // L: 4981 - if (Client.viewportTempX > -1) { // L: 4982 - var76 += InvDefinition.headIconHintSprites[1].subHeight; // L: 4983 - InvDefinition.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4984 - } - } - } else { - NPCComposition var89 = ((NPC)var0).definition; // L: 4989 - if (var89.transforms != null) { // L: 4990 - var89 = var89.transform(); - } - - if (var89.headIconPrayer >= 0 && var89.headIconPrayer < WallDecoration.headIconPrayerSprites.length) { // L: 4991 - class93.method2376(var0, var0.defaultHeight + 15); // L: 4992 - if (Client.viewportTempX > -1) { // L: 4993 - WallDecoration.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 4994 - } - } - - if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 4997 - class93.method2376(var0, var0.defaultHeight + 15); // L: 4998 - if (Client.viewportTempX > -1) { // L: 4999 - InvDefinition.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); - } - } - } - - if (var0.overheadText != null && (var1 >= var75 || !var0.field1130 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 5002 5003 - class93.method2376(var0, var0.defaultHeight); // L: 5004 - if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 5005 - Client.overheadTextXOffsets[Client.overheadTextCount] = RouteStrategy.fontBold12.stringWidth(var0.overheadText) / 2; // L: 5006 - Client.overheadTextAscents[Client.overheadTextCount] = RouteStrategy.fontBold12.ascent; // L: 5007 - Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 5008 - Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 5009 - Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 5010 - Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 5011 - Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 5012 - Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 5013 - ++Client.overheadTextCount; // L: 5014 - } - } - - for (int var77 = 0; var77 < 4; ++var77) { // L: 5018 - int var90 = var0.hitSplatCycles[var77]; // L: 5019 - int var12 = var0.hitSplatTypes[var77]; // L: 5020 - HitSplatDefinition var91 = null; // L: 5021 - int var14 = 0; // L: 5022 - if (var12 >= 0) { // L: 5023 - if (var90 <= Client.cycle) { // L: 5024 - continue; - } - - var91 = UserComparator3.method2602(var0.hitSplatTypes[var77]); // L: 5025 - var14 = var91.field1998; // L: 5026 - if (var91 != null && var91.transforms != null) { // L: 5027 - var91 = var91.transform(); // L: 5028 - if (var91 == null) { // L: 5029 - var0.hitSplatCycles[var77] = -1; // L: 5030 - continue; // L: 5031 - } - } - } else if (var90 < 0) { // L: 5035 - continue; - } - - var15 = var0.hitSplatTypes2[var77]; // L: 5036 - HitSplatDefinition var16 = null; // L: 5037 - if (var15 >= 0) { // L: 5038 - var16 = UserComparator3.method2602(var15); // L: 5039 - if (var16 != null && var16.transforms != null) { // L: 5040 - var16 = var16.transform(); - } - } - - if (var90 - var14 <= Client.cycle) { // L: 5042 - if (var91 == null) { // L: 5043 - var0.hitSplatCycles[var77] = -1; // L: 5044 - } else { - class93.method2376(var0, var0.defaultHeight / 2); // L: 5047 - if (Client.viewportTempX > -1) { // L: 5048 - if (var77 == 1) { // L: 5050 - Client.viewportTempY -= 20; // L: 5051 - } - - if (var77 == 2) { // L: 5053 - Client.viewportTempX -= 15; // L: 5054 - Client.viewportTempY -= 10; // L: 5055 - } - - if (var77 == 3) { // L: 5057 - Client.viewportTempX += 15; // L: 5058 - Client.viewportTempY -= 10; // L: 5059 - } - - SpritePixels var18 = null; // L: 5061 - SpritePixels var19 = null; // L: 5062 - SpritePixels var20 = null; // L: 5063 - SpritePixels var21 = null; // L: 5064 - var22 = 0; // L: 5065 - var23 = 0; // L: 5066 - int var24 = 0; // L: 5067 - int var25 = 0; // L: 5068 - int var26 = 0; // L: 5069 - int var27 = 0; // L: 5070 - int var28 = 0; // L: 5071 - int var29 = 0; // L: 5072 - SpritePixels var30 = null; // L: 5073 - SpritePixels var31 = null; // L: 5074 - SpritePixels var32 = null; // L: 5075 - SpritePixels var33 = null; // L: 5076 - int var34 = 0; // L: 5077 - int var35 = 0; // L: 5078 - int var36 = 0; // L: 5079 - int var37 = 0; // L: 5080 - int var38 = 0; // L: 5081 - int var39 = 0; // L: 5082 - int var40 = 0; // L: 5083 - int var41 = 0; // L: 5084 - int var42 = 0; // L: 5085 - var18 = var91.method3625(); // L: 5086 - int var43; - if (var18 != null) { // L: 5087 - var22 = var18.subWidth; // L: 5088 - var43 = var18.subHeight; // L: 5089 - if (var43 > var42) { // L: 5090 - var42 = var43; - } - - var26 = var18.xOffset; // L: 5091 - } - - var19 = var91.method3640(); // L: 5093 - if (var19 != null) { // L: 5094 - var23 = var19.subWidth; // L: 5095 - var43 = var19.subHeight; // L: 5096 - if (var43 > var42) { // L: 5097 - var42 = var43; - } - - var27 = var19.xOffset; // L: 5098 - } - - var20 = var91.method3626(); // L: 5100 - if (var20 != null) { // L: 5101 - var24 = var20.subWidth; // L: 5102 - var43 = var20.subHeight; // L: 5103 - if (var43 > var42) { // L: 5104 - var42 = var43; - } - - var28 = var20.xOffset; // L: 5105 - } - - var21 = var91.method3627(); // L: 5107 - if (var21 != null) { // L: 5108 - var25 = var21.subWidth; // L: 5109 - var43 = var21.subHeight; // L: 5110 - if (var43 > var42) { // L: 5111 - var42 = var43; - } - - var29 = var21.xOffset; // L: 5112 - } - - if (var16 != null) { // L: 5114 - var30 = var16.method3625(); // L: 5115 - if (var30 != null) { // L: 5116 - var34 = var30.subWidth; // L: 5117 - var43 = var30.subHeight; // L: 5118 - if (var43 > var42) { // L: 5119 - var42 = var43; - } - - var38 = var30.xOffset; // L: 5120 - } - - var31 = var16.method3640(); // L: 5122 - if (var31 != null) { // L: 5123 - var35 = var31.subWidth; // L: 5124 - var43 = var31.subHeight; // L: 5125 - if (var43 > var42) { // L: 5126 - var42 = var43; - } - - var39 = var31.xOffset; // L: 5127 - } - - var32 = var16.method3626(); // L: 5129 - if (var32 != null) { // L: 5130 - var36 = var32.subWidth; // L: 5131 - var43 = var32.subHeight; // L: 5132 - if (var43 > var42) { // L: 5133 - var42 = var43; - } - - var40 = var32.xOffset; // L: 5134 - } - - var33 = var16.method3627(); // L: 5136 - if (var33 != null) { // L: 5137 - var37 = var33.subWidth; // L: 5138 - var43 = var33.subHeight; // L: 5139 - if (var43 > var42) { // L: 5140 - var42 = var43; - } - - var41 = var33.xOffset; // L: 5141 - } - } - - Font var78 = var91.getFont(); // L: 5146 - if (var78 == null) { // L: 5147 - var78 = class113.fontPlain11; - } - - Font var44; - if (var16 != null) { // L: 5148 - var44 = var16.getFont(); // L: 5149 - if (var44 == null) { // L: 5150 - var44 = class113.fontPlain11; - } - } else { - var44 = class113.fontPlain11; // L: 5152 - } - - String var45 = null; // L: 5153 - String var46 = null; // L: 5154 - boolean var47 = false; // L: 5155 - int var48 = 0; // L: 5156 - var45 = var91.getString(var0.hitSplatValues[var77]); // L: 5157 - int var92 = var78.stringWidth(var45); // L: 5158 - if (var16 != null) { // L: 5159 - var46 = var16.getString(var0.hitSplatValues2[var77]); // L: 5160 - var48 = var44.stringWidth(var46); // L: 5161 - } - - int var49 = 0; // L: 5163 - int var50 = 0; // L: 5164 - if (var23 > 0) { // L: 5165 - if (var20 == null && var21 == null) { // L: 5166 - var49 = 1; // L: 5167 - } else { - var49 = var92 / var23 + 1; - } - } - - if (var16 != null && var35 > 0) { // L: 5169 5170 - if (var32 == null && var33 == null) { // L: 5171 - var50 = 1; // L: 5172 - } else { - var50 = var48 / var35 + 1; - } - } - - int var51 = 0; // L: 5175 - int var52 = var51; // L: 5176 - if (var22 > 0) { // L: 5177 - var51 += var22; - } - - var51 += 2; // L: 5178 - int var53 = var51; // L: 5179 - if (var24 > 0) { // L: 5180 - var51 += var24; - } - - int var54 = var51; // L: 5181 - int var55 = var51; // L: 5182 - int var56; - if (var23 > 0) { // L: 5183 - var56 = var23 * var49; // L: 5184 - var51 += var56; // L: 5185 - var55 += (var56 - var92) / 2; // L: 5186 - } else { - var51 += var92; // L: 5189 - } - - var56 = var51; // L: 5191 - if (var25 > 0) { // L: 5192 - var51 += var25; - } - - int var57 = 0; // L: 5193 - int var58 = 0; // L: 5194 - int var59 = 0; // L: 5195 - int var60 = 0; // L: 5196 - int var61 = 0; // L: 5197 - int var62; - if (var16 != null) { // L: 5198 - var51 += 2; // L: 5199 - var57 = var51; // L: 5200 - if (var34 > 0) { // L: 5201 - var51 += var34; - } - - var51 += 2; // L: 5202 - var58 = var51; // L: 5203 - if (var36 > 0) { // L: 5204 - var51 += var36; - } - - var59 = var51; // L: 5205 - var61 = var51; // L: 5206 - if (var35 > 0) { // L: 5207 - var62 = var35 * var50; // L: 5208 - var51 += var62; // L: 5209 - var61 += (var62 - var48) / 2; // L: 5210 - } else { - var51 += var48; // L: 5213 - } - - var60 = var51; // L: 5215 - if (var37 > 0) { // L: 5216 - var51 += var37; - } - } - - var62 = var0.hitSplatCycles[var77] - Client.cycle; // L: 5218 - int var63 = var91.field2003 - var62 * var91.field2003 / var91.field1998; // L: 5219 - int var64 = var62 * var91.field2004 / var91.field1998 + -var91.field2004; // L: 5220 - int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); // L: 5221 - int var66 = var64 + (var3 + Client.viewportTempY - 12); // L: 5222 - int var67 = var66; // L: 5223 - int var68 = var42 + var66; // L: 5224 - int var69 = var66 + var91.field2011 + 15; // L: 5225 - int var70 = var69 - var78.maxAscent; // L: 5226 - int var71 = var69 + var78.maxDescent; // L: 5227 - if (var70 < var66) { // L: 5228 - var67 = var70; - } - - if (var71 > var68) { // L: 5229 - var68 = var71; - } - - int var72 = 0; // L: 5230 - int var73; - int var74; - if (var16 != null) { // L: 5231 - var72 = var66 + var16.field2011 + 15; // L: 5232 - var73 = var72 - var44.maxAscent; // L: 5233 - var74 = var72 + var44.maxDescent; // L: 5234 - if (var73 < var67) { // L: 5235 - ; - } - - if (var74 > var68) { // L: 5236 - ; - } - } - - var73 = 255; // L: 5238 - if (var91.field2005 >= 0) { // L: 5239 - var73 = (var62 << 8) / (var91.field1998 - var91.field2005); - } - - if (var73 >= 0 && var73 < 255) { // L: 5240 - if (var18 != null) { // L: 5241 - var18.drawTransAt(var65 + var52 - var26, var66, var73); - } - - if (var20 != null) { // L: 5242 - var20.drawTransAt(var53 + var65 - var28, var66, var73); - } - - if (var19 != null) { // L: 5243 - for (var74 = 0; var74 < var49; ++var74) { // L: 5244 - var19.drawTransAt(var74 * var23 + (var54 + var65 - var27), var66, var73); // L: 5245 - } - } - - if (var21 != null) { // L: 5248 - var21.drawTransAt(var65 + var56 - var29, var66, var73); - } - - var78.drawAlpha(var45, var55 + var65, var69, var91.textColor, 0, var73); // L: 5249 - if (var16 != null) { // L: 5250 - if (var30 != null) { // L: 5251 - var30.drawTransAt(var65 + var57 - var38, var66, var73); - } - - if (var32 != null) { // L: 5252 - var32.drawTransAt(var65 + var58 - var40, var66, var73); - } - - if (var31 != null) { // L: 5253 - for (var74 = 0; var74 < var50; ++var74) { // L: 5254 - var31.drawTransAt(var74 * var35 + (var59 + var65 - var39), var66, var73); // L: 5255 - } - } - - if (var33 != null) { // L: 5258 - var33.drawTransAt(var60 + var65 - var41, var66, var73); - } - - var44.drawAlpha(var46, var61 + var65, var72, var16.textColor, 0, var73); // L: 5259 - } - } else { - if (var18 != null) { // L: 5263 - var18.drawTransBgAt(var52 + var65 - var26, var66); - } - - if (var20 != null) { // L: 5264 - var20.drawTransBgAt(var53 + var65 - var28, var66); - } - - if (var19 != null) { // L: 5265 - for (var74 = 0; var74 < var49; ++var74) { // L: 5266 - var19.drawTransBgAt(var23 * var74 + (var54 + var65 - var27), var66); // L: 5267 - } - } - - if (var21 != null) { // L: 5270 - var21.drawTransBgAt(var56 + var65 - var29, var66); - } - - var78.draw(var45, var55 + var65, var69, var91.textColor | -16777216, 0); // L: 5271 - if (var16 != null) { // L: 5272 - if (var30 != null) { // L: 5273 - var30.drawTransBgAt(var57 + var65 - var38, var66); - } - - if (var32 != null) { // L: 5274 - var32.drawTransBgAt(var58 + var65 - var40, var66); - } - - if (var31 != null) { // L: 5275 - for (var74 = 0; var74 < var50; ++var74) { // L: 5276 - var31.drawTransBgAt(var35 * var74 + (var65 + var59 - var39), var66); // L: 5277 - } - } - - if (var33 != null) { // L: 5280 - var33.drawTransBgAt(var65 + var60 - var41, var66); - } - - var44.draw(var46, var61 + var65, var72, var16.textColor | -16777216, 0); // L: 5281 - } - } - } - } - } - } - - } - } // L: 5286 + } // L: 73 75 } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 7e08ec567a..4183e54d9d 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -2,93 +2,127 @@ import java.security.SecureRandom; import java.util.concurrent.Callable; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bu") +@ObfuscatedName("bg") @Implements("SecureRandomCallable") public class SecureRandomCallable implements Callable { + @ObfuscatedName("ss") + @ObfuscatedSignature( + descriptor = "Lal;" + ) + @Export("pcmPlayer0") + static PcmPlayer pcmPlayer0; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lqr;" + ) + @Export("rightTitleSprite") + static SpritePixels rightTitleSprite; + @ObfuscatedName("x") + @Export("cacheParentPaths") + static String[] cacheParentPaths; + @ObfuscatedName("hx") + @ObfuscatedGetter( + intValue = -1451292815 + ) + @Export("baseX") + static int baseX; + SecureRandomCallable() { } // L: 42 public Object call() { - SecureRandom var2 = new SecureRandom(); // L: 47 - var2.nextInt(); // L: 48 - return var2; // L: 51 + SecureRandom var2 = new SecureRandom(); // L: 48 + var2.nextInt(); // L: 49 + return var2; // L: 52 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-2044012999" + descriptor = "(Ljava/lang/CharSequence;I)[B", + garbageValue = "1836628976" ) - @Export("getVarbit") - public static int getVarbit(int var0) { - VarbitComposition var1 = UserComparator6.method2643(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 - } + public static byte[] method2035(CharSequence var0) { + int var1 = var0.length(); // L: 9 + byte[] var2 = new byte[var1]; // L: 10 - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(CLlo;I)I", - garbageValue = "522647287" - ) - @Export("lowercaseChar") - static int lowercaseChar(char var0, Language var1) { - int var2 = var0 << 4; // L: 143 - if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 144 - var0 = Character.toLowerCase(var0); // L: 145 - var2 = (var0 << 4) + 1; // L: 146 - } - - if (var0 == 241 && var1 == Language.Language_ES) { // L: 148 - var2 = 1762; - } - - return var2; // L: 149 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-4" - ) - @Export("isKeyDown") - public static final boolean isKeyDown() { - synchronized(KeyHandler.KeyHandler_instance) { // L: 169 - if (KeyHandler.field138 == KeyHandler.field141) { // L: 170 - return false; + for (int var3 = 0; var3 < var1; ++var3) { // L: 11 + char var4 = var0.charAt(var3); // L: 12 + if (var4 > 127) { // L: 13 + var2[var3] = 63; } else { - GameEngine.field218 = KeyHandler.field136[KeyHandler.field141]; // L: 171 - ItemComposition.field2121 = KeyHandler.field135[KeyHandler.field141]; // L: 172 - KeyHandler.field141 = KeyHandler.field141 + 1 & 127; // L: 173 - return true; // L: 174 + var2[var3] = (byte)var4; // L: 14 } } + + return var2; // L: 16 } - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)Lbb;", - garbageValue = "-771048331" - ) - @Export("worldListStart") - static World worldListStart() { - World.World_listCount = 0; // L: 237 - return class305.getNextWorldListWorld(); // L: 238 - } - - @ObfuscatedName("ln") + @ObfuscatedName("fx") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1734362021" + garbageValue = "342853228" ) - static final void method2050() { - Client.field702 = Client.cycleCntr; // L: 12375 - Interpreter.ClanChat_inClanChat = true; // L: 12376 - } // L: 12377 + @Export("logOut") + static final void logOut() { + Client.packetWriter.close(); // L: 2950 + EnumComposition.method3400(); // L: 2952 + VarcInt.method3321(); // L: 2953 + PcmPlayer.method757(); // L: 2954 + ObjectComposition.ObjectDefinition_cached.clear(); // L: 2956 + ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 2957 + ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 2958 + ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 2959 + NPCComposition.NpcDefinition_cached.clear(); // L: 2962 + NPCComposition.NpcDefinition_cachedModels.clear(); // L: 2963 + class92.method2370(); // L: 2965 + SequenceDefinition.SequenceDefinition_cached.clear(); // L: 2967 + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 2968 + SequenceDefinition.SequenceDefinition_cachedModel.clear(); // L: 2969 + SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 2972 + SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 2973 + VarbitComposition.VarbitDefinition_cached.clear(); // L: 2976 + VarpDefinition.VarpDefinition_cached.clear(); // L: 2979 + Login.HitSplatDefinition_cachedSprites.method7382(); // L: 2981 + class221.HitSplatDefinition_cached.method7382(); // L: 2982 + SoundSystem.method780(); // L: 2983 + class175.method3379(); // L: 2984 + class250.method4933(); // L: 2985 + ParamComposition.ParamDefinition_cached.clear(); // L: 2987 + WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 2990 + PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 2993 + Widget.Widget_cachedSprites.clear(); // L: 2996 + Widget.Widget_cachedModels.clear(); // L: 2997 + Widget.Widget_cachedFonts.clear(); // L: 2998 + Widget.Widget_cachedSpriteMasks.clear(); // L: 2999 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 3001 + Script.Script_cached.clear(); // L: 3002 + NetSocket.archive0.clearFiles(); // L: 3003 + Clock.archive1.clearFiles(); // L: 3004 + class194.archive3.clearFiles(); // L: 3005 + MouseHandler.archive4.clearFiles(); // L: 3006 + Message.archive5.clearFiles(); // L: 3007 + AbstractUserComparator.archive6.clearFiles(); // L: 3008 + InterfaceParent.archive7.clearFiles(); // L: 3009 + class305.archive8.clearFiles(); // L: 3010 + TileItem.archive9.clearFiles(); // L: 3011 + ObjectSound.archive10.clearFiles(); // L: 3012 + UrlRequest.archive11.clearFiles(); // L: 3013 + class115.archive12.clearFiles(); // L: 3014 + class175.scene.clear(); // L: 3016 + + for (int var0 = 0; var0 < 4; ++var0) { // L: 3017 + Client.collisionMaps[var0].clear(); + } + + System.gc(); // L: 3018 + UrlRequester.method2538(2); // L: 3019 + Client.currentTrackGroupId = -1; // L: 3020 + Client.playingJingle = false; // L: 3021 + Varcs.method2466(); // L: 3022 + PendingSpawn.updateGameState(10); // L: 3023 + } // L: 3024 } diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index b96350932e..0f3e12f341 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -4,24 +4,16 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bt") +@ObfuscatedName("bh") @Implements("SecureRandomFuture") public class SecureRandomFuture { - @ObfuscatedName("fd") - @ObfuscatedGetter( - intValue = -1797802819 - ) - @Export("worldPort") - static int worldPort; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("executor") ExecutorService executor; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("future") Future future; @@ -30,10 +22,10 @@ public class SecureRandomFuture { this.future = this.executor.submit(new SecureRandomCallable()); // L: 14 } // L: 15 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "100" + descriptor = "(I)V", + garbageValue = "-446839079" ) @Export("shutdown") void shutdown() { @@ -41,20 +33,20 @@ public class SecureRandomFuture { this.executor = null; // L: 19 } // L: 20 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1428747809" + garbageValue = "-627112505" ) @Export("isDone") boolean isDone() { return this.future.isDone(); // L: 23 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)Ljava/security/SecureRandom;", - garbageValue = "-92" + garbageValue = "-41" ) @Export("get") SecureRandom get() { @@ -66,180 +58,4 @@ public class SecureRandomFuture { return var3; // L: 37 } } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "2104431553" - ) - static int method1985(int var0, Script var1, boolean var2) { - int var3; - int var6; - int var9; - if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 2270 - Interpreter.Interpreter_intStackSize -= 2; // L: 2271 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2272 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2273 - EnumComposition var10 = class78.getEnum(var3); // L: 2274 - if (var10.outputType != 's') { // L: 2275 - } - - for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 2276 - if (var9 == var10.keys[var6]) { // L: 2277 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 2278 - var10 = null; // L: 2279 - break; - } - } - - if (var10 != null) { // L: 2283 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var10.defaultStr; - } - - return 1; // L: 2284 - } else if (var0 != ScriptOpcodes.ENUM) { // L: 2286 - if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 2312 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2313 - EnumComposition var4 = class78.getEnum(var3); // L: 2314 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.size(); // L: 2315 - return 1; // L: 2316 - } else { - return 2; // L: 2318 - } - } else { - Interpreter.Interpreter_intStackSize -= 4; // L: 2287 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2288 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2289 - int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2290 - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 2291 - EnumComposition var7 = class78.getEnum(var5); // L: 2292 - if (var3 == var7.inputType && var9 == var7.outputType) { // L: 2293 - for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 2298 - if (var6 == var7.keys[var8]) { // L: 2299 - if (var9 == 115) { // L: 2300 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var7.strVals[var8]; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 2301 - } - - var7 = null; // L: 2302 - break; - } - } - - if (var7 != null) { // L: 2306 - if (var9 == 115) { // L: 2307 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var7.defaultStr; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 2308 - } - } - - return 1; // L: 2310 - } else { - if (var9 == 115) { // L: 2294 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = "null"; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2295 - } - - return 1; // L: 2296 - } - } - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "970773332" - ) - static int method1984(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3845 - Interpreter.Interpreter_intStackSize -= 2; // L: 3846 - Client.field760 = (short)GrandExchangeOffer.method6032(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); // L: 3847 - if (Client.field760 <= 0) { // L: 3848 - Client.field760 = 256; - } - - Client.field761 = (short)GrandExchangeOffer.method6032(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 3849 - if (Client.field761 <= 0) { // L: 3850 - Client.field761 = 256; - } - - return 1; // L: 3851 - } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3853 - Interpreter.Interpreter_intStackSize -= 2; // L: 3854 - Client.zoomHeight = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3855 - if (Client.zoomHeight <= 0) { // L: 3856 - Client.zoomHeight = 256; - } - - Client.zoomWidth = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3857 - if (Client.zoomWidth <= 0) { // L: 3858 - Client.zoomWidth = 320; - } - - return 1; // L: 3859 - } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3861 - Interpreter.Interpreter_intStackSize -= 4; // L: 3862 - Client.field764 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3863 - if (Client.field764 <= 0) { // L: 3864 - Client.field764 = 1; - } - - Client.field765 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3865 - if (Client.field765 <= 0) { // L: 3866 - Client.field765 = 32767; - } else if (Client.field765 < Client.field764) { // L: 3867 - Client.field765 = Client.field764; - } - - Client.field766 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3868 - if (Client.field766 <= 0) { // L: 3869 - Client.field766 = 1; - } - - Client.field666 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 3870 - if (Client.field666 <= 0) { // L: 3871 - Client.field666 = 32767; - } else if (Client.field666 < Client.field766) { // L: 3872 - Client.field666 = Client.field766; - } - - return 1; // L: 3873 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3875 - if (Client.viewportWidget != null) { // L: 3876 - class17.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3877 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3878 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3879 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3882 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3883 - } - - return 1; // L: 3885 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3887 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3888 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3889 - return 1; // L: 3890 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3892 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClientPacket.method5175(Client.field760); // L: 3893 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClientPacket.method5175(Client.field761); // L: 3894 - return 1; // L: 3895 - } else if (var0 == 6220) { // L: 3897 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3898 - return 1; // L: 3899 - } else if (var0 == 6221) { // L: 3901 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3902 - return 1; // L: 3903 - } else if (var0 == 6222) { // L: 3905 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = InvDefinition.canvasWidth; // L: 3906 - return 1; // L: 3907 - } else if (var0 == 6223) { // L: 3909 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class321.canvasHeight; // L: 3910 - return 1; // L: 3911 - } else { - return 2; // L: 3913 - } - } } diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index fdd3612529..53ddfe5edd 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -1,3 +1,6 @@ +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; import java.util.HashMap; import java.util.Map; import net.runelite.mapping.Export; @@ -6,123 +9,129 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gw") +@ObfuscatedName("gq") @Implements("SequenceDefinition") public class SequenceDefinition extends DualNode { - @ObfuscatedName("v") - static boolean field2151; - @ObfuscatedName("i") + @ObfuscatedName("o") + static boolean field2221; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" + ) + @Export("SequenceDefinition_archive") + public static AbstractArchive SequenceDefinition_archive; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Llp;" ) @Export("SequenceDefinition_animationsArchive") - static AbstractArchive SequenceDefinition_animationsArchive; - @ObfuscatedName("f") + public static AbstractArchive SequenceDefinition_animationsArchive; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("SequenceDefinition_skeletonsArchive") - static AbstractArchive SequenceDefinition_skeletonsArchive; - @ObfuscatedName("b") + public static AbstractArchive SequenceDefinition_skeletonsArchive; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("SequenceDefinition_cached") public static EvictingDualNodeHashTable SequenceDefinition_cached; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("SequenceDefinition_cachedFrames") public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("SequenceDefinition_cachedModel") public static EvictingDualNodeHashTable SequenceDefinition_cachedModel; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1013494467 + intValue = -451535761 ) @Export("SequenceDefinition_cachedModelId") int SequenceDefinition_cachedModelId; - @ObfuscatedName("q") - public Map field2144; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -1880627603 - ) - int field2152; @ObfuscatedName("r") + public Map field2209; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 2046803879 + intValue = -1088599689 ) - int field2160; - @ObfuscatedName("p") + int field2207; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 828887833 + ) + int field2202; + @ObfuscatedName("c") @Export("frameIds") public int[] frameIds; @ObfuscatedName("w") @Export("chatFrameIds") int[] chatFrameIds; - @ObfuscatedName("k") + @ObfuscatedName("b") @Export("frameLengths") public int[] frameLengths; - @ObfuscatedName("d") + @ObfuscatedName("t") @Export("soundEffects") public int[] soundEffects; - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1070190955 + intValue = -242259733 ) @Export("frameCount") public int frameCount; - @ObfuscatedName("u") - int[] field2146; - @ObfuscatedName("t") - boolean[] field2156; - @ObfuscatedName("g") - public boolean field2154; @ObfuscatedName("x") + int[] field2217; + @ObfuscatedName("n") + boolean[] field2218; + @ObfuscatedName("e") + public boolean field2201; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 118490245 + intValue = 1404138407 ) - public int field2155; - @ObfuscatedName("a") + public int field2220; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1252279117 + intValue = -681508511 ) @Export("shield") public int shield; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 221867971 + intValue = 1106803533 ) @Export("weapon") public int weapon; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 290936429 + intValue = -256717621 ) - public int field2138; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1964566761 - ) - public int field2159; + public int field2223; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1376607035 + intValue = -1918601831 ) - public int field2158; - @ObfuscatedName("h") + public int field2224; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1493621085 + intValue = -1593140013 ) - public int field2161; + public int field2206; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 1948704665 + ) + public int field2208; static { - field2151 = false; // L: 16 + field2221 = false; // L: 16 SequenceDefinition_cached = new EvictingDualNodeHashTable(64); // L: 20 SequenceDefinition_cachedFrames = new EvictingDualNodeHashTable(100); // L: 21 SequenceDefinition_cachedModel = new EvictingDualNodeHashTable(100); // L: 22 @@ -130,806 +139,601 @@ public class SequenceDefinition extends DualNode { SequenceDefinition() { this.SequenceDefinition_cachedModelId = -1; // L: 23 - this.field2152 = 0; // L: 25 - this.field2160 = 0; // L: 26 + this.field2207 = 0; // L: 25 + this.field2202 = 0; // L: 26 this.frameCount = -1; // L: 31 - this.field2154 = false; // L: 34 - this.field2155 = 5; // L: 35 + this.field2201 = false; // L: 34 + this.field2220 = 5; // L: 35 this.shield = -1; // L: 36 this.weapon = -1; // L: 37 - this.field2138 = 99; // L: 38 - this.field2159 = -1; // L: 39 - this.field2158 = -1; // L: 40 - this.field2161 = 2; // L: 41 + this.field2223 = 99; // L: 38 + this.field2224 = -1; // L: 39 + this.field2206 = -1; // L: 40 + this.field2208 = 2; // L: 41 } // L: 43 - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lpi;S)V", - garbageValue = "-208" + descriptor = "(Lpx;B)V", + garbageValue = "106" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 64 - if (var2 == 0) { // L: 65 - return; // L: 68 + int var2 = var1.readUnsignedByte(); // L: 58 + if (var2 == 0) { // L: 59 + return; // L: 62 } - this.decodeNext(var1, var2); // L: 66 + this.decodeNext(var1, var2); // L: 60 } } - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-1513978235" + descriptor = "(Lpx;II)V", + garbageValue = "696368219" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { int var3; int var4; - if (var2 == 1) { // L: 71 - var3 = var1.readUnsignedShort(); // L: 72 - this.frameLengths = new int[var3]; // L: 73 + if (var2 == 1) { // L: 65 + var3 = var1.readUnsignedShort(); // L: 66 + this.frameLengths = new int[var3]; // L: 67 - for (var4 = 0; var4 < var3; ++var4) { // L: 74 + for (var4 = 0; var4 < var3; ++var4) { // L: 68 this.frameLengths[var4] = var1.readUnsignedShort(); } - this.frameIds = new int[var3]; // L: 75 + this.frameIds = new int[var3]; // L: 69 - for (var4 = 0; var4 < var3; ++var4) { // L: 76 + for (var4 = 0; var4 < var3; ++var4) { // L: 70 this.frameIds[var4] = var1.readUnsignedShort(); } - for (var4 = 0; var4 < var3; ++var4) { // L: 77 + for (var4 = 0; var4 < var3; ++var4) { // L: 71 this.frameIds[var4] += var1.readUnsignedShort() << 16; } - } else if (var2 == 2) { // L: 79 + } else if (var2 == 2) { // L: 73 this.frameCount = var1.readUnsignedShort(); - } else if (var2 == 3) { // L: 80 - var3 = var1.readUnsignedByte(); // L: 81 - this.field2146 = new int[var3 + 1]; // L: 82 + } else if (var2 == 3) { // L: 74 + var3 = var1.readUnsignedByte(); // L: 75 + this.field2217 = new int[var3 + 1]; // L: 76 - for (var4 = 0; var4 < var3; ++var4) { // L: 83 - this.field2146[var4] = var1.readUnsignedByte(); + for (var4 = 0; var4 < var3; ++var4) { // L: 77 + this.field2217[var4] = var1.readUnsignedByte(); } - this.field2146[var3] = 9999999; // L: 84 - } else if (var2 == 4) { // L: 86 - this.field2154 = true; - } else if (var2 == 5) { // L: 87 - this.field2155 = var1.readUnsignedByte(); - } else if (var2 == 6) { // L: 88 + this.field2217[var3] = 9999999; // L: 78 + } else if (var2 == 4) { // L: 80 + this.field2201 = true; + } else if (var2 == 5) { // L: 81 + this.field2220 = var1.readUnsignedByte(); + } else if (var2 == 6) { // L: 82 this.shield = var1.readUnsignedShort(); - } else if (var2 == 7) { // L: 89 + } else if (var2 == 7) { // L: 83 this.weapon = var1.readUnsignedShort(); - } else if (var2 == 8) { // L: 90 - this.field2138 = var1.readUnsignedByte(); - } else if (var2 == 9) { // L: 91 - this.field2159 = var1.readUnsignedByte(); - } else if (var2 == 10) { // L: 92 - this.field2158 = var1.readUnsignedByte(); - } else if (var2 == 11) { // L: 93 - this.field2161 = var1.readUnsignedByte(); - } else if (var2 == 12) { // L: 94 - var3 = var1.readUnsignedByte(); // L: 95 - this.chatFrameIds = new int[var3]; // L: 96 + } else if (var2 == 8) { // L: 84 + this.field2223 = var1.readUnsignedByte(); + } else if (var2 == 9) { // L: 85 + this.field2224 = var1.readUnsignedByte(); + } else if (var2 == 10) { // L: 86 + this.field2206 = var1.readUnsignedByte(); + } else if (var2 == 11) { // L: 87 + this.field2208 = var1.readUnsignedByte(); + } else if (var2 == 12) { // L: 88 + var3 = var1.readUnsignedByte(); // L: 89 + this.chatFrameIds = new int[var3]; // L: 90 - for (var4 = 0; var4 < var3; ++var4) { // L: 97 + for (var4 = 0; var4 < var3; ++var4) { // L: 91 this.chatFrameIds[var4] = var1.readUnsignedShort(); } - for (var4 = 0; var4 < var3; ++var4) { // L: 98 + for (var4 = 0; var4 < var3; ++var4) { // L: 92 this.chatFrameIds[var4] += var1.readUnsignedShort() << 16; } - } else if (var2 == 13) { // L: 100 - var3 = var1.readUnsignedByte(); // L: 101 - this.soundEffects = new int[var3]; // L: 102 + } else if (var2 == 13) { // L: 94 + var3 = var1.readUnsignedByte(); // L: 95 + this.soundEffects = new int[var3]; // L: 96 - for (var4 = 0; var4 < var3; ++var4) { // L: 103 + for (var4 = 0; var4 < var3; ++var4) { // L: 97 this.soundEffects[var4] = var1.readMedium(); } - } else if (var2 == 14) { // L: 105 - this.SequenceDefinition_cachedModelId = var1.readInt(); // L: 106 - } else if (var2 == 15) { // L: 108 - var3 = var1.readUnsignedShort(); // L: 109 - this.field2144 = new HashMap(); // L: 110 + } else if (var2 == 14) { // L: 99 + this.SequenceDefinition_cachedModelId = var1.readInt(); // L: 100 + } else if (var2 == 15) { // L: 102 + var3 = var1.readUnsignedShort(); // L: 103 + this.field2209 = new HashMap(); // L: 104 - for (var4 = 0; var4 < var3; ++var4) { // L: 111 - int var5 = var1.readUnsignedShort(); // L: 112 - int var6 = var1.readMedium(); // L: 113 - this.field2144.put(var5, var6); // L: 114 + for (var4 = 0; var4 < var3; ++var4) { // L: 105 + int var5 = var1.readUnsignedShort(); // L: 106 + int var6 = var1.readMedium(); // L: 107 + this.field2209.put(var5, var6); // L: 108 } - } else if (var2 == 16) { // L: 117 - this.field2152 = var1.readUnsignedShort(); // L: 118 - this.field2160 = var1.readUnsignedShort(); // L: 119 - } else if (var2 == 17) { // L: 121 - this.field2156 = new boolean[256]; // L: 122 + } else if (var2 == 16) { // L: 111 + this.field2207 = var1.readUnsignedShort(); // L: 112 + this.field2202 = var1.readUnsignedShort(); // L: 113 + } else if (var2 == 17) { // L: 115 + this.field2218 = new boolean[256]; // L: 116 - for (var3 = 0; var3 < this.field2156.length; ++var3) { // L: 123 - this.field2156[var3] = false; // L: 124 + for (var3 = 0; var3 < this.field2218.length; ++var3) { // L: 117 + this.field2218[var3] = false; // L: 118 } - var3 = var1.readUnsignedByte(); // L: 126 + var3 = var1.readUnsignedByte(); // L: 120 - for (var4 = 0; var4 < var3; ++var4) { // L: 127 - this.field2156[var1.readUnsignedByte()] = true; // L: 128 + for (var4 = 0; var4 < var3; ++var4) { // L: 121 + this.field2218[var1.readUnsignedByte()] = true; // L: 122 } } - } // L: 132 + } // L: 126 - @ObfuscatedName("b") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "-1790392441" ) @Export("postDecode") void postDecode() { - if (this.field2159 == -1) { // L: 135 - if (this.field2146 == null && this.field2156 == null) { // L: 136 - this.field2159 = 0; // L: 137 + if (this.field2224 == -1) { // L: 129 + if (this.field2217 == null && this.field2218 == null) { // L: 130 + this.field2224 = 0; // L: 131 } else { - this.field2159 = 2; + this.field2224 = -1918601831 * 7506; } } - if (this.field2158 == -1) { // L: 139 - if (this.field2146 == null && this.field2156 == null) { // L: 140 - this.field2158 = 0; // L: 141 + if (this.field2206 == -1) { // L: 133 + if (this.field2217 == null && this.field2218 == null) { // L: 134 + this.field2206 = 0; // L: 135 } else { - this.field2158 = 2; + this.field2206 = 2; } } - } // L: 143 + } // L: 137 - @ObfuscatedName("n") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Liq;II)Liq;", - garbageValue = "741452141" + descriptor = "(Lhv;II)Lhv;", + garbageValue = "-1686484197" ) @Export("transformActorModel") public Model transformActorModel(Model var1, int var2) { Model var4; - if (!this.isCachedModelIdSet()) { // L: 146 - var2 = this.frameIds[var2]; // L: 147 - Frames var5 = class115.getFrames(var2 >> 16); // L: 148 - var2 &= 65535; // L: 149 - if (var5 == null) { // L: 150 + if (!this.isCachedModelIdSet()) { // L: 140 + var2 = this.frameIds[var2]; // L: 141 + Frames var5 = class141.getFrames(var2 >> 16); // L: 142 + var2 &= 65535; // L: 143 + if (var5 == null) { return var1.toSharedSequenceModel(true); } else { - var4 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 151 - var4.animate(var5, var2); // L: 152 - return var4; // L: 153 + var4 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); + var4.animate(var5, var2); + return var4; } } else { - class122 var3 = class342.method6314(this.SequenceDefinition_cachedModelId); // L: 156 - if (var3 == null) { // L: 157 + class122 var3 = class146.method2997(this.SequenceDefinition_cachedModelId); // L: 150 + if (var3 == null) { // L: 151 return var1.toSharedSequenceModel(true); } else { - var4 = var1.toSharedSequenceModel(!var3.method2768()); // L: 158 - var4.method5000(var3, var2); // L: 159 - return var4; // L: 160 + var4 = var1.toSharedSequenceModel(!var3.method2755()); + var4.method4259(var3, var2); + return var4; + } + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Lhv;III)Lhv;", + garbageValue = "-680992651" + ) + @Export("transformObjectModel") + Model transformObjectModel(Model var1, int var2, int var3) { + Model var5; + if (!this.isCachedModelIdSet()) { + var2 = this.frameIds[var2]; + Frames var6 = class141.getFrames(var2 >> 16); + var2 &= 65535; + if (var6 == null) { + return var1.toSharedSequenceModel(true); + } else { + var5 = var1.toSharedSequenceModel(!var6.hasAlphaTransform(var2)); + var3 &= 3; + if (var3 == 1) { + var5.rotateY270Ccw(); + } else if (var3 == 2) { // L: 167 + var5.rotateY180(); + } else if (var3 == 3) { + var5.rotateY90Ccw(); // L: 168 + } + + var5.animate(var6, var2); + if (var3 == 1) { + var5.rotateY90Ccw(); + } else if (var3 == 2) { // L: 171 + var5.rotateY180(); + } else if (var3 == 3) { + var5.rotateY270Ccw(); + } + + return var5; // L: 173 + } + } else { + class122 var4 = class146.method2997(this.SequenceDefinition_cachedModelId); // L: 176 + if (var4 == null) { + return var1.toSharedSequenceModel(true); + } else { + var5 = var1.toSharedSequenceModel(!var4.method2755()); + var3 &= 3; + if (var3 == 1) { + var5.rotateY270Ccw(); + } else if (var3 == 2) { // L: 181 + var5.rotateY180(); + } else if (var3 == 3) { // L: 182 + var5.rotateY90Ccw(); + } + + var5.method4259(var4, var2); + if (var3 == 1) { + var5.rotateY90Ccw(); + } else if (var3 == 2) { // L: 185 + var5.rotateY180(); + } else if (var3 == 3) { // L: 186 + var5.rotateY270Ccw(); + } + + return var5; // L: 187 + } + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Lhv;II)Lhv;", + garbageValue = "-1909373486" + ) + @Export("transformSpotAnimationModel") + Model transformSpotAnimationModel(Model var1, int var2) { + Model var4; + if (!this.isCachedModelIdSet()) { + var2 = this.frameIds[var2]; + Frames var5 = class141.getFrames(var2 >> 16); + var2 &= 65535; + if (var5 == null) { // L: 196 + return var1.toSharedSpotAnimationModel(true); + } else { + var4 = var1.toSharedSpotAnimationModel(!var5.hasAlphaTransform(var2)); + var4.animate(var5, var2); + return var4; // L: 199 + } + } else { + class122 var3 = class146.method2997(this.SequenceDefinition_cachedModelId); + if (var3 == null) { // L: 203 + return var1.toSharedSpotAnimationModel(true); + } else { + var4 = var1.toSharedSpotAnimationModel(!var3.method2755()); // L: 204 + var4.method4259(var3, var2); // L: 205 + return var4; } } } @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Liq;III)Liq;", - garbageValue = "-2020846308" - ) - @Export("transformObjectModel") - Model transformObjectModel(Model var1, int var2, int var3) { - Model var5; - if (!this.isCachedModelIdSet()) { // L: 165 - var2 = this.frameIds[var2]; // L: 166 - Frames var6 = class115.getFrames(var2 >> 16); // L: 167 - var2 &= 65535; // L: 168 - if (var6 == null) { // L: 169 - return var1.toSharedSequenceModel(true); - } else { - var5 = var1.toSharedSequenceModel(!var6.hasAlphaTransform(var2)); // L: 170 - var3 &= 3; // L: 171 - if (var3 == 1) { // L: 172 - var5.rotateY270Ccw(); - } else if (var3 == 2) { // L: 173 - var5.rotateY180(); - } else if (var3 == 3) { // L: 174 - var5.rotateY90Ccw(); - } - - var5.animate(var6, var2); // L: 175 - if (var3 == 1) { // L: 176 - var5.rotateY90Ccw(); - } else if (var3 == 2) { // L: 177 - var5.rotateY180(); - } else if (var3 == 3) { // L: 178 - var5.rotateY270Ccw(); - } - - return var5; // L: 179 - } - } else { - class122 var4 = class342.method6314(this.SequenceDefinition_cachedModelId); // L: 182 - if (var4 == null) { // L: 183 - return var1.toSharedSequenceModel(true); - } else { - var5 = var1.toSharedSequenceModel(!var4.method2768()); // L: 184 - var3 &= 3; // L: 185 - if (var3 == 1) { // L: 186 - var5.rotateY270Ccw(); - } else if (var3 == 2) { // L: 187 - var5.rotateY180(); - } else if (var3 == 3) { // L: 188 - var5.rotateY90Ccw(); - } - - var5.method5000(var4, var2); // L: 189 - if (var3 == 1) { // L: 190 - var5.rotateY90Ccw(); - } else if (var3 == 2) { - var5.rotateY180(); // L: 191 - } else if (var3 == 3) { // L: 192 - var5.rotateY270Ccw(); - } - - return var5; // L: 193 - } - } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Liq;IS)Liq;", - garbageValue = "21409" - ) - @Export("transformSpotAnimationModel") - Model transformSpotAnimationModel(Model var1, int var2) { - Model var4; - if (!this.isCachedModelIdSet()) { // L: 198 - var2 = this.frameIds[var2]; // L: 199 - Frames var5 = class115.getFrames(var2 >> 16); // L: 200 - var2 &= 65535; // L: 201 - if (var5 == null) { // L: 202 - return var1.toSharedSpotAnimationModel(true); - } else { - var4 = var1.toSharedSpotAnimationModel(!var5.hasAlphaTransform(var2)); // L: 203 - var4.animate(var5, var2); // L: 204 - return var4; // L: 205 - } - } else { - class122 var3 = class342.method6314(this.SequenceDefinition_cachedModelId); // L: 208 - if (var3 == null) { // L: 209 - return var1.toSharedSpotAnimationModel(true); - } else { - var4 = var1.toSharedSpotAnimationModel(!var3.method2768()); // L: 210 - var4.method5000(var3, var2); // L: 211 - return var4; // L: 212 - } - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Liq;ILgw;IB)Liq;", - garbageValue = "4" + descriptor = "(Lhv;ILgq;IB)Lhv;", + garbageValue = "70" ) @Export("applyTransformations") public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { - if (field2151 && !this.isCachedModelIdSet() && !var3.isCachedModelIdSet()) { // L: 217 - return this.method3791(var1, var2, var3, var4); // L: 218 + if (field2221 && !this.isCachedModelIdSet() && !var3.isCachedModelIdSet()) { // L: 211 + return this.method3710(var1, var2, var3, var4); } else { - Model var5 = var1.toSharedSequenceModel(false); // L: 220 - boolean var6 = false; // L: 221 - Frames var7 = null; // L: 222 + Model var5 = var1.toSharedSequenceModel(false); // L: 214 + boolean var6 = false; + Frames var7 = null; class122 var8; - if (this.isCachedModelIdSet()) { // L: 223 - var8 = this.method3801(); // L: 224 - if (var3.isCachedModelIdSet() && this.field2156 == null) { // L: 225 - var5.method5000(var8, var2); // L: 226 - return var5; // L: 227 + if (this.isCachedModelIdSet()) { + var8 = this.method3735(); + if (var3.isCachedModelIdSet() && this.field2218 == null) { + var5.method4259(var8, var2); + return var5; } - var5.method4965(var8, var2, this.field2156, false); // L: 229 + var5.method4263(var8, var2, this.field2218, false); // L: 223 } else { - var2 = this.frameIds[var2]; // L: 232 - var7 = class115.getFrames(var2 >> 16); // L: 233 - var2 &= 65535; // L: 234 - if (var7 == null) { // L: 235 + var2 = this.frameIds[var2]; // L: 226 + var7 = class141.getFrames(var2 >> 16); // L: 227 + var2 &= 65535; + if (var7 == null) { return var3.transformActorModel(var1, var4); } - if (!var3.isCachedModelIdSet() && (this.field2146 == null || var4 == -1)) { // L: 236 - var5.animate(var7, var2); // L: 237 - return var5; // L: 238 + if (!var3.isCachedModelIdSet() && (this.field2217 == null || var4 == -1)) { + var5.animate(var7, var2); + return var5; // L: 232 } - if (this.field2146 == null || var4 == -1) { // L: 240 - var5.animate(var7, var2); // L: 241 - return var5; // L: 242 + if (this.field2217 == null || var4 == -1) { // L: 234 + var5.animate(var7, var2); // L: 235 + return var5; // L: 236 } - var6 = var3.isCachedModelIdSet(); // L: 244 - if (!var6) { // L: 245 - var5.method4981(var7, var2, this.field2146, false); // L: 246 + var6 = var3.isCachedModelIdSet(); + if (!var6) { + var5.method4264(var7, var2, this.field2217, false); // L: 240 } } - if (var3.isCachedModelIdSet()) { // L: 249 - var8 = var3.method3801(); // L: 250 - var5.method4965(var8, var4, this.field2156, true); // L: 251 + if (var3.isCachedModelIdSet()) { + var8 = var3.method3735(); // L: 244 + var5.method4263(var8, var4, this.field2218, true); } else { - var4 = var3.frameIds[var4]; // L: 254 - Frames var9 = class115.getFrames(var4 >> 16); // L: 255 - var4 &= 65535; // L: 256 - if (var9 == null) { // L: 257 + var4 = var3.frameIds[var4]; + Frames var9 = class141.getFrames(var4 >> 16); + var4 &= 65535; // L: 250 + if (var9 == null) { return this.transformActorModel(var1, var2); } - var5.method4981(var9, var4, this.field2146, true); // L: 258 + var5.method4264(var9, var4, this.field2217, true); } - if (var6 && var7 != null) { // L: 260 - var5.method4981(var7, var2, this.field2146, false); // L: 261 + if (var6 && var7 != null) { // L: 254 + var5.method4264(var7, var2, this.field2217, false); // L: 255 } - var5.resetBounds(); // L: 263 - return var5; // L: 264 - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Liq;ILgw;II)Liq;", - garbageValue = "136721627" - ) - Model method3791(Model var1, int var2, SequenceDefinition var3, int var4) { - var2 = this.frameIds[var2]; // L: 268 - Frames var5 = class115.getFrames(var2 >> 16); // L: 269 - var2 &= 65535; // L: 270 - if (var5 == null) { // L: 271 - return var3.transformActorModel(var1, var4); - } else { - var4 = var3.frameIds[var4]; // L: 272 - Frames var6 = class115.getFrames(var4 >> 16); // L: 273 - var4 &= 65535; // L: 274 - Model var7; - if (var6 == null) { // L: 275 - var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 276 - var7.animate(var5, var2); // L: 277 - return var7; // L: 278 - } else { - var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); // L: 280 - var7.animate2(var5, var2, var6, var4, this.field2146); // L: 281 - return var7; // L: 282 - } + var5.resetBounds(); // L: 257 + return var5; } } @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Liq;II)Liq;", - garbageValue = "242613872" + descriptor = "(Lhv;ILgq;IB)Lhv;", + garbageValue = "-110" + ) + Model method3710(Model var1, int var2, SequenceDefinition var3, int var4) { + var2 = this.frameIds[var2]; // L: 262 + Frames var5 = class141.getFrames(var2 >> 16); + var2 &= 65535; + if (var5 == null) { // L: 265 + return var3.transformActorModel(var1, var4); + } else { + var4 = var3.frameIds[var4]; // L: 266 + Frames var6 = class141.getFrames(var4 >> 16); // L: 267 + var4 &= 65535; // L: 268 + Model var7; + if (var6 == null) { // L: 269 + var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 270 + var7.animate(var5, var2); // L: 271 + return var7; // L: 272 + } else { + var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); // L: 274 + var7.animate2(var5, var2, var6, var4, this.field2217); // L: 275 + return var7; // L: 276 + } + } + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lhv;II)Lhv;", + garbageValue = "771999182" ) @Export("transformWidgetModel") public Model transformWidgetModel(Model var1, int var2) { - if (!this.isCachedModelIdSet()) { // L: 286 - int var3 = this.frameIds[var2]; // L: 287 - Frames var4 = class115.getFrames(var3 >> 16); // L: 288 - var3 &= 65535; // L: 289 - if (var4 == null) { // L: 290 + if (!this.isCachedModelIdSet()) { // L: 280 + int var3 = this.frameIds[var2]; // L: 281 + Frames var4 = class141.getFrames(var3 >> 16); // L: 282 + var3 &= 65535; // L: 283 + if (var4 == null) { // L: 284 return var1.toSharedSequenceModel(true); } else { - Frames var5 = null; // L: 291 - int var6 = 0; // L: 292 - if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { // L: 293 - var6 = this.chatFrameIds[var2]; // L: 294 - var5 = class115.getFrames(var6 >> 16); // L: 295 - var6 &= 65535; // L: 296 + Frames var5 = null; // L: 285 + int var6 = 0; // L: 286 + if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { // L: 287 + var6 = this.chatFrameIds[var2]; // L: 288 + var5 = class141.getFrames(var6 >> 16); // L: 289 + var6 &= 65535; // L: 290 } Model var7; - if (var5 != null && var6 != 65535) { // L: 298 - var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); // L: 303 - var7.animate(var4, var3); // L: 304 - var7.animate(var5, var6); // L: 305 - return var7; // L: 306 + if (var5 != null && var6 != 65535) { // L: 292 + var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); // L: 297 + var7.animate(var4, var3); // L: 298 + var7.animate(var5, var6); // L: 299 + return var7; // L: 300 } else { - var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); // L: 299 - var7.animate(var4, var3); // L: 300 - return var7; // L: 301 + var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); // L: 293 + var7.animate(var4, var3); // L: 294 + return var7; // L: 295 } } } else { - return this.transformActorModel(var1, var2); // L: 309 + return this.transformActorModel(var1, var2); // L: 303 } } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-2016485024" + garbageValue = "1132270109" ) @Export("isCachedModelIdSet") public boolean isCachedModelIdSet() { - return this.SequenceDefinition_cachedModelId >= 0; // L: 314 + return this.SequenceDefinition_cachedModelId >= 0; // L: 308 } - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2003317016" + descriptor = "(B)I", + garbageValue = "0" ) - public int method3844() { - return this.field2160 - this.field2152; // L: 318 + public int method3729() { + return this.field2202 - this.field2207; // L: 312 } - @ObfuscatedName("d") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)Ldo;", - garbageValue = "-1683695849" + descriptor = "(I)Lds;", + garbageValue = "2065274183" ) - public class122 method3801() { - return this.isCachedModelIdSet() ? class342.method6314(this.SequenceDefinition_cachedModelId) : null; // L: 330 331 334 + public class122 method3735() { + return this.isCachedModelIdSet() ? class146.method2997(this.SequenceDefinition_cachedModelId) : null; // L: 353 354 357 } - @ObfuscatedName("gq") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "646079411" + descriptor = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;", + garbageValue = "-1646829162" ) - @Export("drawEntities") - static final void drawEntities(int var0, int var1, int var2, int var3) { - ++Client.viewportDrawCount; // L: 4430 - if (GrandExchangeEvents.localPlayer.x >> 7 == Client.destinationX && GrandExchangeEvents.localPlayer.y >> 7 == Client.destinationY) { // L: 4432 - Client.destinationX = 0; // L: 4433 - } + static File method3717(String var0, String var1, int var2) { + String var3 = var2 == 0 ? "" : "" + var2; // L: 144 + JagexCache.JagexCache_locationFile = new File(BufferedSource.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); // L: 145 + String var4 = null; // L: 146 + String var5 = null; // L: 147 + boolean var6 = false; // L: 148 + int var11; + File var26; + if (JagexCache.JagexCache_locationFile.exists()) { // L: 149 + try { + AccessFile var7 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); // L: 152 - LoginPacket.method5192(); // L: 4436 - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 4438 - ArchiveLoader.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 4439 - } - - MusicPatch.addNpcsToScene(true); // L: 4442 - Varcs.method2463(); // L: 4443 - MusicPatch.addNpcsToScene(false); // L: 4444 - - int var6; - for (Projectile var4 = (Projectile)Client.projectiles.last(); var4 != null; var4 = (Projectile)Client.projectiles.previous()) { // L: 4446 4447 4464 - if (var4.plane == class18.Client_plane && Client.cycle <= var4.cycleEnd) { // L: 4448 - if (Client.cycle >= var4.cycleStart) { // L: 4449 - if (var4.targetIndex > 0) { // L: 4450 - NPC var23 = Client.npcs[var4.targetIndex - 1]; // L: 4451 - if (var23 != null && var23.x >= 0 && var23.x < 13312 && var23.y >= 0 && var23.y < 13312) { // L: 4452 - var4.setDestination(var23.x, var23.y, WorldMapLabel.getTileHeight(var23.x, var23.y, var4.plane) - var4.endHeight, Client.cycle); - } - } - - if (var4.targetIndex < 0) { // L: 4454 - var6 = -var4.targetIndex - 1; // L: 4456 - Player var25; - if (var6 == Client.localPlayerIndex) { // L: 4457 - var25 = GrandExchangeEvents.localPlayer; - } else { - var25 = Client.players[var6]; // L: 4458 - } - - if (var25 != null && var25.x >= 0 && var25.x < 13312 && var25.y >= 0 && var25.y < 13312) { // L: 4459 - var4.setDestination(var25.x, var25.y, WorldMapLabel.getTileHeight(var25.x, var25.y, var4.plane) - var4.endHeight, Client.cycle); - } - } - - var4.advance(Client.field556); // L: 4461 - ArchiveLoader.scene.drawEntity(class18.Client_plane, (int)var4.x, (int)var4.y, (int)var4.z, 60, var4, var4.yaw, -1L, false); // L: 4462 - } - } else { - var4.remove(); - } - } - - class128.method2854(); // L: 4467 - class17.setViewportShape(var0, var1, var2, var3, true); // L: 4468 - var0 = Client.viewportOffsetX; // L: 4469 - var1 = Client.viewportOffsetY; // L: 4470 - var2 = Client.viewportWidth; // L: 4471 - var3 = Client.viewportHeight; // L: 4472 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4473 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 4474 - int var22 = Client.camAngleX; // L: 4475 - if (Client.field718 / 256 > var22) { // L: 4476 - var22 = Client.field718 / 256; - } - - if (Client.field546[4] && Client.field636[4] + 128 > var22) { // L: 4477 - var22 = Client.field636[4] + 128; - } - - int var5 = Client.camAngleY & 2047; // L: 4478 - var6 = class10.oculusOrbFocalPointX; // L: 4479 - int var7 = Decimator.field397; // L: 4480 - int var8 = ClientPacket.oculusOrbFocalPointY; // L: 4481 - int var9 = var22 * 3 + 600; // L: 4484 - int var10 = class13.method164(var9, var3); // L: 4488 - int var11 = 2048 - var22 & 2047; // L: 4489 - int var12 = 2048 - var5 & 2047; // L: 4490 - int var13 = 0; // L: 4491 - int var14 = 0; // L: 4492 - int var15 = var10; // L: 4493 - int var16; - int var17; - int var18; - if (var11 != 0) { // L: 4494 - var16 = Rasterizer3D.Rasterizer3D_sine[var11]; // L: 4495 - var17 = Rasterizer3D.Rasterizer3D_cosine[var11]; // L: 4496 - var18 = var14 * var17 - var16 * var10 >> 16; // L: 4497 - var15 = var16 * var14 + var10 * var17 >> 16; // L: 4498 - var14 = var18; // L: 4499 - } - - if (var12 != 0) { // L: 4501 - var16 = Rasterizer3D.Rasterizer3D_sine[var12]; // L: 4502 - var17 = Rasterizer3D.Rasterizer3D_cosine[var12]; // L: 4503 - var18 = var17 * var13 + var15 * var16 >> 16; // L: 4504 - var15 = var15 * var17 - var13 * var16 >> 16; // L: 4505 - var13 = var18; // L: 4506 - } - - if (Client.isCameraLocked) { // L: 4508 - class93.field1253 = var6 - var13; // L: 4509 - PcmPlayer.field294 = var7 - var14; // L: 4510 - WorldMapElement.field1837 = var8 - var15; // L: 4511 - ObjectComposition.field2065 = var22; // L: 4512 - class21.field116 = var5; // L: 4513 - } else { - WorldMapLabelSize.cameraX = var6 - var13; // L: 4516 - ItemContainer.cameraY = var7 - var14; // L: 4517 - class154.cameraZ = var8 - var15; // L: 4518 - class147.cameraPitch = var22; // L: 4519 - class21.cameraYaw = var5; // L: 4520 - } - - if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (class10.oculusOrbFocalPointX >> 7 != GrandExchangeEvents.localPlayer.x >> 7 || ClientPacket.oculusOrbFocalPointY >> 7 != GrandExchangeEvents.localPlayer.y >> 7)) { // L: 4522 4523 - var16 = GrandExchangeEvents.localPlayer.plane; // L: 4524 - var17 = (class10.oculusOrbFocalPointX >> 7) + GrandExchangeOfferOwnWorldComparator.baseX; // L: 4525 - var18 = (ClientPacket.oculusOrbFocalPointY >> 7) + VarcInt.baseY; // L: 4526 - StructComposition.method3619(var17, var18, var16, true); // L: 4527 - } - - int var19; - int var20; - int var21; - if (!Client.isCameraLocked) { // L: 4532 - if (class131.clientPreferences.method2263()) { // L: 4535 - var12 = class18.Client_plane; // L: 4536 - } else { - label405: { - var13 = 3; // L: 4539 - if (class147.cameraPitch < 310) { // L: 4540 - label402: { - if (Client.oculusOrbState == 1) { // L: 4543 - var14 = class10.oculusOrbFocalPointX >> 7; // L: 4544 - var15 = ClientPacket.oculusOrbFocalPointY >> 7; // L: 4545 - } else { - var14 = GrandExchangeEvents.localPlayer.x >> 7; // L: 4548 - var15 = GrandExchangeEvents.localPlayer.y >> 7; // L: 4549 - } - - var16 = WorldMapLabelSize.cameraX >> 7; // L: 4551 - var17 = class154.cameraZ >> 7; // L: 4552 - if (var16 >= 0 && var17 >= 0 && var16 < 104 && var17 < 104) { // L: 4553 - if (var14 >= 0 && var15 >= 0 && var14 < 104 && var15 < 104) { // L: 4557 - if ((Tiles.Tiles_renderFlags[class18.Client_plane][var16][var17] & 4) != 0) { // L: 4561 - var13 = class18.Client_plane; - } - - if (var14 > var16) { // L: 4563 - var18 = var14 - var16; - } else { - var18 = var16 - var14; // L: 4564 - } - - if (var15 > var17) { // L: 4566 - var19 = var15 - var17; - } else { - var19 = var17 - var15; // L: 4567 - } - - if (var18 > var19) { // L: 4568 - var20 = var19 * 65536 / var18; // L: 4569 - var21 = 32768; // L: 4570 - - while (true) { - if (var14 == var16) { // L: 4571 - break label402; - } - - if (var16 < var14) { // L: 4572 - ++var16; - } else if (var16 > var14) { // L: 4573 - --var16; - } - - if ((Tiles.Tiles_renderFlags[class18.Client_plane][var16][var17] & 4) != 0) { // L: 4574 - var13 = class18.Client_plane; - } - - var21 += var20; // L: 4575 - if (var21 >= 65536) { // L: 4576 - var21 -= 65536; // L: 4577 - if (var17 < var15) { // L: 4578 - ++var17; - } else if (var17 > var15) { // L: 4579 - --var17; - } - - if ((Tiles.Tiles_renderFlags[class18.Client_plane][var16][var17] & 4) != 0) { // L: 4580 - var13 = class18.Client_plane; - } - } - } - } else { - if (var19 > 0) { // L: 4584 - var20 = var18 * 65536 / var19; // L: 4585 - var21 = 32768; // L: 4586 - - while (var15 != var17) { // L: 4587 - if (var17 < var15) { // L: 4588 - ++var17; - } else if (var17 > var15) { // L: 4589 - --var17; - } - - if ((Tiles.Tiles_renderFlags[class18.Client_plane][var16][var17] & 4) != 0) { // L: 4590 - var13 = class18.Client_plane; - } - - var21 += var20; // L: 4591 - if (var21 >= 65536) { // L: 4592 - var21 -= 65536; // L: 4593 - if (var16 < var14) { // L: 4594 - ++var16; - } else if (var16 > var14) { // L: 4595 - --var16; - } - - if ((Tiles.Tiles_renderFlags[class18.Client_plane][var16][var17] & 4) != 0) { // L: 4596 - var13 = class18.Client_plane; - } - } - } - } - break label402; - } - } - - var12 = class18.Client_plane; // L: 4558 - break label405; // L: 4559 - } - - var12 = class18.Client_plane; // L: 4554 - break label405; // L: 4555 - } - } - - if (GrandExchangeEvents.localPlayer.x >= 0 && GrandExchangeEvents.localPlayer.y >= 0 && GrandExchangeEvents.localPlayer.x < 13312 && GrandExchangeEvents.localPlayer.y < 13312) { // L: 4601 - if ((Tiles.Tiles_renderFlags[class18.Client_plane][GrandExchangeEvents.localPlayer.x >> 7][GrandExchangeEvents.localPlayer.y >> 7] & 4) != 0) { // L: 4605 - var13 = class18.Client_plane; - } - - var12 = var13; // L: 4606 - } else { - var12 = class18.Client_plane; // L: 4602 + Buffer var8; + int var9; + for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) { // L: 153 154 157 + var9 = var7.read(var8.array, var8.offset, var8.array.length - var8.offset); // L: 155 + if (var9 == -1) { // L: 156 + throw new IOException(); } } - } - var11 = var12; // L: 4608 - } else { - if (class131.clientPreferences.method2263()) { // L: 4613 - var12 = class18.Client_plane; // L: 4614 - } else { - var13 = WorldMapLabel.getTileHeight(WorldMapLabelSize.cameraX, class154.cameraZ, class18.Client_plane); // L: 4617 - if (var13 - ItemContainer.cameraY < 800 && (Tiles.Tiles_renderFlags[class18.Client_plane][WorldMapLabelSize.cameraX >> 7][class154.cameraZ >> 7] & 4) != 0) { // L: 4618 - var12 = class18.Client_plane; // L: 4619 + var8.offset = 0; // L: 159 + var9 = var8.readUnsignedByte(); // L: 160 + if (var9 < 1 || var9 > 3) { // L: 161 + throw new IOException("" + var9); + } + + int var10 = 0; // L: 162 + if (var9 > 1) { // L: 163 + var10 = var8.readUnsignedByte(); + } + + if (var9 <= 2) { // L: 164 + var4 = var8.readStringCp1252NullCircumfixed(); // L: 165 + if (var10 == 1) { // L: 166 + var5 = var8.readStringCp1252NullCircumfixed(); + } } else { - var12 = 3; // L: 4622 + var4 = var8.readCESU8(); // L: 169 + if (var10 == 1) { // L: 170 + var5 = var8.readCESU8(); + } + } + + var7.close(); // L: 172 + } catch (IOException var24) { // L: 174 + var24.printStackTrace(); // L: 175 + } + + if (var4 != null) { // L: 177 + var26 = new File(var4); // L: 178 + if (!var26.exists()) { // L: 179 + var4 = null; // L: 180 } } - var11 = var12; // L: 4624 + if (var4 != null) { // L: 183 + var26 = new File(var4, "test.dat"); // L: 184 + + boolean var27; + try { + RandomAccessFile var15 = new RandomAccessFile(var26, "rw"); // L: 188 + var11 = var15.read(); // L: 189 + var15.seek(0L); // L: 190 + var15.write(var11); // L: 191 + var15.seek(0L); // L: 192 + var15.close(); // L: 193 + var26.delete(); // L: 194 + var27 = true; // L: 195 + } catch (Exception var22) { // L: 197 + var27 = false; // L: 198 + } + + if (!var27) { // L: 201 + var4 = null; // L: 202 + } + } } - var12 = WorldMapLabelSize.cameraX; // L: 4626 - var13 = ItemContainer.cameraY; // L: 4627 - var14 = class154.cameraZ; // L: 4628 - var15 = class147.cameraPitch; // L: 4629 - var16 = class21.cameraYaw; // L: 4630 + if (var4 == null && var2 == 0) { // L: 206 + label137: + for (int var16 = 0; var16 < class83.cacheSubPaths.length; ++var16) { // L: 207 + for (int var17 = 0; var17 < SecureRandomCallable.cacheParentPaths.length; ++var17) { // L: 208 + File var18 = new File(SecureRandomCallable.cacheParentPaths[var17] + class83.cacheSubPaths[var16] + File.separatorChar + var0 + File.separatorChar); // L: 209 + if (var18.exists()) { // L: 210 + File var19 = new File(var18, "test.dat"); // L: 212 - for (var17 = 0; var17 < 5; ++var17) { // L: 4631 - if (Client.field546[var17]) { // L: 4632 - var18 = (int)(Math.random() * (double)(Client.field756[var17] * 2 + 1) - (double)Client.field756[var17] + Math.sin((double)Client.field674[var17] / 100.0D * (double)Client.field600[var17]) * (double)Client.field636[var17]); // L: 4633 - if (var17 == 0) { // L: 4634 - WorldMapLabelSize.cameraX += var18; - } + boolean var28; + try { + RandomAccessFile var12 = new RandomAccessFile(var19, "rw"); // L: 215 + int var13 = var12.read(); // L: 216 + var12.seek(0L); // L: 217 + var12.write(var13); // L: 218 + var12.seek(0L); // L: 219 + var12.close(); // L: 220 + var19.delete(); // L: 221 + var28 = true; // L: 222 + } catch (Exception var21) { // L: 224 + var28 = false; // L: 225 + } - if (var17 == 1) { // L: 4635 - ItemContainer.cameraY += var18; - } - - if (var17 == 2) { // L: 4636 - class154.cameraZ += var18; - } - - if (var17 == 3) { // L: 4637 - class21.cameraYaw = var18 + class21.cameraYaw & 2047; - } - - if (var17 == 4) { // L: 4638 - class147.cameraPitch += var18; // L: 4639 - if (class147.cameraPitch < 128) { // L: 4640 - class147.cameraPitch = 128; - } - - if (class147.cameraPitch > 383) { // L: 4641 - class147.cameraPitch = 383; + if (var28) { // L: 228 + var4 = var18.toString(); // L: 229 + var6 = true; // L: 230 + break label137; // L: 231 + } } } } } - var17 = MouseHandler.MouseHandler_x; // L: 4645 - var18 = MouseHandler.MouseHandler_y; // L: 4646 - if (MouseHandler.MouseHandler_lastButton != 0) { // L: 4647 - var17 = MouseHandler.MouseHandler_lastPressedX; // L: 4648 - var18 = MouseHandler.MouseHandler_lastPressedY; // L: 4649 + if (var4 == null) { // L: 237 + var4 = BufferedSource.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 238 + var6 = true; // L: 239 } - if (var17 >= var0 && var17 < var0 + var2 && var18 >= var1 && var18 < var3 + var1) { // L: 4651 - var19 = var17 - var0; // L: 4652 - var20 = var18 - var1; // L: 4653 - ViewportMouse.ViewportMouse_x = var19; // L: 4655 - ViewportMouse.ViewportMouse_y = var20; // L: 4656 - ViewportMouse.ViewportMouse_isInViewport = true; // L: 4657 - ViewportMouse.ViewportMouse_entityCount = 0; // L: 4658 - ViewportMouse.ViewportMouse_false0 = false; // L: 4659 - } else { - class82.method2104(); // L: 4663 - } + if (var5 != null) { // L: 241 + File var25 = new File(var5); // L: 242 + var26 = new File(var4); // L: 243 - class116.playPcmPlayers(); // L: 4665 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4666 - class116.playPcmPlayers(); // L: 4667 - var19 = Rasterizer3D.Rasterizer3D_zoom; // L: 4668 - Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 4669 - ArchiveLoader.scene.draw(WorldMapLabelSize.cameraX, ItemContainer.cameraY, class154.cameraZ, class147.cameraPitch, class21.cameraYaw, var11); // L: 4670 - Rasterizer3D.Rasterizer3D_zoom = var19; // L: 4671 - class116.playPcmPlayers(); // L: 4672 - ArchiveLoader.scene.clearTempGameObjects(); // L: 4673 - MouseRecorder.method2096(var0, var1, var2, var3); // L: 4674 - class12.method158(var0, var1); // L: 4675 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field556); // L: 4676 - class260.method5173(); // L: 4678 - WorldMapLabelSize.cameraX = var12; // L: 4680 - ItemContainer.cameraY = var13; // L: 4681 - class154.cameraZ = var14; // L: 4682 - class147.cameraPitch = var15; // L: 4683 - class21.cameraYaw = var16; // L: 4684 - if (Client.isLoading) { // L: 4685 - byte var24 = 0; // L: 4688 - var21 = var24 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; // L: 4689 - if (var21 == 0) { // L: 4693 - Client.isLoading = false; + try { + File[] var31 = var25.listFiles(); // L: 245 + File[] var30 = var31; // L: 247 + + for (var11 = 0; var11 < var30.length; ++var11) { // L: 248 + File var29 = var30[var11]; // L: 249 + File var20 = new File(var26, var29.getName()); // L: 251 + boolean var14 = var29.renameTo(var20); // L: 252 + if (!var14) { // L: 253 + throw new IOException(); + } + } + } catch (Exception var23) { // L: 258 + var23.printStackTrace(); // L: 259 } + + var6 = true; // L: 261 } - if (Client.isLoading) { // L: 4695 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4696 - MusicPatch.drawLoadingMessage("Loading - please wait.", false); // L: 4697 + if (var6) { // L: 263 + class268.method5030(new File(var4), (File)null); } - } // L: 4699 + return new File(var4); // L: 264 + } } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index 0deb627c15..93b89aa9d5 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -4,656 +4,672 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jq") +@ObfuscatedName("jg") @Implements("ServerPacket") public class ServerPacket { - @ObfuscatedName("v") + @ObfuscatedName("um") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Lop;" ) - public static final ServerPacket field3033; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3053; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3096; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3026; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3038; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3028; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3025; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3030; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3031; + @Export("worldMap") + static WorldMap worldMap; @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) - public static final ServerPacket field3027; - @ObfuscatedName("r") + public static final ServerPacket field3166; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3072; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3116; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3035; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3036; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3037; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3128; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3114; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3111; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3041; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3042; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3097; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3044; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3086; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3047; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3119; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3048; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3049; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3050; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3034; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3052; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3029; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3023; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3024; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3056; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3057; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3058; - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3045; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3060; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3054; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3062; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3063; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3064; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3101; - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3066; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3067; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3068; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3105; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3070; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3071; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3120; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3073; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3079; - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3043; - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3076; - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3077; - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3078; - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3069; - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3080; - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3081; - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3115; - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3083; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3084; - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) public static final ServerPacket field3085; - @ObfuscatedName("bg") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) - public static final ServerPacket field3061; - @ObfuscatedName("bn") + public static final ServerPacket field3152; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) public static final ServerPacket field3087; - @ObfuscatedName("bq") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3046; - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3089; - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3090; - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3091; - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3092; - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3093; - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3094; - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3051; - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3095; - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3032; - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3040; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3099; - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3100; - @ObfuscatedName("cm") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3074; - @ObfuscatedName("cc") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3102; - @ObfuscatedName("ch") - @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) public static final ServerPacket field3088; - @ObfuscatedName("cf") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) - public static final ServerPacket field3103; - @ObfuscatedName("cv") + public static final ServerPacket field3170; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) - public static final ServerPacket field3075; - @ObfuscatedName("cs") + public static final ServerPacket field3090; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) - public static final ServerPacket field3106; - @ObfuscatedName("cz") + public static final ServerPacket field3179; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) - public static final ServerPacket field3107; - @ObfuscatedName("ct") + public static final ServerPacket field3149; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) - public static final ServerPacket field3108; - @ObfuscatedName("cb") + public static final ServerPacket field3140; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) - public static final ServerPacket field3109; - @ObfuscatedName("cp") + public static final ServerPacket field3093; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3110; - @ObfuscatedName("co") - @ObfuscatedSignature( - descriptor = "Ljq;" - ) - public static final ServerPacket field3055; - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) public static final ServerPacket field3112; - @ObfuscatedName("ci") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) - public static final ServerPacket field3113; - @ObfuscatedName("cy") + public static final ServerPacket field3096; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) - public static final ServerPacket field3039; - @ObfuscatedName("cr") + public static final ServerPacket field3092; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) - public static final ServerPacket field3059; - @ObfuscatedName("cq") + public static final ServerPacket field3089; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) - public static final ServerPacket field3104; - @ObfuscatedName("cn") + public static final ServerPacket field3099; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" + ) + public static final ServerPacket field3100; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3101; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3102; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3103; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3187; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3105; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3106; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3107; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3108; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3109; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3139; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3111; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3182; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3084; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3183; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3115; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3091; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Ljg;" ) public static final ServerPacket field3117; - @ObfuscatedName("cu") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) public static final ServerPacket field3118; - @ObfuscatedName("cg") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) - public static final ServerPacket field3082; - @ObfuscatedName("cj") + public static final ServerPacket field3119; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) - public static final ServerPacket field3098; - @ObfuscatedName("ce") + public static final ServerPacket field3120; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) public static final ServerPacket field3121; - @ObfuscatedName("cl") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) public static final ServerPacket field3122; - @ObfuscatedName("ck") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) public static final ServerPacket field3123; - @ObfuscatedName("cd") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) - public static final ServerPacket field3124; - @ObfuscatedName("cw") + public static final ServerPacket field3161; + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" ) public static final ServerPacket field3125; - @ObfuscatedName("cx") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljg;" + ) + public static final ServerPacket field3124; + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3127; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3154; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3129; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3130; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3131; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3188; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3133; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3142; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3110; + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3114; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3137; + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3094; + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3190; + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Ljg;" ) public static final ServerPacket field3126; - @ObfuscatedName("ge") - @ObfuscatedGetter( - longValue = -6208068858010154241L + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "Ljg;" ) - static long field3129; - @ObfuscatedName("dr") + public static final ServerPacket field3141; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3180; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3143; + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3144; + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3153; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3146; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3116; + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3148; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3097; + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3150; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3151; + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3134; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3147; + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3162; + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3155; + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3156; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3157; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3158; + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3159; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3160; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3098; + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3113; + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3163; + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3164; + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3165; + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3104; + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3167; + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3168; + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3169; + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3135; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3171; + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3172; + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3173; + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3174; + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3175; + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3176; + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3177; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3132; + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3086; + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3145; + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3181; + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3095; + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3186; + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3184; + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3185; + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3178; + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + public static final ServerPacket field3136; + @ObfuscatedName("dc") @ObfuscatedGetter( - intValue = 766304815 + intValue = -1591353555 ) @Export("id") public final int id; - @ObfuscatedName("dj") + @ObfuscatedName("dp") @ObfuscatedGetter( - intValue = -1617993979 + intValue = 1497414687 ) @Export("length") public final int length; static { - field3033 = new ServerPacket(0, -2); // L: 5 - field3053 = new ServerPacket(1, -2); // L: 6 - field3096 = new ServerPacket(2, 4); // L: 7 - field3026 = new ServerPacket(3, -2); // L: 8 - field3038 = new ServerPacket(4, 2); // L: 9 - field3028 = new ServerPacket(5, 1); // L: 10 - field3025 = new ServerPacket(6, 1); // L: 11 - field3030 = new ServerPacket(7, -2); // L: 12 - field3031 = new ServerPacket(8, 6); // L: 13 - field3027 = new ServerPacket(9, 1); // L: 14 - field3072 = new ServerPacket(10, 3); // L: 15 - field3116 = new ServerPacket(11, 4); // L: 16 - field3035 = new ServerPacket(12, -2); // L: 17 - field3036 = new ServerPacket(13, 2); // L: 18 - field3037 = new ServerPacket(14, -2); // L: 19 - field3128 = new ServerPacket(15, 6); // L: 20 - field3114 = new ServerPacket(16, 2); // L: 21 - field3111 = new ServerPacket(17, -1); // L: 22 - field3041 = new ServerPacket(18, -2); // L: 23 - field3042 = new ServerPacket(19, -2); // L: 24 - field3097 = new ServerPacket(20, 8); // L: 25 - field3044 = new ServerPacket(21, -2); // L: 26 - field3086 = new ServerPacket(22, 4); // L: 27 - field3047 = new ServerPacket(23, 10); // L: 28 - field3119 = new ServerPacket(24, 2); // L: 29 - field3048 = new ServerPacket(25, 2); // L: 30 - field3049 = new ServerPacket(26, -1); // L: 31 - field3050 = new ServerPacket(27, 1); // L: 32 - field3034 = new ServerPacket(28, 2); // L: 33 - field3052 = new ServerPacket(29, 6); // L: 34 - field3029 = new ServerPacket(30, -2); // L: 35 - field3023 = new ServerPacket(31, -2); // L: 36 - field3024 = new ServerPacket(32, 8); // L: 37 - field3056 = new ServerPacket(33, 0); // L: 38 - field3057 = new ServerPacket(34, -1); // L: 39 - field3058 = new ServerPacket(35, -2); // L: 40 - field3045 = new ServerPacket(36, 5); // L: 41 - field3060 = new ServerPacket(37, -2); // L: 42 - field3054 = new ServerPacket(38, 10); // L: 43 - field3062 = new ServerPacket(39, -1); // L: 44 - field3063 = new ServerPacket(40, 14); // L: 45 - field3064 = new ServerPacket(41, 5); // L: 46 - field3101 = new ServerPacket(42, 1); // L: 47 - field3066 = new ServerPacket(43, 3); // L: 48 - field3067 = new ServerPacket(44, -1); // L: 49 - field3068 = new ServerPacket(45, -2); // L: 50 - field3105 = new ServerPacket(46, 0); // L: 51 - field3070 = new ServerPacket(47, 12); // L: 52 - field3071 = new ServerPacket(48, 8); // L: 53 - field3120 = new ServerPacket(49, 0); // L: 54 - field3073 = new ServerPacket(50, 0); // L: 55 - field3079 = new ServerPacket(51, 2); // L: 56 - field3043 = new ServerPacket(52, -2); // L: 57 - field3076 = new ServerPacket(53, 20); // L: 58 - field3077 = new ServerPacket(54, 4); // L: 59 - field3078 = new ServerPacket(55, 6); // L: 60 - field3069 = new ServerPacket(56, -2); // L: 61 - field3080 = new ServerPacket(57, 0); // L: 62 - field3081 = new ServerPacket(58, 1); // L: 63 - field3115 = new ServerPacket(59, 2); // L: 64 - field3083 = new ServerPacket(60, -1); // L: 65 - field3084 = new ServerPacket(61, 28); // L: 66 - field3085 = new ServerPacket(62, 0); // L: 67 - field3061 = new ServerPacket(63, -2); // L: 68 - field3087 = new ServerPacket(64, -2); // L: 69 - field3046 = new ServerPacket(65, 5); // L: 70 - field3089 = new ServerPacket(66, -1); // L: 71 - field3090 = new ServerPacket(67, 15); // L: 72 - field3091 = new ServerPacket(68, 0); // L: 73 - field3092 = new ServerPacket(69, -2); // L: 74 - field3093 = new ServerPacket(70, 6); // L: 75 - field3094 = new ServerPacket(71, 0); // L: 76 - field3051 = new ServerPacket(72, 0); // L: 77 - field3095 = new ServerPacket(73, 4); // L: 78 - field3032 = new ServerPacket(74, 4); // L: 79 - field3040 = new ServerPacket(75, 4); // L: 80 - field3099 = new ServerPacket(76, -2); // L: 81 - field3100 = new ServerPacket(77, 5); // L: 82 - field3074 = new ServerPacket(78, -2); // L: 83 - field3102 = new ServerPacket(79, 8); // L: 84 - field3088 = new ServerPacket(80, 6); // L: 85 - field3103 = new ServerPacket(81, 7); // L: 86 - field3075 = new ServerPacket(82, 2); // L: 87 - field3106 = new ServerPacket(83, 5); // L: 88 - field3107 = new ServerPacket(84, -2); // L: 89 - field3108 = new ServerPacket(85, 7); // L: 90 - field3109 = new ServerPacket(86, -2); // L: 91 - field3110 = new ServerPacket(87, 6); // L: 92 - field3055 = new ServerPacket(88, 2); // L: 93 - field3112 = new ServerPacket(89, -1); // L: 94 - field3113 = new ServerPacket(90, -2); // L: 95 - field3039 = new ServerPacket(91, -1); // L: 96 - field3059 = new ServerPacket(92, 4); // L: 97 - field3104 = new ServerPacket(93, 6); // L: 98 - field3117 = new ServerPacket(94, 6); // L: 99 - field3118 = new ServerPacket(95, 6); // L: 100 - field3082 = new ServerPacket(96, -2); // L: 101 - field3098 = new ServerPacket(97, 6); // L: 102 - field3121 = new ServerPacket(98, 5); // L: 103 - field3122 = new ServerPacket(99, 6); // L: 104 - field3123 = new ServerPacket(100, 8); // L: 105 - field3124 = new ServerPacket(101, 8); // L: 106 - field3125 = new ServerPacket(102, 8); // L: 107 - field3126 = new ServerPacket(103, 17); // L: 108 + field3166 = new ServerPacket(0, -2); // L: 5 + field3085 = new ServerPacket(1, 17); // L: 6 + field3152 = new ServerPacket(2, 0); // L: 7 + field3087 = new ServerPacket(3, 6); // L: 8 + field3088 = new ServerPacket(4, 20); // L: 9 + field3170 = new ServerPacket(5, 8); // L: 10 + field3090 = new ServerPacket(6, 2); // L: 11 + field3179 = new ServerPacket(7, -2); // L: 12 + field3149 = new ServerPacket(8, -2); // L: 13 + field3140 = new ServerPacket(9, 1); // L: 14 + field3093 = new ServerPacket(10, -1); // L: 15 + field3112 = new ServerPacket(11, 6); // L: 16 + field3096 = new ServerPacket(12, 5); // L: 17 + field3092 = new ServerPacket(13, 0); // L: 18 + field3089 = new ServerPacket(14, -2); // L: 19 + field3099 = new ServerPacket(15, 1); // L: 20 + field3100 = new ServerPacket(16, -2); // L: 21 + field3101 = new ServerPacket(17, -2); // L: 22 + field3102 = new ServerPacket(18, 0); // L: 23 + field3103 = new ServerPacket(19, -1); // L: 24 + field3187 = new ServerPacket(20, -2); // L: 25 + field3105 = new ServerPacket(21, 2); // L: 26 + field3106 = new ServerPacket(22, -2); // L: 27 + field3107 = new ServerPacket(23, -2); // L: 28 + field3108 = new ServerPacket(24, -1); // L: 29 + field3109 = new ServerPacket(25, 2); // L: 30 + field3139 = new ServerPacket(26, -1); // L: 31 + field3111 = new ServerPacket(27, 1); // L: 32 + field3182 = new ServerPacket(28, 4); // L: 33 + field3084 = new ServerPacket(29, -1); // L: 34 + field3183 = new ServerPacket(30, -2); // L: 35 + field3115 = new ServerPacket(31, -2); // L: 36 + field3091 = new ServerPacket(32, -2); // L: 37 + field3117 = new ServerPacket(33, 5); // L: 38 + field3118 = new ServerPacket(34, 6); // L: 39 + field3119 = new ServerPacket(35, 6); // L: 40 + field3120 = new ServerPacket(36, -1); // L: 41 + field3121 = new ServerPacket(37, 8); // L: 42 + field3122 = new ServerPacket(38, 0); // L: 43 + field3123 = new ServerPacket(39, 8); // L: 44 + field3161 = new ServerPacket(40, 2); // L: 45 + field3125 = new ServerPacket(41, -2); // L: 46 + field3124 = new ServerPacket(42, 6); // L: 47 + field3127 = new ServerPacket(43, 2); // L: 48 + field3154 = new ServerPacket(44, 14); // L: 49 + field3129 = new ServerPacket(45, 6); // L: 50 + field3130 = new ServerPacket(46, 5); // L: 51 + field3131 = new ServerPacket(47, 4); // L: 52 + field3188 = new ServerPacket(48, 7); // L: 53 + field3133 = new ServerPacket(49, 2); // L: 54 + field3142 = new ServerPacket(50, 6); // L: 55 + field3110 = new ServerPacket(51, 0); // L: 56 + field3114 = new ServerPacket(52, -2); // L: 57 + field3137 = new ServerPacket(53, 6); // L: 58 + field3094 = new ServerPacket(54, 1); // L: 59 + field3190 = new ServerPacket(55, 4); // L: 60 + field3126 = new ServerPacket(56, 28); // L: 61 + field3141 = new ServerPacket(57, 0); // L: 62 + field3180 = new ServerPacket(58, -2); // L: 63 + field3143 = new ServerPacket(59, 3); // L: 64 + field3144 = new ServerPacket(60, 2); // L: 65 + field3153 = new ServerPacket(61, 10); // L: 66 + field3146 = new ServerPacket(62, 1); // L: 67 + field3116 = new ServerPacket(63, -1); // L: 68 + field3148 = new ServerPacket(64, 6); // L: 69 + field3097 = new ServerPacket(65, 6); // L: 70 + field3150 = new ServerPacket(66, 6); // L: 71 + field3151 = new ServerPacket(67, -2); // L: 72 + field3134 = new ServerPacket(68, 5); // L: 73 + field3147 = new ServerPacket(69, 0); // L: 74 + field3162 = new ServerPacket(70, 7); // L: 75 + field3155 = new ServerPacket(71, 1); // L: 76 + field3156 = new ServerPacket(72, 4); // L: 77 + field3157 = new ServerPacket(73, 8); // L: 78 + field3158 = new ServerPacket(74, 8); // L: 79 + field3159 = new ServerPacket(75, 0); // L: 80 + field3160 = new ServerPacket(76, 6); // L: 81 + field3098 = new ServerPacket(77, 3); // L: 82 + field3113 = new ServerPacket(78, -1); // L: 83 + field3163 = new ServerPacket(79, -2); // L: 84 + field3164 = new ServerPacket(80, -2); // L: 85 + field3165 = new ServerPacket(81, 2); // L: 86 + field3104 = new ServerPacket(82, 2); // L: 87 + field3167 = new ServerPacket(83, 4); // L: 88 + field3168 = new ServerPacket(84, 4); // L: 89 + field3169 = new ServerPacket(85, 2); // L: 90 + field3135 = new ServerPacket(86, 5); // L: 91 + field3171 = new ServerPacket(87, 12); // L: 92 + field3172 = new ServerPacket(88, 8); // L: 93 + field3173 = new ServerPacket(89, -2); // L: 94 + field3174 = new ServerPacket(90, 10); // L: 95 + field3175 = new ServerPacket(91, 5); // L: 96 + field3176 = new ServerPacket(92, 0); // L: 97 + field3177 = new ServerPacket(93, 4); // L: 98 + field3132 = new ServerPacket(94, 4); // L: 99 + field3086 = new ServerPacket(95, -2); // L: 100 + field3145 = new ServerPacket(96, -2); // L: 101 + field3181 = new ServerPacket(97, -2); // L: 102 + field3095 = new ServerPacket(98, -2); // L: 103 + field3186 = new ServerPacket(99, 8); // L: 104 + field3184 = new ServerPacket(100, -2); // L: 105 + field3185 = new ServerPacket(101, -1); // L: 106 + field3178 = new ServerPacket(102, 15); // L: 107 + field3136 = new ServerPacket(103, -2); // L: 108 } ServerPacket(int var1, int var2) { this.id = var1; // L: 117 this.length = var2; // L: 118 } // L: 119 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "238481455" + ) + public static int[] method5020() { + int[] var0 = new int[KeyHandler.field134]; // L: 250 + + for (int var1 = 0; var1 < KeyHandler.field134; ++var1) { // L: 251 + var0[var1] = KeyHandler.field140[var1]; // L: 252 + } + + return var0; // L: 254 + } } diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index 56fedd2d09..ca554add2b 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -1,35 +1,36 @@ +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("ha") +@ObfuscatedName("gf") @Implements("Skeleton") public class Skeleton extends Node { - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 230523547 + intValue = 1034195309 ) @Export("id") int id; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 90334317 + intValue = -27257925 ) @Export("count") int count; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("transformTypes") int[] transformTypes; - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("labels") int[][] labels; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lhk;" + descriptor = "Lgb;" ) - class231 field2590; + class202 field2409; public Skeleton(int var1, byte[] var2) { this.id = var1; // L: 19 @@ -53,170 +54,142 @@ public class Skeleton extends Node { } } - if (var3.offset < var3.array.length) { // L: 29 - var4 = var3.readUnsignedShort(); // L: 30 - if (var4 > 0) { // L: 31 - this.field2590 = new class231(var3, var4); // L: 32 + if (var3.offset < var3.array.length) { + var4 = var3.readUnsignedShort(); + if (var4 > 0) { + this.field2409 = new class202(var3, var4); } } - } // L: 35 + } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "21" + descriptor = "(I)I", + garbageValue = "-2063510736" ) - public int method4720() { + public int method4018() { return this.count; // L: 38 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)Lhk;", - garbageValue = "1609725684" + descriptor = "(I)Lgb;", + garbageValue = "2098752701" ) - public class231 method4721() { - return this.field2590; // L: 42 + public class202 method4023() { + return this.field2409; // L: 42 } - @ObfuscatedName("p") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-1" + descriptor = "(ILnc;Lle;I)V", + garbageValue = "-2024769656" ) - static final void method4728(String var0) { - PacketBufferNode var1 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2961, Client.packetWriter.isaacCipher); // L: 115 - var1.packetBuffer.writeByte(class425.stringCp1252NullTerminatedByteSize(var0)); // L: 116 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 117 - Client.packetWriter.addNode(var1); // L: 118 - } // L: 119 - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "608778502" - ) - static int method4729(int var0, Script var1, boolean var2) { - if (var0 == 7100) { // L: 4592 - ++Interpreter.Interpreter_intStackSize; // L: 4593 - return 1; // L: 4594 - } else if (var0 == 7101) { // L: 4596 - class122.Interpreter_stringStackSize += 2; // L: 4597 - return 1; // L: 4598 - } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { // L: 4600 - if (var0 == 7106) { // L: 4604 - ++Interpreter.Interpreter_intStackSize; // L: 4605 - return 1; // L: 4606 - } else if (var0 == 7107) { // L: 4608 - ++Interpreter.Interpreter_intStackSize; // L: 4609 - return 1; // L: 4610 - } else if (var0 == 7108) { // L: 4612 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.method303() ? 1 : 0; // L: 4613 - return 1; // L: 4614 - } else if (var0 == 7110) { // L: 4616 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4617 - return 1; // L: 4618 - } else if (var0 == 7120) { // L: 4620 - --Interpreter.Interpreter_intStackSize; // L: 4621 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4622 - return 1; // L: 4623 - } else if (var0 == 7121) { // L: 4625 - Interpreter.Interpreter_intStackSize -= 2; // L: 4626 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4627 - return 1; // L: 4628 - } else if (var0 == 7122) { // L: 4630 - Interpreter.Interpreter_intStackSize -= 2; // L: 4631 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4632 - return 1; // L: 4633 - } else { - return 2; // L: 4635 + static void method4022(int var0, ArchiveDisk var1, Archive var2) { + byte[] var3 = null; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + for (ArchiveDiskAction var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var5 != null; var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { + if (var5.key == (long)var0 && var1 == var5.archiveDisk && var5.type == 0) { + var3 = var5.data; // L: 34 + break; + } } + } + + if (var3 != null) { // L: 39 + var2.load(var1, var0, var3, true); // L: 40 } else { - ++Interpreter.Interpreter_intStackSize; // L: 4601 - return 1; // L: 4602 + byte[] var4 = var1.read(var0); // L: 43 + var2.load(var1, var0, var4, true); // L: 44 + } + } // L: 41 45 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Lnf;ZI)V", + garbageValue = "-824720850" + ) + public static void method4024(AbstractSocket var0, boolean var1) { + if (NetCache.NetCache_socket != null) { // L: 60 + try { + NetCache.NetCache_socket.close(); // L: 62 + } catch (Exception var6) { // L: 64 + } + + NetCache.NetCache_socket = null; // L: 65 + } + + NetCache.NetCache_socket = var0; // L: 67 + MouseRecorder.method2088(var1); // L: 68 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 69 + WorldMapIcon_0.NetCache_currentResponse = null; // L: 70 + class357.NetCache_responseArchiveBuffer = null; // L: 71 + NetCache.field4052 = 0; // L: 72 + + while (true) { + NetFileRequest var2 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 74 + if (var2 == null) { // L: 75 + while (true) { + var2 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 81 + if (var2 == null) { // L: 82 + if (NetCache.field4043 != 0) { // L: 88 + try { + Buffer var7 = new Buffer(4); // L: 90 + var7.writeByte(4); // L: 91 + var7.writeByte(NetCache.field4043); // L: 92 + var7.writeShort(0); // L: 93 + NetCache.NetCache_socket.write(var7.array, 0, 4); // L: 94 + } catch (IOException var5) { + try { + NetCache.NetCache_socket.close(); // L: 98 + } catch (Exception var4) { // L: 100 + } + + ++NetCache.NetCache_ioExceptions; // L: 101 + NetCache.NetCache_socket = null; // L: 102 + } + } + + NetCache.NetCache_loadTime = 0; // L: 105 + NetCache.field4041 = class113.method2624(); // L: 106 + return; // L: 107 + } + + NetCache.NetCache_pendingWritesQueue.addLast(var2); // L: 83 + NetCache.NetCache_pendingWrites.put(var2, var2.key); // L: 84 + ++NetCache.NetCache_pendingWritesCount; // L: 85 + --NetCache.NetCache_pendingResponsesCount; // L: 86 + } + } + + NetCache.NetCache_pendingPriorityWrites.put(var2, var2.key); // L: 76 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 77 + --NetCache.NetCache_pendingPriorityResponsesCount; // L: 78 } } - @ObfuscatedName("gm") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lcb;I)V", - garbageValue = "664542157" + descriptor = "(III)I", + garbageValue = "1940091052" ) - static final void method4730(Actor var0) { - if (var0.field1175 != 0) { // L: 4065 - if (var0.targetIndex != -1) { // L: 4066 - Object var1 = null; // L: 4067 - if (var0.targetIndex < 32768) { // L: 4068 - var1 = Client.npcs[var0.targetIndex]; - } else if (var0.targetIndex >= 32768) { // L: 4069 - var1 = Client.players[var0.targetIndex - 32768]; - } + static int method4019(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 - if (var1 != null) { // L: 4070 - int var2 = var0.x - ((Actor)var1).x; // L: 4071 - int var3 = var0.y - ((Actor)var1).y; // L: 4072 - if (var2 != 0 || var3 != 0) { // L: 4073 - var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047; - } - } else if (var0.false0) { // L: 4075 - var0.targetIndex = -1; // L: 4076 - var0.false0 = false; // L: 4077 + for (int var4 = 0; var4 < var2.quantities.length; ++var4) { // L: 32 + if (var2.ids[var4] == var1) { + var3 += var2.quantities[var4]; // L: 33 } } - if (var0.field1121 != -1 && (var0.pathLength == 0 || var0.field1179 > 0)) { // L: 4080 - var0.orientation = var0.field1121; // L: 4081 - var0.field1121 = -1; // L: 4082 - } - - int var4 = var0.orientation - var0.rotation & 2047; // L: 4084 - if (var4 == 0 && var0.false0) { // L: 4085 - var0.targetIndex = -1; // L: 4086 - var0.false0 = false; // L: 4087 - } - - if (var4 != 0) { // L: 4089 - ++var0.field1174; // L: 4090 - boolean var6; - if (var4 > 1024) { // L: 4091 - var0.rotation -= var0.field1144 ? var4 : var0.field1175 * -730517519 * -1419386607; // L: 4092 - var6 = true; // L: 4093 - if (var4 < var0.field1175 || var4 > 2048 - var0.field1175) { // L: 4094 - var0.rotation = var0.orientation; // L: 4095 - var6 = false; // L: 4096 - } - - if (!var0.field1144 && var0.idleSequence == var0.movementSequence && (var0.field1174 > 25 || var6)) { // L: 4098 - if (var0.turnLeftSequence != -1) { // L: 4099 - var0.movementSequence = var0.turnLeftSequence; - } else { - var0.movementSequence = var0.walkSequence; // L: 4100 - } - } - } else { - var0.rotation += var0.field1144 ? var4 : -1419386607 * var0.field1175 * -730517519; // L: 4104 - var6 = true; // L: 4105 - if (var4 < var0.field1175 || var4 > 2048 - var0.field1175) { // L: 4106 - var0.rotation = var0.orientation; // L: 4107 - var6 = false; // L: 4108 - } - - if (!var0.field1144 && var0.movementSequence == var0.idleSequence && (var0.field1174 > 25 || var6)) { // L: 4110 - if (var0.turnRightSequence != -1) { // L: 4111 - var0.movementSequence = var0.turnRightSequence; - } else { - var0.movementSequence = var0.walkSequence; // L: 4112 - } - } - } - - var0.rotation &= 2047; // L: 4116 - var0.field1144 = false; // L: 4117 - } else { - var0.field1174 = 0; // L: 4119 - } - + return var3; // L: 35 } - } // L: 4120 + } } diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index caa0f985aa..9daf504357 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -1,23 +1,20 @@ +import java.applet.Applet; +import java.net.URL; 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("kq") +@ObfuscatedName("kj") @Implements("Skills") public class Skills { - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("Skills_enabled") public static final boolean[] Skills_enabled; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("Skills_experienceTable") public static int[] Skills_experienceTable; - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Llo;" - ) - @Export("clientLanguage") - static Language clientLanguage; static { Skills_enabled = new boolean[]{true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false}; // L: 5 @@ -33,37 +30,124 @@ public class Skills { } // L: 16 - @ObfuscatedName("jk") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lky;I)Z", - garbageValue = "1366741641" + descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z", + garbageValue = "-363880091" ) - @Export("runCs1") - static final boolean runCs1(Widget var0) { - if (var0.cs1Comparisons == null) { // L: 10905 - return false; - } else { - for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 10906 - int var2 = BufferedSource.method6907(var0, var1); // L: 10907 - int var3 = var0.cs1ComparisonValues[var1]; // L: 10908 - if (var0.cs1Comparisons[var1] == 2) { // L: 10909 - if (var2 >= var3) { // L: 10910 - return false; + static boolean method5578(String var0, int var1, String var2) { + if (var1 == 0) { // L: 63 + try { + if (!class29.field168.startsWith("win")) { // L: 65 + throw new Exception(); + } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 66 + throw new Exception(); + } else { + String var13 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 67 + + for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 68 + if (var13.indexOf(var0.charAt(var4)) == -1) { // L: 69 + throw new Exception(); + } } - } else if (var0.cs1Comparisons[var1] == 3) { // L: 10912 - if (var2 <= var3) { // L: 10913 - return false; - } - } else if (var0.cs1Comparisons[var1] == 4) { // L: 10915 - if (var2 == var3) { // L: 10916 - return false; - } - } else if (var2 != var3) { // L: 10918 - return false; + + Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 71 + return true; // L: 72 } + } catch (Throwable var8) { // L: 74 + return false; // L: 75 + } + } else if (var1 == 1) { // L: 78 + try { + Applet var7 = class29.field170; // L: 81 + Object[] var5 = new Object[]{(new URL(class29.field170.getCodeBase(), var0)).toString()}; // L: 82 + Object var3 = JSObject.getWindow(var7).call(var2, var5); // L: 85 + return var3 != null; // L: 88 + } catch (Throwable var9) { // L: 90 + return false; // L: 91 + } + } else if (var1 == 2) { // L: 94 + try { + class29.field170.getAppletContext().showDocument(new URL(class29.field170.getCodeBase(), var0), "_blank"); // L: 96 + return true; // L: 97 + } catch (Exception var10) { // L: 99 + return false; // L: 100 + } + } else if (var1 == 3) { // L: 103 + try { + class27.method370(class29.field170, "loggedout"); // L: 105 + } catch (Throwable var12) { // L: 107 } - return true; // L: 10920 + try { + class29.field170.getAppletContext().showDocument(new URL(class29.field170.getCodeBase(), var0), "_top"); // L: 109 + return true; // L: 110 + } catch (Exception var11) { // L: 112 + return false; // L: 113 + } + } else { + throw new IllegalArgumentException(); // L: 116 } } + + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "([BB)[B", + garbageValue = "-45" + ) + @Export("decompressBytes") + static final byte[] decompressBytes(byte[] var0) { + Buffer var1 = new Buffer(var0); // L: 370 + int var2 = var1.readUnsignedByte(); // L: 371 + int var3 = var1.readInt(); // L: 372 + if (var3 < 0 || AbstractArchive.field4026 != 0 && var3 > AbstractArchive.field4026) { // L: 373 + throw new RuntimeException(); // L: 374 + } else if (var2 == 0) { // L: 376 + byte[] var6 = new byte[var3]; // L: 377 + var1.readBytes(var6, 0, var3); // L: 378 + return var6; // L: 379 + } else { + int var4 = var1.readInt(); // L: 382 + if (var4 >= 0 && (AbstractArchive.field4026 == 0 || var4 <= AbstractArchive.field4026)) { // L: 383 + byte[] var5 = new byte[var4]; // L: 386 + if (var2 == 1) { // L: 387 + BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); + } else { + AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 388 + } + + return var5; // L: 389 + } else { + throw new RuntimeException(); // L: 384 + } + } + } + + @ObfuscatedName("iv") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1857636420" + ) + @Export("resumePauseWidget") + static void resumePauseWidget(int var0, int var1) { + PacketBufferNode var2 = WallDecoration.getPacketBufferNode(ClientPacket.field2967, Client.packetWriter.isaacCipher); // L: 9801 + var2.packetBuffer.writeIntME(var0); // L: 9802 + var2.packetBuffer.method7551(var1); // L: 9803 + Client.packetWriter.addNode(var2); // L: 9804 + } // L: 9805 + + @ObfuscatedName("ky") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-224237635" + ) + @Export("Clan_joinChat") + static final void Clan_joinChat(String var0) { + if (!var0.equals("")) { // L: 12447 + PacketBufferNode var1 = WallDecoration.getPacketBufferNode(ClientPacket.field2970, Client.packetWriter.isaacCipher); // L: 12449 + var1.packetBuffer.writeByte(class392.stringCp1252NullTerminatedByteSize(var0)); // L: 12450 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 12451 + Client.packetWriter.addNode(var1); // L: 12452 + } + } // L: 12453 } diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java index 033496ef7a..4a2c2d49ec 100644 --- a/runescape-client/src/main/java/SoftWrapper.java +++ b/runescape-client/src/main/java/SoftWrapper.java @@ -3,10 +3,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("if") +@ObfuscatedName("ij") @Implements("SoftWrapper") public class SoftWrapper extends Wrapper { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("ref") SoftReference ref; @@ -15,13 +15,13 @@ public class SoftWrapper extends Wrapper { this.ref = new SoftReference(var1); // L: 11 } // L: 12 - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("get") Object get() { return this.ref.get(); // L: 15 } - @ObfuscatedName("c") + @ObfuscatedName("q") @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 e32d9d0759..3fb65d9b50 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -1,56 +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("ac") +@ObfuscatedName("an") @Implements("SoundCache") public class SoundCache { - @ObfuscatedName("n") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lln;" - ) - @Export("ItemDefinition_archive") - static AbstractArchive ItemDefinition_archive; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -1560740679 - ) - static int field311; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - @Export("Widget_spritesArchive") - static AbstractArchive Widget_spritesArchive; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("soundEffectIndex") AbstractArchive soundEffectIndex; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("musicSampleIndex") AbstractArchive musicSampleIndex; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lpo;" + descriptor = "Lpv;" ) @Export("musicSamples") NodeHashTable musicSamples; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lpo;" + descriptor = "Lpv;" ) @Export("rawSounds") NodeHashTable rawSounds; @ObfuscatedSignature( - descriptor = "(Lln;Lln;)V" + descriptor = "(Llp;Llp;)V" ) public SoundCache(AbstractArchive var1, AbstractArchive var2) { this.musicSamples = new NodeHashTable(256); // L: 9 @@ -59,10 +41,10 @@ public class SoundCache { this.musicSampleIndex = var2; // L: 14 } // L: 15 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II[II)Lat;", - garbageValue = "-1555701815" + descriptor = "(II[II)Lak;", + garbageValue = "-317198731" ) @Export("getSoundEffect0") RawSound getSoundEffect0(int var1, int var2, int[] var3) { @@ -90,10 +72,10 @@ public class SoundCache { } } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(II[II)Lat;", - garbageValue = "-1329492986" + descriptor = "(II[II)Lak;", + garbageValue = "830371012" ) @Export("getMusicSample0") RawSound getMusicSample0(int var1, int var2, int[] var3) { @@ -127,10 +109,10 @@ public class SoundCache { } } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I[II)Lat;", - garbageValue = "-1579364603" + descriptor = "(I[II)Lak;", + garbageValue = "-1527876593" ) @Export("getSoundEffect") public RawSound getSoundEffect(int var1, int[] var2) { @@ -143,10 +125,10 @@ public class SoundCache { } } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I[IB)Lat;", - garbageValue = "74" + descriptor = "(I[II)Lak;", + garbageValue = "243303881" ) @Export("getMusicSample") public RawSound getMusicSample(int var1, int[] var2) { @@ -159,87 +141,475 @@ public class SoundCache { } } - @ObfuscatedName("l") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "662567928" + descriptor = "(Lmx;Lmx;Lmx;I)V", + garbageValue = "-417556486" ) - static int method779(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 66 - if (var1 == null) { // L: 67 - return -1; + @Export("drawTitle") + static void drawTitle(Font var0, Font var1, Font var2) { + Login.xPadding = (GraphicsObject.canvasWidth - 765) / 2; // L: 1171 + Login.loginBoxX = Login.xPadding + 202; // L: 1172 + Decimator.loginBoxCenter = Login.loginBoxX + 180; // L: 1173 + if (Login.worldSelectOpen) { // L: 1174 + Language.method5885(var0, var1); // L: 1175 } else { - return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 68 69 - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1695145836" - ) - static void method768() { - if (TileItem.loadWorlds()) { // L: 1844 - Login.worldSelectOpen = true; // L: 1845 - Login.worldSelectPage = 0; // L: 1846 - Login.worldSelectPagesCount = 0; // L: 1847 - } - - } // L: 1849 - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-2116988411" - ) - static final int method772(int var0, int var1) { - if (var0 == -1) { // L: 934 - return 12345678; - } else { - var1 = (var0 & 127) * var1 / 128; // L: 935 - if (var1 < 2) { // L: 936 - var1 = 2; - } else if (var1 > 126) { // L: 937 - var1 = 126; + UserComparator6.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1178 + SecureRandomCallable.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1179 + Clock.logoSprite.drawAt(Login.xPadding + 382 - Clock.logoSprite.subWidth / 2, 18); // L: 1180 + int var4; + if (Client.gameState == 0 || Client.gameState == 5) { // L: 1181 + byte var3 = 20; // L: 1182 + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 1183 + var4 = 253 - var3; // L: 1184 + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 1185 + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 1186 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 1187 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.Login_loadingPercent * 3 + (Login.loginBoxX + 180 - 150), var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 1188 + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 1189 } - return (var0 & 65408) + var1; // L: 938 - } - } + String var5; + String var7; + String var8; + int var9; + char[] var10; + int var11; + short var25; + int var26; + short var27; + if (Client.gameState == 20) { // L: 1191 + Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); // L: 1192 + var25 = 201; // L: 1193 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var25, 16776960, 0); // L: 1194 + var26 = var25 + 15; // L: 1195 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var26, 16776960, 0); // L: 1196 + var26 += 15; // L: 1197 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var26, 16776960, 0); // L: 1198 + var26 += 15; // L: 1199 + var26 += 7; // L: 1200 + if (Login.loginIndex != 4 && Login.loginIndex != 10) { // L: 1201 + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var26, 16777215, 0); // L: 1202 + var27 = 200; // L: 1203 - @ObfuscatedName("fh") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2105059803" - ) - @Export("playSong") - static void playSong(int var0) { - if (var0 == -1 && !Client.playingJingle) { // L: 3608 - class273.midiPcmStream.clear(); // L: 3610 - class273.musicPlayerStatus = 1; // L: 3611 - class273.musicTrackArchive = null; // L: 3612 - } else if (var0 != -1 && var0 != Client.currentTrackGroupId && class131.clientPreferences.method2321() != 0 && !Client.playingJingle) { // L: 3615 - NPCComposition.method3530(2, class16.archive6, var0, 0, class131.clientPreferences.method2321(), false); // L: 3616 - } + for (var5 = class168.method3253(); var0.stringWidth(var5) > var27; var5 = var5.substring(0, var5.length() - 1)) { // L: 1204 1205 1206 + } - Client.currentTrackGroupId = var0; // L: 3618 - } // L: 3619 + var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var26, 16777215, 0); // L: 1208 + var26 += 15; // L: 1209 + var7 = Login.Login_password; // L: 1211 + var9 = var7.length(); // L: 1214 + var10 = new char[var9]; // L: 1216 - @ObfuscatedName("io") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1445752455" - ) - static final boolean method781(int var0) { - if (var0 < 0) { // L: 8792 - return false; - } else { - int var1 = Client.menuOpcodes[var0]; // L: 8793 - if (var1 >= 2000) { // L: 8794 - var1 -= 2000; + for (var11 = 0; var11 < var9; ++var11) { // L: 1217 + var10[var11] = '*'; + } + + var8 = new String(var10); // L: 1218 + + for (var8 = var8; var0.stringWidth(var8) > var27; var8 = var8.substring(1)) { // L: 1222 1223 1224 + } + + var0.draw("Password: " + var8, Login.loginBoxX + 180 - 108, var26, 16777215, 0); // L: 1226 + var26 += 15; // L: 1227 + } + } + + if (Client.gameState == 10 || Client.gameState == 11 || Client.gameState == 50) { // L: 1230 + Login.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 1231 + short var19; + if (Login.loginIndex == 0) { // L: 1232 + var25 = 251; // L: 1233 + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var25, 16776960, 0); // L: 1234 + var26 = var25 + 30; // L: 1235 + var4 = Login.loginBoxX + 180 - 80; // L: 1236 + var19 = 291; // L: 1237 + Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1238 + var0.drawLines("New User", var4 - 73, var19 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1239 + var4 = Login.loginBoxX + 180 + 80; // L: 1240 + Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1241 + var0.drawLines("Existing User", var4 - 73, var19 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1242 + } else if (Login.loginIndex == 1) { // L: 1244 + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 1245 + var25 = 236; // L: 1246 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var25, 16777215, 0); // L: 1247 + var26 = var25 + 15; // L: 1248 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var26, 16777215, 0); // L: 1249 + var26 += 15; // L: 1250 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var26, 16777215, 0); // L: 1251 + var26 += 15; // L: 1252 + var4 = Login.loginBoxX + 180 - 80; // L: 1253 + var19 = 321; // L: 1254 + Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1255 + var0.drawCentered("Continue", var4, var19 + 5, 16777215, 0); // L: 1256 + var4 = Login.loginBoxX + 180 + 80; // L: 1257 + Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1258 + var0.drawCentered("Cancel", var4, var19 + 5, 16777215, 0); // L: 1259 + } else { + IndexedSprite var28; + if (Login.loginIndex == 2) { // L: 1261 + var25 = 201; // L: 1262 + var0.drawCentered(Login.Login_response1, Decimator.loginBoxCenter, var25, 16776960, 0); // L: 1263 + var26 = var25 + 15; // L: 1264 + var0.drawCentered(Login.Login_response2, Decimator.loginBoxCenter, var26, 16776960, 0); // L: 1265 + var26 += 15; // L: 1266 + var0.drawCentered(Login.Login_response3, Decimator.loginBoxCenter, var26, 16776960, 0); // L: 1267 + var26 += 15; // L: 1268 + var26 += 7; // L: 1269 + var0.draw("Login: ", Decimator.loginBoxCenter - 110, var26, 16777215, 0); // L: 1270 + var27 = 200; // L: 1271 + + for (var5 = class168.method3253(); var0.stringWidth(var5) > var27; var5 = var5.substring(1)) { // L: 1272 1273 1274 + } + + var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? class166.colorStartTag(16776960) + "|" : ""), Decimator.loginBoxCenter - 70, var26, 16777215, 0); // L: 1276 + var26 += 15; // L: 1277 + var7 = Login.Login_password; // L: 1279 + var9 = var7.length(); // L: 1282 + var10 = new char[var9]; // L: 1284 + + for (var11 = 0; var11 < var9; ++var11) { // L: 1285 + var10[var11] = '*'; + } + + var8 = new String(var10); // L: 1286 + + for (var8 = var8; var0.stringWidth(var8) > var27; var8 = var8.substring(1)) { // L: 1290 1291 1292 + } + + var0.draw("Password: " + var8 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? class166.colorStartTag(16776960) + "|" : ""), Decimator.loginBoxCenter - 108, var26, 16777215, 0); // L: 1294 + var26 += 15; // L: 1295 + var25 = 277; // L: 1296 + var9 = Decimator.loginBoxCenter + -117; // L: 1297 + boolean var29 = Client.Login_isUsernameRemembered; // L: 1299 + boolean var12 = Login.field879; // L: 1300 + var28 = var29 ? (var12 ? UrlRequester.field1354 : class101.options_buttons_2Sprite) : (var12 ? Login.field888 : class67.options_buttons_0Sprite); // L: 1302 + var28.drawAt(var9, var25); // L: 1305 + var9 = var9 + var28.subWidth + 5; // L: 1306 + var1.draw("Remember username", var9, var25 + 13, 16776960, 0); // L: 1307 + var9 = Decimator.loginBoxCenter + 24; // L: 1308 + boolean var15 = class12.clientPreferences.method2257(); // L: 1310 + boolean var16 = Login.field881; // L: 1311 + IndexedSprite var14 = var15 ? (var16 ? UrlRequester.field1354 : class101.options_buttons_2Sprite) : (var16 ? Login.field888 : class67.options_buttons_0Sprite); // L: 1313 + var14.drawAt(var9, var25); // L: 1316 + var9 = var9 + var14.subWidth + 5; // L: 1317 + var1.draw("Hide username", var9, var25 + 13, 16776960, 0); // L: 1318 + var26 = var25 + 15; // L: 1319 + int var17 = Decimator.loginBoxCenter - 80; // L: 1320 + short var18 = 321; // L: 1321 + Login.titlebuttonSprite.drawAt(var17 - 73, var18 - 20); // L: 1322 + var0.drawCentered("Login", var17, var18 + 5, 16777215, 0); // L: 1323 + var17 = Decimator.loginBoxCenter + 80; // L: 1324 + Login.titlebuttonSprite.drawAt(var17 - 73, var18 - 20); // L: 1325 + var0.drawCentered("Cancel", var17, var18 + 5, 16777215, 0); // L: 1326 + var25 = 357; // L: 1327 + switch(Login.field907) { // L: 1328 + case 2: + class17.field89 = "Having trouble logging in?"; // L: 1333 + break; + default: + class17.field89 = "Can't login? Click here."; // L: 1330 + } + + ChatChannel.field976 = new Bounds(Decimator.loginBoxCenter, var25, var1.stringWidth(class17.field89), 11); // L: 1336 + ChatChannel.field977 = new Bounds(Decimator.loginBoxCenter, var25, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1337 + var1.drawCentered(class17.field89, Decimator.loginBoxCenter, var25, 16777215, 0); // L: 1338 + } else if (Login.loginIndex == 3) { // L: 1340 + var25 = 201; // L: 1341 + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var25, 16776960, 0); // L: 1342 + var26 = var25 + 20; // L: 1343 + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var26, 16776960, 0); // L: 1344 + var26 += 15; // L: 1345 + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var26, 16776960, 0); // L: 1346 + var26 += 15; // L: 1347 + var4 = Login.loginBoxX + 180; // L: 1348 + var19 = 276; // L: 1349 + Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1350 + var2.drawCentered("Try again", var4, var19 + 5, 16777215, 0); // L: 1351 + var4 = Login.loginBoxX + 180; // L: 1352 + var19 = 326; // L: 1353 + Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1354 + var2.drawCentered("Forgotten password?", var4, var19 + 5, 16777215, 0); // L: 1355 + } else if (Login.loginIndex == 4) { // L: 1357 + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1358 + var25 = 236; // L: 1359 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var25, 16777215, 0); // L: 1360 + var26 = var25 + 15; // L: 1361 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var26, 16777215, 0); // L: 1362 + var26 += 15; // L: 1363 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var26, 16777215, 0); // L: 1364 + var26 += 15; // L: 1365 + var5 = "PIN: "; // L: 1367 + var7 = class92.otp; // L: 1369 + var9 = var7.length(); // L: 1372 + var10 = new char[var9]; // L: 1374 + + for (var11 = 0; var11 < var9; ++var11) { // L: 1375 + var10[var11] = '*'; + } + + var8 = new String(var10); // L: 1376 + var0.draw(var5 + var8 + (Client.cycle % 40 < 20 ? class166.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var26, 16777215, 0); // L: 1380 + var26 -= 8; // L: 1381 + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var26, 16776960, 0); // L: 1382 + var26 += 15; // L: 1383 + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var26, 16776960, 0); // L: 1384 + int var22 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1385 + var9 = var26 - var0.ascent; // L: 1386 + if (Login.field900) { // L: 1388 + var28 = class101.options_buttons_2Sprite; // L: 1389 + } else { + var28 = class67.options_buttons_0Sprite; // L: 1392 + } + + var28.drawAt(var22, var9); // L: 1394 + var26 += 15; // L: 1395 + var11 = Login.loginBoxX + 180 - 80; // L: 1396 + short var30 = 321; // L: 1397 + Login.titlebuttonSprite.drawAt(var11 - 73, var30 - 20); // L: 1398 + var0.drawCentered("Continue", var11, var30 + 5, 16777215, 0); // L: 1399 + var11 = Login.loginBoxX + 180 + 80; // L: 1400 + Login.titlebuttonSprite.drawAt(var11 - 73, var30 - 20); // L: 1401 + var0.drawCentered("Cancel", var11, var30 + 5, 16777215, 0); // L: 1402 + var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var30 + 36, 255, 0); // L: 1403 + } else if (Login.loginIndex == 5) { // L: 1405 + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1406 + var25 = 221; // L: 1407 + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var25, 16776960, 0); // L: 1408 + var26 = var25 + 15; // L: 1409 + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var26, 16776960, 0); // L: 1410 + var26 += 15; // L: 1411 + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var26, 16776960, 0); // L: 1412 + var26 += 15; // L: 1413 + var26 += 14; // L: 1414 + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var26, 16777215, 0); // L: 1415 + var27 = 174; // L: 1416 + + for (var5 = class168.method3253(); var0.stringWidth(var5) > var27; var5 = var5.substring(1)) { // L: 1417 1418 1419 + } + + var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? class166.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var26, 16777215, 0); // L: 1421 + var26 += 15; // L: 1422 + int var23 = Login.loginBoxX + 180 - 80; // L: 1423 + short var21 = 321; // L: 1424 + Login.titlebuttonSprite.drawAt(var23 - 73, var21 - 20); // L: 1425 + var0.drawCentered("Recover", var23, var21 + 5, 16777215, 0); // L: 1426 + var23 = Login.loginBoxX + 180 + 80; // L: 1427 + Login.titlebuttonSprite.drawAt(var23 - 73, var21 - 20); // L: 1428 + var0.drawCentered("Back", var23, var21 + 5, 16777215, 0); // L: 1429 + var21 = 356; // L: 1430 + var1.drawCentered("Still having trouble logging in?", Decimator.loginBoxCenter, var21, 268435455, 0); // L: 1431 + } else if (Login.loginIndex == 6) { // L: 1433 + var25 = 201; // L: 1434 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var25, 16776960, 0); // L: 1435 + var26 = var25 + 15; // L: 1436 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var26, 16776960, 0); // L: 1437 + var26 += 15; // L: 1438 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var26, 16776960, 0); // L: 1439 + var26 += 15; // L: 1440 + var4 = Login.loginBoxX + 180; // L: 1441 + var19 = 321; // L: 1442 + Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1443 + var0.drawCentered("Back", var4, var19 + 5, 16777215, 0); // L: 1444 + } else if (Login.loginIndex == 7) { // L: 1446 + if (class92.field1273 && !Client.onMobile) { // L: 1447 + var25 = 201; // L: 1448 + var0.drawCentered(Login.Login_response1, Decimator.loginBoxCenter, var25, 16776960, 0); // L: 1449 + var26 = var25 + 15; // L: 1450 + var0.drawCentered(Login.Login_response2, Decimator.loginBoxCenter, var26, 16776960, 0); // L: 1451 + var26 += 15; // L: 1452 + var0.drawCentered(Login.Login_response3, Decimator.loginBoxCenter, var26, 16776960, 0); // L: 1453 + var4 = Decimator.loginBoxCenter - 150; // L: 1454 + var26 += 10; // L: 1455 + + int var31; + for (var31 = 0; var31 < 8; ++var31) { // L: 1456 + Login.titlebuttonSprite.method7927(var4, var26, 30, 40); // L: 1457 + boolean var35 = var31 == Login.field896 & Client.cycle % 40 < 20; // L: 1458 + var0.draw((Login.field876[var31] == null ? "" : Login.field876[var31]) + (var35 ? class166.colorStartTag(16776960) + "|" : ""), var4 + 10, var26 + 27, 16777215, 0); // L: 1459 + if (var31 != 1 && var31 != 3) { // L: 1460 + var4 += 35; // L: 1465 + } else { + var4 += 50; // L: 1461 + var0.draw(AbstractFont.escapeBrackets("/"), var4 - 13, var26 + 27, 16777215, 0); // L: 1462 + } + } + + var31 = Decimator.loginBoxCenter - 80; // L: 1468 + short var36 = 321; // L: 1469 + Login.titlebuttonSprite.drawAt(var31 - 73, var36 - 20); // L: 1470 + var0.drawCentered("Submit", var31, var36 + 5, 16777215, 0); // L: 1471 + var31 = Decimator.loginBoxCenter + 80; // L: 1472 + Login.titlebuttonSprite.drawAt(var31 - 73, var36 - 20); // L: 1473 + var0.drawCentered("Cancel", var31, var36 + 5, 16777215, 0); // L: 1474 + } else { + var25 = 216; // L: 1477 + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var25, 16776960, 0); // L: 1478 + var26 = var25 + 15; // L: 1479 + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var26, 16776960, 0); // L: 1480 + var26 += 15; // L: 1481 + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var26, 16776960, 0); // L: 1482 + var26 += 15; // L: 1483 + var4 = Login.loginBoxX + 180 - 80; // L: 1484 + var19 = 321; // L: 1485 + Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1486 + var0.drawCentered("Set Date of Birth", var4, var19 + 5, 16777215, 0); // L: 1487 + var4 = Login.loginBoxX + 180 + 80; // L: 1488 + Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1489 + var0.drawCentered("Back", var4, var19 + 5, 16777215, 0); // L: 1490 + } + } else if (Login.loginIndex == 8) { // L: 1493 + var25 = 216; // L: 1494 + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var25, 16776960, 0); // L: 1495 + var26 = var25 + 15; // L: 1496 + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var26, 16776960, 0); // L: 1497 + var26 += 15; // L: 1498 + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var26, 16776960, 0); // L: 1499 + var26 += 15; // L: 1500 + var4 = Login.loginBoxX + 180 - 80; // L: 1501 + var19 = 321; // L: 1502 + Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1503 + var0.drawCentered("Privacy Policy", var4, var19 + 5, 16777215, 0); // L: 1504 + var4 = Login.loginBoxX + 180 + 80; // L: 1505 + Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1506 + var0.drawCentered("Back", var4, var19 + 5, 16777215, 0); // L: 1507 + } else if (Login.loginIndex == 9) { // L: 1509 + var25 = 221; // L: 1510 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var25, 16776960, 0); // L: 1511 + var26 = var25 + 25; // L: 1512 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var26, 16776960, 0); // L: 1513 + var26 += 25; // L: 1514 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var26, 16776960, 0); // L: 1515 + var4 = Login.loginBoxX + 180; // L: 1516 + var19 = 311; // L: 1517 + Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1518 + var0.drawCentered("Try again", var4, var19 + 5, 16777215, 0); // L: 1519 + } else if (Login.loginIndex == 10) { // L: 1521 + var26 = Login.loginBoxX + 180; // L: 1522 + var27 = 209; // L: 1523 + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var27, 16776960, 0); // L: 1524 + var4 = var27 + 20; // L: 1525 + Clock.field1839.drawAt(var26 - 109, var4); // L: 1526 + Login.field882.drawAt(var26 - 48, var4 + 18); // L: 1527 + } else if (Login.loginIndex == 12) { // L: 1529 + var26 = Decimator.loginBoxCenter; // L: 1530 + var27 = 216; // L: 1531 + var2.drawCentered("Before using this app, please read and accept our", var26, var27, 16777215, 0); // L: 1532 + var4 = var27 + 17; // L: 1533 + var2.drawCentered("terms of use, privacy policy, and end user licence", var26, var4, 16777215, 0); // L: 1534 + var4 += 17; // L: 1535 + var2.drawCentered("agreement (EULA).", var26, var4, 16777215, 0); // L: 1536 + var4 += 17; // L: 1537 + var2.drawCentered("By accepting, you agree to these documents.", var26, var4, 16777215, 0); // L: 1538 + var26 = Decimator.loginBoxCenter - 80; // L: 1539 + var27 = 311; // L: 1540 + Login.titlebuttonSprite.drawAt(var26 - 73, var27 - 20); // L: 1541 + var0.drawCentered("Accept", var26, var27 + 5, 16777215, 0); // L: 1542 + var26 = Decimator.loginBoxCenter + 80; // L: 1543 + Login.titlebuttonSprite.drawAt(var26 - 73, var27 - 20); // L: 1544 + var0.drawCentered("Decline", var26, var27 + 5, 16777215, 0); // L: 1545 + } else if (Login.loginIndex == 13) { // L: 1547 + var25 = 231; // L: 1548 + var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var25, 16777215, 0); // L: 1549 + var26 = var25 + 20; // L: 1550 + var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var26, 16777215, 0); // L: 1551 + var4 = Login.loginBoxX + 180; // L: 1552 + var25 = 311; // L: 1553 + Login.titlebuttonSprite.drawAt(var4 - 73, var25 - 20); // L: 1554 + var0.drawCentered("Back", var4, var25 + 5, 16777215, 0); // L: 1555 + } else if (Login.loginIndex == 14) { // L: 1557 + var25 = 201; // L: 1558 + String var20 = ""; // L: 1559 + var5 = ""; // L: 1560 + String var6 = ""; // L: 1561 + switch(Login.field887) { // L: 1562 + case 0: + var20 = "Your account has been disabled."; // L: 1577 + var5 = Strings.field3689; // L: 1578 + var6 = ""; // L: 1579 + break; + case 1: + var20 = "Account locked as we suspect it has been stolen."; // L: 1565 + var5 = Strings.field3743; // L: 1566 + var6 = ""; // L: 1567 + break; + default: + PcmPlayer.Login_promptCredentials(false); // L: 1572 + } + + var0.drawCentered(var20, Login.loginBoxX + 180, var25, 16776960, 0); // L: 1583 + var26 = var25 + 15; // L: 1584 + var2.drawCentered(var5, Login.loginBoxX + 180, var26, 16776960, 0); // L: 1585 + var26 += 15; // L: 1586 + var2.drawCentered(var6, Login.loginBoxX + 180, var26, 16776960, 0); // L: 1587 + var26 += 15; // L: 1588 + int var32 = Login.loginBoxX + 180; // L: 1589 + short var33 = 276; // L: 1590 + Login.titlebuttonSprite.drawAt(var32 - 73, var33 - 20); // L: 1591 + var0.drawCentered("Support Page", var32, var33 + 5, 16777215, 0); // L: 1592 + var32 = Login.loginBoxX + 180; // L: 1593 + var33 = 326; // L: 1594 + Login.titlebuttonSprite.drawAt(var32 - 73, var33 - 20); // L: 1595 + var0.drawCentered("Back", var32, var33 + 5, 16777215, 0); // L: 1596 + } else if (Login.loginIndex == 24) { // L: 1598 + var25 = 221; // L: 1599 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var25, 16777215, 0); // L: 1600 + var26 = var25 + 15; // L: 1601 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var26, 16777215, 0); // L: 1602 + var26 += 15; // L: 1603 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var26, 16777215, 0); // L: 1604 + var26 += 15; // L: 1605 + var4 = Login.loginBoxX + 180; // L: 1606 + var19 = 301; // L: 1607 + Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1608 + var0.drawCentered("Ok", var4, var19 + 5, 16777215, 0); // L: 1609 + } else if (Login.loginIndex == 26) { // L: 1611 + var25 = 216; // L: 1612 + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var25, 16776960, 0); // L: 1613 + var26 = var25 + 15; // L: 1614 + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var26, 16776960, 0); // L: 1615 + var26 += 15; // L: 1616 + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var26, 16776960, 0); // L: 1617 + var26 += 15; // L: 1618 + var4 = Login.loginBoxX + 180 - 80; // L: 1619 + var19 = 321; // L: 1620 + Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1621 + var0.drawCentered("Set Date of Birth", var4, var19 + 5, 16777215, 0); // L: 1622 + var4 = Login.loginBoxX + 180 + 80; // L: 1623 + Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1624 + var0.drawCentered("Back", var4, var19 + 5, 16777215, 0); // L: 1625 + } + } + } + + if (Client.gameState >= 10) { // L: 1628 + int[] var24 = new int[4]; // L: 1629 + Rasterizer2D.Rasterizer2D_getClipArray(var24); // L: 1630 + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, class433.canvasHeight); // L: 1631 + class193.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1632 + class193.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1633 + Rasterizer2D.Rasterizer2D_setClipArray(var24); // L: 1634 + } + + class358.title_muteSprite[class12.clientPreferences.method2226() ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1636 + if (Client.gameState > 5 && class263.clientLanguage == Language.Language_EN) { // L: 1637 + if (ArchiveDiskAction.field3997 != null) { // L: 1638 + var26 = Login.xPadding + 5; // L: 1639 + var27 = 463; // L: 1640 + byte var34 = 100; // L: 1641 + byte var37 = 35; // L: 1642 + ArchiveDiskAction.field3997.drawAt(var26, var27); // L: 1643 + var0.drawCentered("World" + " " + Client.worldId, var34 / 2 + var26, var37 / 2 + var27 - 2, 16777215, 0); // L: 1644 + if (NPC.World_request != null) { // L: 1645 + var1.drawCentered("Loading...", var34 / 2 + var26, var37 / 2 + var27 + 12, 16777215, 0); + } else { + var1.drawCentered("Click to switch", var34 / 2 + var26, var37 / 2 + var27 + 12, 16777215, 0); // L: 1646 + } + } else { + ArchiveDiskAction.field3997 = JagexCache.SpriteBuffer_getIndexedSpriteByName(class305.archive8, "sl_button", ""); // L: 1649 + } } - return var1 == 1007; // L: 8795 } - } + } // L: 1176 1652 } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index 7372686759..2e8103a7af 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -3,24 +3,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("av") +@ObfuscatedName("au") @Implements("SoundEffect") public class SoundEffect { - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "[Lbj;" + descriptor = "[Lbk;" ) @Export("instruments") Instrument[] instruments; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("start") int start; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("end") int end; @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpx;)V" ) SoundEffect(Buffer var1) { this.instruments = new Instrument[10]; // L: 10 @@ -38,9 +38,9 @@ public class SoundEffect { this.end = var1.readUnsignedShort(); // L: 29 } // L: 30 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "()Lat;" + descriptor = "()Lak;" ) @Export("toRawSound") public RawSound toRawSound() { @@ -48,7 +48,7 @@ public class SoundEffect { return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); // L: 34 } - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("calculateDelay") public final int calculateDelay() { int var1 = 9999999; // L: 38 @@ -83,7 +83,7 @@ public class SoundEffect { } } - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("mix") final byte[] mix() { int var1 = 0; // L: 57 @@ -122,9 +122,9 @@ public class SoundEffect { } } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lln;II)Lav;" + descriptor = "(Llp;II)Lau;" ) @Export("readSoundEffect") public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) { diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java index e2018744fd..2d34e9f8b3 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -3,40 +3,40 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ag") +@ObfuscatedName("aq") @Implements("SoundEnvelope") public class SoundEnvelope { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("segments") int segments; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("durations") int[] durations; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("phases") int[] phases; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("start") int start; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("end") int end; - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("form") int form; - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("ticks") int ticks; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("phaseIndex") int phaseIndex; - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("step") int step; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("amplitude") int amplitude; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("max") int max; @@ -50,9 +50,9 @@ public class SoundEnvelope { this.phases[1] = 65535; // L: 27 } // L: 28 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpx;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -62,9 +62,9 @@ public class SoundEnvelope { this.decodeSegments(var1); // L: 34 } // L: 35 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpx;)V" ) @Export("decodeSegments") final void decodeSegments(Buffer var1) { @@ -79,7 +79,7 @@ public class SoundEnvelope { } // L: 45 - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("reset") final void reset() { this.ticks = 0; // L: 48 @@ -89,7 +89,7 @@ public class SoundEnvelope { this.max = 0; // L: 52 } // L: 53 - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("doStep") final int doStep(int var1) { if (this.max >= this.ticks) { // L: 56 diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index 2955110f61..61a8a4519d 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -1,17 +1,28 @@ import 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("ah") +@ObfuscatedName("ad") @Implements("SoundSystem") public class SoundSystem implements Runnable { - @ObfuscatedName("ry") - static boolean field309; - @ObfuscatedName("v") + @ObfuscatedName("iw") @ObfuscatedSignature( - descriptor = "[Lay;" + descriptor = "Lqr;" + ) + @Export("compass") + static SpritePixels compass; + @ObfuscatedName("po") + @ObfuscatedGetter( + intValue = -2095633831 + ) + @Export("widgetDragDuration") + static int widgetDragDuration; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "[Lal;" ) @Export("players") volatile PcmPlayer[] players; @@ -29,117 +40,153 @@ public class SoundSystem implements Runnable { } } } catch (Exception var4) { // L: 17 - Widget.RunException_sendStackTrace((String)null, var4); // L: 18 + ArchiveDiskActionHandler.RunException_sendStackTrace((String)null, var4); // L: 18 } } // L: 20 - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "([BI)[B", - garbageValue = "-862016780" - ) - static byte[] method764(byte[] var0) { - int var1 = var0.length; // L: 35 - byte[] var2 = new byte[var1]; // L: 36 - System.arraycopy(var0, 0, var2, 0, var1); // L: 37 - return var2; // L: 38 - } - @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "1307267367" + descriptor = "(IIIB)Lqr;", + garbageValue = "19" ) - @Export("isCharAlphabetic") - public static boolean isCharAlphabetic(char var0) { - return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 138 + static SpritePixels method774(int var0, int var1, int var2) { + DemotingHashTable var3 = WorldMapRegion.WorldMapRegion_cachedSprites; // L: 38 + long var4 = (long)(var2 << 16 | var0 << 8 | var1); // L: 41 + return (SpritePixels)var3.get(var4); // L: 43 } @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "1" + descriptor = "(ILbb;ZI)I", + garbageValue = "1284020216" ) - static int method761(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1130 - if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1131 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1132 - return 1; // L: 1133 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1135 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1136 - return 1; // L: 1137 - } else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1139 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3.text; // L: 1140 - return 1; // L: 1141 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1143 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1144 - return 1; // L: 1145 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1147 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1148 - return 1; // L: 1149 - } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1151 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1152 - return 1; // L: 1153 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1155 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1156 - return 1; // L: 1157 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1159 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1160 - return 1; // L: 1161 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1163 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1164 - return 1; // L: 1165 - } else if (var0 == ScriptOpcodes.CC_GETTRANS) { // L: 1167 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1168 - return 1; // L: 1169 - } else if (var0 == 1610) { // L: 1171 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1172 - return 1; // L: 1173 - } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1175 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; // L: 1176 - return 1; // L: 1177 - } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1179 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; // L: 1180 - return 1; // L: 1181 - } else if (var0 == 1613) { // L: 1183 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1184 - return 1; // L: 1185 - } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1187 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1188 - return 1; // L: 1189 - } else if (var0 != 1615 && var0 != 1616) { // L: 1191 - return 2; // L: 1195 + static int method777(int var0, Script var1, boolean var2) { + int var4; + int var9; + if (var0 == ScriptOpcodes.CC_CREATE) { // L: 478 + class12.Interpreter_intStackSize -= 3; // L: 479 + var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 480 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 481 + int var11 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 482 + if (var4 == 0) { // L: 483 + throw new RuntimeException(); // L: 484 + } else { + Widget var6 = class92.getWidget(var9); // L: 486 + if (var6.children == null) { // L: 487 + var6.children = new Widget[var11 + 1]; + } + + if (var6.children.length <= var11) { // L: 488 + Widget[] var7 = new Widget[var11 + 1]; // L: 489 + + for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 490 + var7[var8] = var6.children[var8]; + } + + var6.children = var7; // L: 491 + } + + if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 493 + throw new RuntimeException("" + (var11 - 1)); + } else { + Widget var12 = new Widget(); // L: 494 + var12.type = var4; // L: 495 + var12.parentId = var12.id = var6.id; // L: 496 + var12.childIndex = var11; // L: 497 + var12.isIf3 = true; // L: 498 + var6.children[var11] = var12; // L: 499 + if (var2) { // L: 500 + Interpreter.scriptDotWidget = var12; + } else { + KeyHandler.scriptActiveWidget = var12; // L: 501 + } + + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var6); // L: 502 + return 1; // L: 503 + } + } } else { - ++Interpreter.Interpreter_intStackSize; // L: 1192 - return 1; // L: 1193 + Widget var3; + if (var0 == ScriptOpcodes.CC_DELETE) { // L: 505 + var3 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 506 + Widget var10 = class92.getWidget(var3.id); // L: 507 + var10.children[var3.childIndex] = null; // L: 508 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10); // L: 509 + return 1; // L: 510 + } else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 512 + var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 513 + var3.children = null; // L: 514 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 515 + return 1; // L: 516 + } else if (var0 == 103) { // L: 518 + class12.Interpreter_intStackSize -= 3; // L: 519 + return 1; // L: 520 + } else if (var0 == 104) { // L: 522 + --class12.Interpreter_intStackSize; // L: 523 + return 1; // L: 524 + } else if (var0 != ScriptOpcodes.CC_FIND) { // L: 526 + if (var0 == ScriptOpcodes.IF_FIND) { // L: 539 + var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 540 + if (var3 != null) { // L: 541 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 542 + if (var2) { // L: 543 + Interpreter.scriptDotWidget = var3; + } else { + KeyHandler.scriptActiveWidget = var3; // L: 544 + } + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 546 + } + + return 1; // L: 547 + } else if (var0 == 202) { // L: 549 + Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1] = 0; // L: 550 + return 1; // L: 551 + } else if (var0 == 203) { // L: 553 + Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize + 1] = 0; // L: 554 + return 1; // L: 555 + } else { + return 2; // L: 557 + } + } else { + class12.Interpreter_intStackSize -= 2; // L: 527 + var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 528 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 529 + Widget var5 = ApproximateRouteStrategy.getWidgetChild(var9, var4); // L: 530 + if (var5 != null && var4 != -1) { // L: 531 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 532 + if (var2) { // L: 533 + Interpreter.scriptDotWidget = var5; + } else { + KeyHandler.scriptActiveWidget = var5; // L: 534 + } + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 536 + } + + return 1; // L: 537 + } } } - @ObfuscatedName("ji") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "1540502347" + descriptor = "(I)V", + garbageValue = "-583915205" ) - @Export("drawScrollBar") - static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { - class29.scrollBarSprites[0].drawAt(var0, var1); // L: 10887 - class29.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 10888 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field566); // L: 10889 - int var5 = var3 * (var3 - 32) / var4; // L: 10890 - if (var5 < 8) { // L: 10891 - var5 = 8; - } + public static void method780() { + HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 177 + HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 178 + HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 179 + } // L: 180 - int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 10892 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field670); // L: 10893 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field740); // L: 10894 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field740); // L: 10895 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field740); // L: 10896 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field740); // L: 10897 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field694); // L: 10898 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field694); // L: 10899 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field694); // L: 10900 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field694); // L: 10901 - } // L: 10902 + @ObfuscatedName("gg") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "1" + ) + static boolean method779() { + return (Client.drawPlayerNames & 1) != 0; // L: 5008 + } } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index 784d6141f2..3b830373a7 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -4,96 +4,84 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fh") +@ObfuscatedName("fw") @Implements("SpotAnimationDefinition") public class SpotAnimationDefinition extends DualNode { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("SpotAnimationDefinition_archive") public static AbstractArchive SpotAnimationDefinition_archive; - @ObfuscatedName("c") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lln;" - ) - @Export("SpotAnimationDefinition_modelArchive") - public static AbstractArchive SpotAnimationDefinition_modelArchive; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("SpotAnimationDefinition_cached") public static EvictingDualNodeHashTable SpotAnimationDefinition_cached; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("SpotAnimationDefinition_cachedModels") public static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lhh;" - ) - @Export("worldMapEvent") - static WorldMapEvent worldMapEvent; - @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 2118158711 + intValue = -1265887753 ) @Export("id") int id; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -751364127 + intValue = 1347640095 ) @Export("archive") int archive; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1190458759 + intValue = 2010808801 ) @Export("sequence") public int sequence; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1835946173 + intValue = 816040179 ) @Export("widthScale") int widthScale; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1714205519 + intValue = 1605734173 ) @Export("heightScale") int heightScale; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 870679975 + intValue = 166860727 ) @Export("orientation") int orientation; - @ObfuscatedName("d") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1029966959 + intValue = -373307205 ) @Export("ambient") int ambient; - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -65447281 + intValue = 1923246683 ) @Export("contrast") int contrast; @@ -112,10 +100,10 @@ public class SpotAnimationDefinition extends DualNode { this.contrast = 0; // L: 27 } // L: 29 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "147710415" + descriptor = "(Lpx;B)V", + garbageValue = "39" ) @Export("decode") void decode(Buffer var1) { @@ -129,10 +117,10 @@ public class SpotAnimationDefinition extends DualNode { } } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-1644410354" + descriptor = "(Lpx;II)V", + garbageValue = "2139192007" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -176,16 +164,16 @@ public class SpotAnimationDefinition extends DualNode { } // L: 77 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)Liq;", - garbageValue = "420896469" + descriptor = "(II)Lhv;", + garbageValue = "835849725" ) @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 + ModelData var3 = ModelData.ModelData_get(class175.SpotAnimationDefinition_modelArchive, this.archive, 0); // L: 82 if (var3 == null) { // L: 83 return null; } @@ -209,7 +197,7 @@ public class SpotAnimationDefinition extends DualNode { Model var5; if (this.sequence != -1 && var1 != -1) { // L: 98 - var5 = class163.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); + var5 = class114.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { var5 = var2.toSharedSpotAnimationModel(true); // L: 99 } @@ -237,38 +225,4 @@ public class SpotAnimationDefinition extends DualNode { return var5; // L: 113 } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)[Lcs;", - garbageValue = "-1958171328" - ) - static class83[] method3549() { - return new class83[]{class83.field1066, class83.field1061, class83.field1065, class83.field1064, class83.field1067, class83.field1062}; // L: 17 - } - - @ObfuscatedName("gh") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "356895140" - ) - static final void method3545() { - class13.method163(class93.field1253, PcmPlayer.field294, WorldMapElement.field1837); // L: 3709 - WorldMapSectionType.method4308(ObjectComposition.field2065, class21.field116); // L: 3710 - if (WorldMapLabelSize.cameraX == class93.field1253 && ItemContainer.cameraY == PcmPlayer.field294 && class154.cameraZ == WorldMapElement.field1837 && ObjectComposition.field2065 == class147.cameraPitch && class21.field116 == class21.cameraYaw) { // L: 3711 - Client.field754 = false; // L: 3712 - Client.isCameraLocked = false; // L: 3713 - class154.field1691 = 0; // L: 3714 - class67.field881 = 0; // L: 3715 - DevicePcmPlayerProvider.field154 = 0; // L: 3716 - NetFileRequest.field3960 = 0; // L: 3717 - class386.field4337 = 0; // L: 3718 - ArchiveDisk.field4309 = 0; // L: 3719 - Script.field955 = 0; // L: 3720 - class286.field3274 = 0; // L: 3721 - class54.field447 = 0; // L: 3722 - BZip2State.field4662 = 0; // L: 3723 - } - - } // L: 3726 } diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index 4d7d7f6f45..34addfe0af 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -4,97 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ki") +@ObfuscatedName("ka") @Implements("SpriteMask") public class SpriteMask extends DualNode { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 484977617 + intValue = -124127001 ) @Export("width") public final int width; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 341413753 + intValue = -1115318745 ) @Export("height") public final int height; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("xWidths") public final int[] xWidths; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("xStarts") public final int[] xStarts; SpriteMask(int var1, int var2, int[] var3, int[] var4, int var5) { - this.width = var1; // L: 943 - this.height = var2; // L: 944 - this.xWidths = var3; // L: 945 - this.xStarts = var4; // L: 946 - } // L: 947 + this.width = var1; // L: 953 + this.height = var2; // L: 954 + this.xWidths = var3; // L: 955 + this.xStarts = var4; // L: 956 + } // L: 957 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "24" + descriptor = "(III)Z", + garbageValue = "-1641750028" ) @Export("contains") public boolean contains(int var1, int var2) { - if (var2 >= 0 && var2 < this.xStarts.length) { // L: 950 - int var3 = this.xStarts[var2]; // L: 951 - if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 952 + if (var2 >= 0 && var2 < this.xStarts.length) { // L: 960 + int var3 = this.xStarts[var2]; // L: 961 + if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 962 return true; } } - return false; // L: 954 - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lbb;Lbb;IZB)I", - garbageValue = "7" - ) - @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.method1639() ? (var1.method1639() ? 0 : 1) : (var1.method1639() ? -1 : 0); - } else if (var2 == 5) { // L: 230 - return var0.method1637() ? (var1.method1637() ? 0 : 1) : (var1.method1637() ? -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 - } + return false; // L: 964 } } diff --git a/runescape-client/src/main/java/SpritePixels.java b/runescape-client/src/main/java/SpritePixels.java index f88b41ef0f..671a2b299d 100644 --- a/runescape-client/src/main/java/SpritePixels.java +++ b/runescape-client/src/main/java/SpritePixels.java @@ -3,28 +3,28 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qi") +@ObfuscatedName("qr") @Implements("SpritePixels") public final class SpritePixels extends Rasterizer2D { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("pixels") public int[] pixels; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("subWidth") public int subWidth; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("subHeight") public int subHeight; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("xOffset") public int xOffset; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("yOffset") - int yOffset; - @ObfuscatedName("n") + public int yOffset; + @ObfuscatedName("m") @Export("width") public int width; - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("height") public int height; @@ -40,12 +40,12 @@ public final class SpritePixels extends Rasterizer2D { this(new int[var2 * var1], var1, var2); // L: 22 } // L: 23 - SpritePixels() { + public SpritePixels() { } // L: 19 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lqi;" + descriptor = "()Lqr;" ) @Export("mirrorHorizontally") public SpritePixels mirrorHorizontally() { @@ -64,11 +64,11 @@ public final class SpritePixels extends Rasterizer2D { return var1; // L: 44 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "()Lqi;" + descriptor = "()Lqr;" ) - public SpritePixels method8147() { + public SpritePixels method8001() { SpritePixels var1 = new SpritePixels(this.subWidth, this.subHeight); // L: 48 var1.width = this.width; // L: 49 var1.height = this.height; // L: 50 @@ -83,9 +83,9 @@ public final class SpritePixels extends Rasterizer2D { return var1; // L: 55 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Lqi;" + descriptor = "()Lqr;" ) @Export("copyNormalized") public SpritePixels copyNormalized() { @@ -100,13 +100,13 @@ public final class SpritePixels extends Rasterizer2D { return var1; // L: 65 } - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("setRaster") public void setRaster() { Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); // L: 69 } // L: 70 - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { // L: 73 @@ -126,7 +126,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 85 - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("pad") public void pad(int var1) { if (this.subWidth != this.width || this.subHeight != this.height) { // L: 88 @@ -168,7 +168,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 110 - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("flipHorizontally") public void flipHorizontally() { int[] var1 = new int[this.subWidth * this.subHeight]; // L: 113 @@ -184,7 +184,7 @@ public final class SpritePixels extends Rasterizer2D { this.xOffset = this.width - this.subWidth - this.xOffset; // L: 119 } // L: 120 - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("flipVertically") public void flipVertically() { int[] var1 = new int[this.subWidth * this.subHeight]; // L: 123 @@ -200,7 +200,7 @@ public final class SpritePixels extends Rasterizer2D { this.yOffset = this.height - this.subHeight - this.yOffset; // L: 129 } // L: 130 - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("outline") public void outline(int var1) { int[] var2 = new int[this.subWidth * this.subHeight]; // L: 133 @@ -228,7 +228,7 @@ public final class SpritePixels extends Rasterizer2D { this.pixels = var2; // L: 147 } // L: 148 - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("shadow") public void shadow(int var1) { for (int var2 = this.subHeight - 1; var2 > 0; --var2) { // L: 151 @@ -243,7 +243,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 157 - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; // L: 160 @@ -335,7 +335,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 247 - @ObfuscatedName("d") + @ObfuscatedName("t") @Export("drawScaledAt") public void drawScaledAt(int var1, int var2, int var3, int var4) { if (var3 > 0 && var4 > 0) { // L: 278 @@ -400,7 +400,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 321 - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("drawTransOverlayAt") public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { if (var3 == 256) { // L: 340 @@ -450,7 +450,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 342 377 - @ObfuscatedName("g") + @ObfuscatedName("e") @Export("drawTransAt") public void drawTransAt(int var1, int var2, int var3) { var1 += this.xOffset; // L: 400 @@ -496,7 +496,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 433 - @ObfuscatedName("a") + @ObfuscatedName("f") @Export("drawTransScaledAt") public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { // L: 452 @@ -562,7 +562,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 495 @ObfuscatedName("j") - public void method8097(int var1, int var2, int var3) { + public void method7970(int var1, int var2, int var3) { var1 += this.xOffset; // L: 518 var2 += this.yOffset; // L: 519 int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 520 @@ -603,16 +603,16 @@ public final class SpritePixels extends Rasterizer2D { if (var7 > 0 && var6 > 0) { // L: 549 if (var3 == 256) { - method8098(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 550 + method7950(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 550 } else { - method8081(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 551 + method7972(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 551 } } } // L: 552 - @ObfuscatedName("h") - public void method8100(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("u") + public void method8030(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { // L: 593 int var6 = this.subWidth; // L: 594 int var7 = this.subHeight; // L: 595 @@ -672,16 +672,16 @@ public final class SpritePixels extends Rasterizer2D { } if (var5 == 256) { // L: 635 - method8101(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); + method7973(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { - method8102(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 636 + method7952(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 636 } } } // L: 637 - @ObfuscatedName("aw") - public void method8103(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { + @ObfuscatedName("am") + public void method7947(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { int var9 = var2 < 0 ? -var2 : 0; // L: 686 int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; // L: 687 int var11 = var1 < 0 ? -var1 : 0; // L: 688 @@ -728,7 +728,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 711 - @ObfuscatedName("am") + @ObfuscatedName("ac") @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 { @@ -763,8 +763,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 740 - @ObfuscatedName("ak") - public void method8105(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { + @ObfuscatedName("ab") + public void method7992(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { try { int var10 = -var3 / 2; // L: 744 int var11 = -var4 / 2; // L: 745 @@ -802,13 +802,13 @@ public final class SpritePixels extends Rasterizer2D { } // L: 770 - @ObfuscatedName("ao") - public void method8106(int var1, int var2, int var3, int var4) { - this.method8107(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 773 + @ObfuscatedName("aj") + public void method7951(int var1, int var2, int var3, int var4) { + this.method7978(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 773 } // L: 774 - @ObfuscatedName("aj") - void method8107(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("ae") + void method7978(int var1, int var2, int var3, int var4, int var5, int var6) { if (var6 != 0) { // L: 777 var1 -= this.xOffset << 4; // L: 778 var2 -= this.yOffset << 4; // L: 779 @@ -1276,7 +1276,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 1087 - @ObfuscatedName("al") + @ObfuscatedName("az") @Export("drawScaledWorldmap") public void drawScaledWorldmap(int var1, int var2, int var3, int var4) { if (var3 <= this.width && var4 <= this.height) { // L: 1090 @@ -1399,7 +1399,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 1105 1162 - @ObfuscatedName("p") + @ObfuscatedName("c") @Export("Sprite_draw") static void Sprite_draw(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { for (int var8 = -var5; var8 < 0; ++var8) { // L: 196 @@ -1419,7 +1419,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 211 - @ObfuscatedName("k") + @ObfuscatedName("b") @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: 250 @@ -1472,7 +1472,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 275 - @ObfuscatedName("m") + @ObfuscatedName("g") @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: 324 @@ -1498,7 +1498,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 337 - @ObfuscatedName("t") + @ObfuscatedName("n") @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: 380 @@ -1524,7 +1524,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 397 - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("Sprite_drawTransparent") static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { int var10 = 256 - var9; // L: 436 @@ -1546,7 +1546,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 449 - @ObfuscatedName("y") + @ObfuscatedName("d") @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: 498 @@ -1574,8 +1574,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 515 - @ObfuscatedName("e") - static void method8098(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("z") + static void method7950(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: 555 for (var6 = -var9; var6 < 0; ++var6) { // L: 556 var0 = var4[var5++]; // L: 557 @@ -1596,8 +1596,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 570 - @ObfuscatedName("z") - static void method8081(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { + @ObfuscatedName("i") + static void method7972(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: 573 for (var6 = -var9; var6 < 0; ++var6) { // L: 574 var0 = var4[var5++]; // L: 575 @@ -1620,8 +1620,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 590 - @ObfuscatedName("ae") - static void method8101(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { + @ObfuscatedName("ag") + static void method7973(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: 640 641 var7 = var15 * (var9 >> 16); // L: 642 @@ -1647,8 +1647,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 659 - @ObfuscatedName("aq") - static void method8102(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("ar") + static void method7952(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: 662 663 var7 = var15 * (var9 >> 16); // L: 664 diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index 5f4d1f0e09..1bc88d1ab9 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -1,238 +1,25 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("kv") +@ObfuscatedName("kq") @Implements("Strings") public class Strings { - @ObfuscatedName("bo") - public static String field3645; - @ObfuscatedName("cn") - public static String field3684; - @ObfuscatedName("ky") - public static String field3628; - @ObfuscatedName("kc") - public static String field3870; - @ObfuscatedName("kw") - public static String field3646; + @ObfuscatedName("bi") + public static String field3689; + @ObfuscatedName("cq") + public static String field3743; + @ObfuscatedName("ki") + public static String field3712; + @ObfuscatedName("kv") + public static String field3929; + @ObfuscatedName("ks") + public static String field3706; static { - field3645 = "Please visit the support page for assistance."; // L: 60 - field3684 = "Please visit the support page for assistance."; // L: 99 - field3628 = ""; // L: 299 - field3870 = "Page has opened in a new window."; // L: 300 - field3646 = "(Please check your popup blocker.)"; // L: 301 - } // L: 339 - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-698381371" - ) - static int method5790(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == ScriptOpcodes.ADD) { // L: 3039 - Interpreter.Interpreter_intStackSize -= 2; // L: 3040 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3041 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3042 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + var4; // L: 3043 - return 1; // L: 3044 - } else if (var0 == ScriptOpcodes.SUB) { // L: 3046 - Interpreter.Interpreter_intStackSize -= 2; // L: 3047 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3048 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3049 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 - var4; // L: 3050 - return 1; // L: 3051 - } else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 3053 - Interpreter.Interpreter_intStackSize -= 2; // L: 3054 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3055 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3056 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 * var4; // L: 3057 - return 1; // L: 3058 - } else if (var0 == ScriptOpcodes.DIV) { // L: 3060 - Interpreter.Interpreter_intStackSize -= 2; // L: 3061 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3062 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3063 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 / var4; // L: 3064 - return 1; // L: 3065 - } else if (var0 == ScriptOpcodes.RANDOM) { // L: 3067 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3068 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); // L: 3069 - return 1; // L: 3070 - } else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 3072 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3073 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); // L: 3074 - return 1; // L: 3075 - } else { - int var5; - int var6; - int var7; - if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 3077 - Interpreter.Interpreter_intStackSize -= 5; // L: 3078 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3079 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3080 - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3081 - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 3082 - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; // L: 3083 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5); // L: 3084 - return 1; // L: 3085 - } else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 3087 - Interpreter.Interpreter_intStackSize -= 2; // L: 3088 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3089 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3090 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; // L: 3091 - return 1; // L: 3092 - } else if (var0 == ScriptOpcodes.SETBIT) { // L: 3094 - Interpreter.Interpreter_intStackSize -= 2; // L: 3095 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3096 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3097 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | 1 << var4; // L: 3098 - return 1; // L: 3099 - } else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 3101 - Interpreter.Interpreter_intStackSize -= 2; // L: 3102 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3103 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3104 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); // L: 3105 - return 1; // L: 3106 - } else if (var0 == ScriptOpcodes.TESTBIT) { // L: 3108 - Interpreter.Interpreter_intStackSize -= 2; // L: 3109 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3110 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3111 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; // L: 3112 - return 1; // L: 3113 - } else if (var0 == ScriptOpcodes.MOD) { // L: 3115 - Interpreter.Interpreter_intStackSize -= 2; // L: 3116 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3117 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3118 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 % var4; // L: 3119 - return 1; // L: 3120 - } else if (var0 == ScriptOpcodes.POW) { // L: 3122 - Interpreter.Interpreter_intStackSize -= 2; // L: 3123 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3124 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3125 - if (var3 == 0) { // L: 3126 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); // L: 3127 - } - - return 1; // L: 3128 - } else if (var0 == ScriptOpcodes.INVPOW) { // L: 3130 - Interpreter.Interpreter_intStackSize -= 2; // L: 3131 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3132 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3133 - if (var3 == 0) { // L: 3134 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3135 - return 1; // L: 3136 - } else { - switch(var4) { // L: 3138 - case 0: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 3161 - break; // L: 3162 - case 1: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 3156 - break; // L: 3157 - case 2: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); // L: 3141 - break; - case 3: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); // L: 3151 - break; // L: 3152 - case 4: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); // L: 3146 - break; // L: 3147 - default: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); // L: 3166 - } - - return 1; // L: 3170 - } - } else if (var0 == ScriptOpcodes.AND) { // L: 3172 - Interpreter.Interpreter_intStackSize -= 2; // L: 3173 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3174 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3175 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & var4; // L: 3176 - return 1; // L: 3177 - } else if (var0 == ScriptOpcodes.OR) { // L: 3179 - Interpreter.Interpreter_intStackSize -= 2; // L: 3180 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3181 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3182 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | var4; // L: 3183 - return 1; // L: 3184 - } else if (var0 == ScriptOpcodes.SCALE) { // L: 3186 - Interpreter.Interpreter_intStackSize -= 3; // L: 3187 - long var9 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3188 - long var11 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3189 - long var13 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3190 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); // L: 3191 - return 1; // L: 3192 - } else if (var0 == ScriptOpcodes.BITCOUNT) { // L: 3194 - var3 = class150.method3150(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3195 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 3196 - return 1; // L: 3197 - } else if (var0 == ScriptOpcodes.TOGGLEBIT) { // L: 3199 - Interpreter.Interpreter_intStackSize -= 2; // L: 3200 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3201 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3202 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; // L: 3203 - return 1; // L: 3204 - } else if (var0 == ScriptOpcodes.SETBIT_RANGE) { // L: 3206 - Interpreter.Interpreter_intStackSize -= 3; // L: 3207 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3208 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3209 - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3210 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ModelData0.method5091(var3, var4, var5); // L: 3211 - return 1; // L: 3212 - } else if (var0 == ScriptOpcodes.CLEARBIT_RANGE) { // L: 3214 - Interpreter.Interpreter_intStackSize -= 3; // L: 3215 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3216 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3217 - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3218 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = World.method1679(var3, var4, var5); // L: 3219 - return 1; // L: 3220 - } else if (var0 == ScriptOpcodes.GETBIT_RANGE) { // L: 3222 - Interpreter.Interpreter_intStackSize -= 3; // L: 3223 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3224 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3225 - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3226 - var6 = 31 - var5; // L: 3227 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 << var6 >>> var4 + var6; // L: 3228 - return 1; // L: 3229 - } else if (var0 == 4030) { // L: 3231 - Interpreter.Interpreter_intStackSize -= 4; // L: 3232 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3233 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3234 - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3235 - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 3236 - var3 = World.method1679(var3, var5, var6); // L: 3237 - var7 = class54.method1078(var6 - var5 + 1); // L: 3238 - if (var4 > var7) { // L: 3239 - var4 = var7; - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | var4 << var5; // L: 3240 - return 1; // L: 3241 - } else if (var0 == 4032) { // L: 3243 - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = HealthBar.method2344(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); // L: 3244 - return 1; // L: 3245 - } else if (var0 == 4033) { // L: 3247 - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = class144.method3081(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); // L: 3248 - return 1; // L: 3249 - } else if (var0 == 4034) { // L: 3251 - Interpreter.Interpreter_intStackSize -= 2; // L: 3252 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3253 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3254 - var5 = class194.method3890(var3, var4); // L: 3255 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5; // L: 3256 - return 1; // L: 3257 - } else if (var0 == 4035) { // L: 3259 - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); // L: 3260 - return 1; // L: 3261 - } else { - return 2; // L: 3263 - } - } - } + field3689 = "Please visit the support page for assistance."; // L: 60 + field3743 = "Please visit the support page for assistance."; // L: 99 + field3712 = ""; // L: 299 + field3929 = "Page has opened in a new window."; // L: 300 + field3706 = "(Please check your popup blocker.)"; // L: 301 + } // L: 342 } diff --git a/runescape-client/src/main/java/StructComposition.java b/runescape-client/src/main/java/StructComposition.java index e39ecfb1da..dc0a2b8480 100644 --- a/runescape-client/src/main/java/StructComposition.java +++ b/runescape-client/src/main/java/StructComposition.java @@ -4,33 +4,28 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gh") +@ObfuscatedName("gp") @Implements("StructComposition") public class StructComposition extends DualNode { - @ObfuscatedName("sh") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lal;" - ) - @Export("pcmStreamMixer") - static PcmStreamMixer pcmStreamMixer; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("StructDefinition_archive") - public static AbstractArchive StructDefinition_archive; - @ObfuscatedName("c") + static AbstractArchive StructDefinition_archive; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("StructDefinition_cached") - public static EvictingDualNodeHashTable StructDefinition_cached; - @ObfuscatedName("n") + static EvictingDualNodeHashTable StructDefinition_cached; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -200847333 + intValue = -232799299 ) - public static int field1988; - @ObfuscatedName("i") + @Export("musicTrackGroupId") + public static int musicTrackGroupId; + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "Lpt;" ) @@ -38,139 +33,117 @@ public class StructComposition extends DualNode { IterableNodeHashTable params; static { - StructDefinition_cached = new EvictingDualNodeHashTable(64); // L: 13 + StructDefinition_cached = new EvictingDualNodeHashTable(64); } StructComposition() { - } // L: 16 + } - @ObfuscatedName("c") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "9" + descriptor = "(I)V", + garbageValue = "-2016417159" ) @Export("postDecode") void postDecode() { - } // L: 29 + } // L: 33 - @ObfuscatedName("i") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "1284731224" + descriptor = "(Lpx;I)V", + garbageValue = "-1920119994" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 33 - if (var2 == 0) { // L: 34 - return; // L: 37 + int var2 = var1.readUnsignedByte(); // L: 37 + if (var2 == 0) { // L: 38 + return; // L: 41 } - this.decodeNext(var1, var2); // L: 35 + this.decodeNext(var1, var2); // L: 39 } } - @ObfuscatedName("f") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "297360450" + descriptor = "(Lpx;II)V", + garbageValue = "-1132236208" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = class214.readStringIntParameters(var1, this.params); // L: 40 + this.params = JagexCache.readStringIntParameters(var1, this.params); // L: 44 } - } // L: 42 + } // L: 46 - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-607891890" + garbageValue = "668273905" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; // L: 46 - int var3; - if (var4 == null) { // L: 48 - var3 = var2; // L: 49 - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 52 - if (var5 == null) { // L: 53 - var3 = var2; // L: 54 - } else { - var3 = var5.integer; // L: 57 - } - } - - return var3; // L: 59 + return class154.method3061(this.params, var1, var2); // L: 49 } - @ObfuscatedName("n") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1724611537" + garbageValue = "-1640856664" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; // L: 64 - String var3; - if (var4 == null) { // L: 66 - var3 = var2; // L: 67 + return AttackOption.method2393(this.params, var1, var2); // L: 53 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", + garbageValue = "1341755485" + ) + public static String method3524(CharSequence[] var0, int var1, int var2) { + if (var2 == 0) { // L: 12 + return ""; + } else if (var2 == 1) { // L: 13 + CharSequence var10 = var0[var1]; // L: 14 + return var10 == null ? "null" : var10.toString(); // L: 15 16 } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 70 - if (var5 == null) { // L: 71 - var3 = var2; // L: 72 - } else { - var3 = (String)var5.obj; // L: 75 + int var3 = var2 + var1; // L: 18 + int var4 = 0; // L: 19 + + for (int var5 = var1; var5 < var3; ++var5) { // L: 20 + CharSequence var9 = var0[var5]; // L: 21 + if (var9 == null) { // L: 22 + var4 += 4; + } else { + var4 += var9.length(); // L: 23 + } } - } - return var3; // L: 77 - } + StringBuilder var8 = new StringBuilder(var4); // L: 25 - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2141365595" - ) - public static int method3618() { - return ViewportMouse.ViewportMouse_entityCount; // L: 44 - } + for (int var6 = var1; var6 < var3; ++var6) { // L: 26 + CharSequence var7 = var0[var6]; // L: 27 + if (var7 == null) { // L: 28 + var8.append("null"); + } else { + var8.append(var7); // L: 29 + } + } - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IIIIIIB)I", - garbageValue = "0" - ) - public static int method3611(int var0, int var1, int var2, int var3, int var4, int var5) { - if ((var5 & 1) == 1) { // L: 17 - int var6 = var3; // L: 18 - var3 = var4; // L: 19 - var4 = var6; // L: 20 - } - - var2 &= 3; // L: 22 - if (var2 == 0) { // L: 23 - return var0; - } else if (var2 == 1) { // L: 24 - return var1; - } else { - return var2 == 2 ? 7 - var0 - (var3 - 1) : 7 - var1 - (var4 - 1); // L: 25 26 + return var8.toString(); // L: 31 } } - @ObfuscatedName("ld") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIZI)V", - garbageValue = "1317102167" + descriptor = "(Llp;IIB)Lqr;", + garbageValue = "73" ) - public static void method3619(int var0, int var1, int var2, boolean var3) { - PacketBufferNode var4 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2929, Client.packetWriter.isaacCipher); // L: 12590 - var4.packetBuffer.writeShort(var0); // L: 12591 - var4.packetBuffer.method7711(var1); // L: 12592 - var4.packetBuffer.method7703(var2); // L: 12593 - var4.packetBuffer.method7721(var3 ? Client.field586 * -480626199 * -416666023 : 0); // L: 12594 - Client.packetWriter.addNode(var4); // L: 12595 - } // L: 12596 + @Export("SpriteBuffer_getSprite") + public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { + return !User.method6514(var0, var1, var2) ? null : ByteArrayPool.method6365(); // L: 64 65 + } } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index bad13fda0c..9ae2403d4c 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -4,272 +4,83 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kt") +@ObfuscatedName("ke") @Implements("StudioGame") public enum StudioGame implements MouseWheel { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkt;" + descriptor = "Lke;" ) @Export("runescape") runescape("runescape", "RuneScape", 0), - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lkt;" + descriptor = "Lke;" ) @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lkt;" + descriptor = "Lke;" ) @Export("game3") game3("game3", "Game 3", 2), - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lkt;" + descriptor = "Lke;" ) @Export("game4") game4("game4", "Game 4", 3), - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lkt;" + descriptor = "Lke;" ) @Export("game5") game5("game5", "Game 5", 4), - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lkt;" + descriptor = "Lke;" ) @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); - @ObfuscatedName("s") + @ObfuscatedName("jb") + @ObfuscatedGetter( + intValue = 1529760587 + ) + @Export("cameraYaw") + static int cameraYaw; + @ObfuscatedName("p") @Export("name") public final String name; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 589131085 + intValue = -2065228417 ) @Export("id") final int id; StudioGame(String var3, String var4, int var5) { - this.name = var3; + this.name = var3; // L: 17 this.id = var5; - } // L: 23 + } // L: 19 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 22 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-741989728" + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "-40" ) - static void method5776() { - if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { // L: 124 - KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 125 - KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 126 - KeyHandler.KeyHandler_keyCodes[188] = 71; // L: 127 - KeyHandler.KeyHandler_keyCodes[189] = 26; // L: 128 - KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 129 - KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 130 - KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 131 - KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 132 - KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 133 - KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 134 - KeyHandler.KeyHandler_keyCodes[222] = 59; // L: 135 - KeyHandler.KeyHandler_keyCodes[223] = 28; // L: 136 - } else { - KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 139 - KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 140 - KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 141 - KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 142 - KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 143 - KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 144 - KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 145 - KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 146 - KeyHandler.KeyHandler_keyCodes[93] = 43; // L: 147 - KeyHandler.KeyHandler_keyCodes[192] = 28; // L: 148 - KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 149 - KeyHandler.KeyHandler_keyCodes[520] = 59; // L: 150 - } - - } // L: 152 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", - garbageValue = "-184961670" - ) - public static String method5780(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 - } + static String method5590(int var0) { + return ""; // L: 18 } - - @ObfuscatedName("hi") - @ObfuscatedSignature( - descriptor = "(ZLpz;B)V", - garbageValue = "1" - ) - @Export("loadRegions") - static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; // L: 5453 - int var2; - int var3; - int var5; - int var6; - int var7; - int var8; - if (!Client.isInInstance) { // L: 5454 - var2 = var1.method7714(); // L: 5455 - var3 = var1.method7714(); // L: 5456 - int var4 = var1.readUnsignedShort(); // L: 5457 - WorldMapSectionType.xteaKeys = new int[var4][4]; // L: 5458 - - for (var5 = 0; var5 < var4; ++var5) { // L: 5459 - for (var6 = 0; var6 < 4; ++var6) { // L: 5460 - WorldMapSectionType.xteaKeys[var5][var6] = var1.readInt(); // L: 5461 - } - } - - class21.regions = new int[var4]; // L: 5464 - VarpDefinition.regionMapArchiveIds = new int[var4]; // L: 5465 - class133.regionLandArchiveIds = new int[var4]; // L: 5466 - Varcs.regionLandArchives = new byte[var4][]; // L: 5467 - DynamicObject.regionMapArchives = new byte[var4][]; // L: 5468 - boolean var16 = false; // L: 5469 - if (Client.field553) { // L: 5470 - if ((var2 / 8 == 48 || var2 / 8 == 49) && var3 / 8 == 48) { // L: 5471 - var16 = true; - } - - if (var2 / 8 == 48 && var3 / 8 == 148) { // L: 5472 - var16 = true; - } - } - - var4 = 0; // L: 5474 - - for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) { // L: 5475 - for (var7 = (var3 - 6) / 8; var7 <= (var3 + 6) / 8; ++var7) { // L: 5476 - var8 = var7 + (var6 << 8); // L: 5477 - if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 5478 - class21.regions[var4] = var8; // L: 5479 - VarpDefinition.regionMapArchiveIds[var4] = Players.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5480 - class133.regionLandArchiveIds[var4] = Players.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5481 - ++var4; // L: 5482 - } - } - } - - FloorDecoration.method4591(var2, var3, true); // L: 5485 - } else { - var2 = var1.method7715(); // L: 5488 - var3 = var1.method7713(); // L: 5489 - boolean var15 = var1.readUnsignedByte() == 1; // L: 5490 - var5 = var1.readUnsignedShort(); // L: 5491 - var1.importIndex(); // L: 5492 - - int var9; - for (var6 = 0; var6 < 4; ++var6) { // L: 5493 - for (var7 = 0; var7 < 13; ++var7) { // L: 5494 - for (var8 = 0; var8 < 13; ++var8) { // L: 5495 - var9 = var1.readBits(1); // L: 5496 - if (var9 == 1) { - Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 5497 - } else { - Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 5498 - } - } - } - } - - var1.exportIndex(); // L: 5502 - WorldMapSectionType.xteaKeys = new int[var5][4]; // L: 5503 - - for (var6 = 0; var6 < var5; ++var6) { // L: 5504 - for (var7 = 0; var7 < 4; ++var7) { // L: 5505 - WorldMapSectionType.xteaKeys[var6][var7] = var1.readInt(); // L: 5506 - } - } - - class21.regions = new int[var5]; // L: 5509 - VarpDefinition.regionMapArchiveIds = new int[var5]; // L: 5510 - class133.regionLandArchiveIds = new int[var5]; // L: 5511 - Varcs.regionLandArchives = new byte[var5][]; // L: 5512 - DynamicObject.regionMapArchives = new byte[var5][]; // L: 5513 - var5 = 0; // L: 5514 - - for (var6 = 0; var6 < 4; ++var6) { // L: 5515 - for (var7 = 0; var7 < 13; ++var7) { // L: 5516 - for (var8 = 0; var8 < 13; ++var8) { // L: 5517 - var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 5518 - if (var9 != -1) { // L: 5519 - int var10 = var9 >> 14 & 1023; // L: 5520 - int var11 = var9 >> 3 & 2047; // L: 5521 - int var12 = (var10 / 8 << 8) + var11 / 8; // L: 5522 - - int var13; - for (var13 = 0; var13 < var5; ++var13) { // L: 5523 - if (class21.regions[var13] == var12) { - var12 = -1; // L: 5524 - break; // L: 5525 - } - } - - if (var12 != -1) { // L: 5527 - class21.regions[var5] = var12; // L: 5528 - var13 = var12 >> 8 & 255; // L: 5529 - int var14 = var12 & 255; // L: 5530 - VarpDefinition.regionMapArchiveIds[var5] = Players.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5531 - class133.regionLandArchiveIds[var5] = Players.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5532 - ++var5; // L: 5533 - } - } - } - } - } - - FloorDecoration.method4591(var3, var2, !var15); // L: 5539 - } - - } // L: 5541 } diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java index 94b6749527..eb28a08d9f 100644 --- a/runescape-client/src/main/java/Task.java +++ b/runescape-client/src/main/java/Task.java @@ -4,31 +4,31 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fx") +@ObfuscatedName("fl") @Implements("Task") public class Task { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lfx;" + descriptor = "Lfl;" ) @Export("next") Task next; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("status") public volatile int status; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 692855731 + intValue = 179289705 ) @Export("type") int type; - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("intArgument") public int intArgument; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("objectArgument") Object objectArgument; - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("result") public volatile Object result; diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java index 905c3205e0..e786fe87da 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -4,41 +4,34 @@ import java.net.Socket; 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("ff") +@ObfuscatedName("fs") @Implements("TaskHandler") public class TaskHandler implements Runnable { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("javaVendor") public static String javaVendor; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("javaVersion") public static String javaVersion; - @ObfuscatedName("ix") - @ObfuscatedGetter( - intValue = 64635033 - ) - @Export("selectedItemWidget") - static int selectedItemWidget; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lfx;" + descriptor = "Lfl;" ) @Export("current") Task current; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lfx;" + descriptor = "Lfl;" ) @Export("task") Task task; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("thread") Thread thread; - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("isClosed") boolean isClosed; @@ -62,10 +55,10 @@ public class TaskHandler implements Runnable { this.thread.start(); // L: 31 } // L: 32 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1526764505" + garbageValue = "1440718962" ) @Export("close") public final void close() { @@ -81,10 +74,10 @@ public class TaskHandler implements Runnable { } // L: 43 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IIILjava/lang/Object;I)Lfx;", - garbageValue = "1659123907" + descriptor = "(IIILjava/lang/Object;I)Lfl;", + garbageValue = "1484642782" ) @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { @@ -105,20 +98,20 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)Lfx;", - garbageValue = "-1072001618" + descriptor = "(Ljava/lang/String;II)Lfl;", + garbageValue = "1024019511" ) @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { return this.newTask(1, var2, 0, var1); // L: 108 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Runnable;II)Lfx;", - garbageValue = "-610895732" + descriptor = "(Ljava/lang/Runnable;II)Lfl;", + garbageValue = "1474796416" ) @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { @@ -172,4 +165,134 @@ public class TaskHandler implements Runnable { } } } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "2007350025" + ) + @Export("isKeyDown") + public static final boolean isKeyDown() { + synchronized(KeyHandler.KeyHandler_instance) { // L: 132 + if (KeyHandler.field144 == KeyHandler.field142) { // L: 133 + return false; + } else { + class12.field61 = KeyHandler.field122[KeyHandler.field142]; // L: 134 + InvDefinition.field1850 = KeyHandler.field136[KeyHandler.field142]; // L: 135 + KeyHandler.field142 = KeyHandler.field142 + 1 & 127; // L: 136 + return true; // L: 137 + } + } + } + + @ObfuscatedName("is") + @ObfuscatedSignature( + descriptor = "(IIIILjava/lang/String;I)V", + garbageValue = "87331600" + ) + @Export("widgetDefaultMenuAction") + static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { + Widget var5 = ApproximateRouteStrategy.getWidgetChild(var1, var2); // L: 9808 + if (var5 != null) { // L: 9809 + if (var5.onOp != null) { // L: 9810 + ScriptEvent var6 = new ScriptEvent(); // L: 9811 + var6.widget = var5; // L: 9812 + var6.opIndex = var0; // L: 9813 + var6.targetName = var4; // L: 9814 + var6.args = var5.onOp; // L: 9815 + class144.runScriptEvent(var6); // L: 9816 + } + + boolean var8 = true; // L: 9818 + if (var5.contentType > 0) { // L: 9819 + var8 = ReflectionCheck.method599(var5); + } + + if (var8) { // L: 9820 + if (MenuAction.method1880(UrlRequester.getWidgetFlags(var5), var0 - 1)) { // L: 9821 + PacketBufferNode var7; + if (var0 == 1) { // L: 9824 + var7 = WallDecoration.getPacketBufferNode(ClientPacket.field3006, Client.packetWriter.isaacCipher); // L: 9826 + var7.packetBuffer.writeInt(var1); // L: 9827 + var7.packetBuffer.writeShort(var2); // L: 9828 + var7.packetBuffer.writeShort(var3); // L: 9829 + Client.packetWriter.addNode(var7); // L: 9830 + } + + if (var0 == 2) { // L: 9832 + var7 = WallDecoration.getPacketBufferNode(ClientPacket.field3032, Client.packetWriter.isaacCipher); // L: 9834 + var7.packetBuffer.writeInt(var1); // L: 9835 + var7.packetBuffer.writeShort(var2); // L: 9836 + var7.packetBuffer.writeShort(var3); // L: 9837 + Client.packetWriter.addNode(var7); // L: 9838 + } + + if (var0 == 3) { // L: 9840 + var7 = WallDecoration.getPacketBufferNode(ClientPacket.field3011, Client.packetWriter.isaacCipher); // L: 9842 + var7.packetBuffer.writeInt(var1); // L: 9843 + var7.packetBuffer.writeShort(var2); // L: 9844 + var7.packetBuffer.writeShort(var3); // L: 9845 + Client.packetWriter.addNode(var7); // L: 9846 + } + + if (var0 == 4) { // L: 9848 + var7 = WallDecoration.getPacketBufferNode(ClientPacket.field2956, Client.packetWriter.isaacCipher); // L: 9850 + var7.packetBuffer.writeInt(var1); // L: 9851 + var7.packetBuffer.writeShort(var2); // L: 9852 + var7.packetBuffer.writeShort(var3); // L: 9853 + Client.packetWriter.addNode(var7); // L: 9854 + } + + if (var0 == 5) { // L: 9856 + var7 = WallDecoration.getPacketBufferNode(ClientPacket.field2960, Client.packetWriter.isaacCipher); // L: 9858 + var7.packetBuffer.writeInt(var1); // L: 9859 + var7.packetBuffer.writeShort(var2); // L: 9860 + var7.packetBuffer.writeShort(var3); // L: 9861 + Client.packetWriter.addNode(var7); // L: 9862 + } + + if (var0 == 6) { // L: 9864 + var7 = WallDecoration.getPacketBufferNode(ClientPacket.field2968, Client.packetWriter.isaacCipher); // L: 9866 + var7.packetBuffer.writeInt(var1); // L: 9867 + var7.packetBuffer.writeShort(var2); // L: 9868 + var7.packetBuffer.writeShort(var3); // L: 9869 + Client.packetWriter.addNode(var7); // L: 9870 + } + + if (var0 == 7) { // L: 9872 + var7 = WallDecoration.getPacketBufferNode(ClientPacket.field3002, Client.packetWriter.isaacCipher); // L: 9874 + var7.packetBuffer.writeInt(var1); // L: 9875 + var7.packetBuffer.writeShort(var2); // L: 9876 + var7.packetBuffer.writeShort(var3); // L: 9877 + Client.packetWriter.addNode(var7); // L: 9878 + } + + if (var0 == 8) { // L: 9880 + var7 = WallDecoration.getPacketBufferNode(ClientPacket.field2989, Client.packetWriter.isaacCipher); // L: 9882 + var7.packetBuffer.writeInt(var1); // L: 9883 + var7.packetBuffer.writeShort(var2); // L: 9884 + var7.packetBuffer.writeShort(var3); // L: 9885 + Client.packetWriter.addNode(var7); // L: 9886 + } + + if (var0 == 9) { // L: 9888 + var7 = WallDecoration.getPacketBufferNode(ClientPacket.field3015, Client.packetWriter.isaacCipher); // L: 9890 + var7.packetBuffer.writeInt(var1); // L: 9891 + var7.packetBuffer.writeShort(var2); // L: 9892 + var7.packetBuffer.writeShort(var3); // L: 9893 + Client.packetWriter.addNode(var7); // L: 9894 + } + + if (var0 == 10) { // L: 9896 + var7 = WallDecoration.getPacketBufferNode(ClientPacket.field3043, Client.packetWriter.isaacCipher); // L: 9898 + var7.packetBuffer.writeInt(var1); // L: 9899 + var7.packetBuffer.writeShort(var2); // L: 9900 + var7.packetBuffer.writeShort(var3); // L: 9901 + Client.packetWriter.addNode(var7); // L: 9902 + } + + } + } + } + } // L: 9822 9904 } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index 3e2c7ba591..2afc38c783 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -3,46 +3,46 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hg") +@ObfuscatedName("go") @Implements("Texture") public class Texture extends Node { - @ObfuscatedName("d") + @ObfuscatedName("t") @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("averageRGB") int averageRGB; - @ObfuscatedName("n") - boolean field2511; - @ObfuscatedName("s") + @ObfuscatedName("m") + boolean field2332; + @ObfuscatedName("p") @Export("fileIds") int[] fileIds; - @ObfuscatedName("l") - int[] field2506; - @ObfuscatedName("q") - int[] field2507; - @ObfuscatedName("o") - int[] field2508; + @ObfuscatedName("s") + int[] field2334; @ObfuscatedName("r") + int[] field2335; + @ObfuscatedName("v") + int[] field2329; + @ObfuscatedName("y") @Export("animationDirection") int animationDirection; - @ObfuscatedName("p") + @ObfuscatedName("c") @Export("animationSpeed") int animationSpeed; @ObfuscatedName("w") @Export("pixels") int[] pixels; - @ObfuscatedName("k") + @ObfuscatedName("b") @Export("isLoaded") boolean isLoaded; @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpx;)V" ) Texture(Buffer var1) { this.isLoaded = false; // L: 25 this.averageRGB = var1.readUnsignedShort(); // L: 29 - this.field2511 = var1.readUnsignedByte() == 1; // L: 30 + this.field2332 = 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 @@ -53,25 +53,25 @@ public class Texture extends Node { } if (var2 > 1) { // L: 37 - this.field2506 = new int[var2 - 1]; // L: 38 + this.field2334 = new int[var2 - 1]; // L: 38 for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 39 - this.field2506[var3] = var1.readUnsignedByte(); + this.field2334[var3] = var1.readUnsignedByte(); } } if (var2 > 1) { // L: 41 - this.field2507 = new int[var2 - 1]; // L: 42 + this.field2335 = new int[var2 - 1]; // L: 42 for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 43 - this.field2507[var3] = var1.readUnsignedByte(); + this.field2335[var3] = var1.readUnsignedByte(); } } - this.field2508 = new int[var2]; // L: 45 + this.field2329 = new int[var2]; // L: 45 for (var3 = 0; var3 < var2; ++var3) { // L: 46 - this.field2508[var3] = var1.readInt(); + this.field2329[var3] = var1.readInt(); } this.animationDirection = var1.readUnsignedByte(); // L: 47 @@ -82,9 +82,9 @@ public class Texture extends Node { } } // L: 50 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(DILln;)Z" + descriptor = "(DILlp;)Z" ) @Export("load") boolean load(double var1, int var3, AbstractArchive var4) { @@ -99,111 +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 - byte[] var10 = var4.takeFileFlat(var8); // L: 64 - boolean var9; - if (var10 == null) { // L: 65 - var9 = false; // L: 66 - } else { - WorldMapArea.SpriteBuffer_decode(var10); // L: 69 - var9 = true; // L: 70 + IndexedSprite var7 = class67.method1883(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.field2329[var6]; // L: 63 + if ((var10 & -16777216) == 16777216) { // L: 64 } - IndexedSprite var7; - if (!var9) { // L: 72 - var7 = null; // L: 73 - } else { - var7 = HorizontalAlignment.method3492(); // L: 76 - } - - var7.normalize(); // L: 79 - var10 = var7.pixels; // L: 80 - int[] var11 = var7.palette; // L: 81 - int var12 = this.field2508[var6]; // L: 82 - if ((var12 & -16777216) == 16777216) { // L: 83 - } - - if ((var12 & -16777216) == 33554432) { // L: 84 + if ((var10 & -16777216) == 33554432) { // L: 65 } + int var11; + int var12; int var13; int var14; - int var15; - int var16; - if ((var12 & -16777216) == 50331648) { // L: 85 - var13 = var12 & 16711935; // L: 86 - var14 = var12 >> 8 & 255; // L: 87 + 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: 88 - var16 = var11[var15]; // L: 89 - if (var16 >> 8 == (var16 & 65535)) { // L: 90 - var16 &= 255; // L: 91 - var11[var15] = var13 * var16 >> 8 & 16711935 | var14 * var16 & 65280; // L: 92 + 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: 96 - 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: 98 - var13 = 0; + if (var6 == 0) { // L: 79 + var11 = 0; } else { - var13 = this.field2506[var6 - 1]; // L: 99 + var11 = this.field2334[var6 - 1]; // L: 80 } - if (var13 == 0) { // L: 100 - if (var3 == var7.subWidth) { // L: 101 - for (var14 = 0; var14 < var5; ++var14) { // L: 102 - 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: 104 - var14 = 0; // L: 105 + } else if (var7.subWidth == 64 && var3 == 128) { // L: 85 + var12 = 0; // L: 86 - for (var15 = 0; var15 < var3; ++var15) { // L: 106 - for (var16 = 0; var16 < var3; ++var16) { // L: 107 - 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: 110 - throw new RuntimeException(); // L: 117 + if (var7.subWidth != 128 || var3 != 64) { // L: 91 + throw new RuntimeException(); // L: 98 } - var14 = 0; // L: 111 + var12 = 0; // L: 92 - for (var15 = 0; var15 < var3; ++var15) { // L: 112 - for (var16 = 0; var16 < var3; ++var16) { // L: 113 - 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: 120 + if (var11 == 1) { // L: 101 } - if (var13 == 2) { // L: 121 + if (var11 == 2) { // L: 102 } - if (var13 == 3) { // L: 122 + if (var11 == 3) { // L: 103 } } - return true; // L: 124 + return true; // L: 105 } - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("reset") void reset() { - this.pixels = null; // L: 128 - } // L: 129 + this.pixels = null; // L: 109 + } // L: 110 - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("animate") void animate(int var1) { - if (this.pixels != null) { // L: 132 + if (this.pixels != null) { // L: 113 short var2; int var3; int var4; @@ -211,65 +195,65 @@ public class Texture extends Node { int var6; int var7; int[] var10; - if (this.animationDirection == 1 || this.animationDirection == 3) { // L: 133 - if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 134 + 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: 136 + if (this.pixels.length == 4096) { // L: 117 var2 = 64; } else { - var2 = 128; // L: 137 + var2 = 128; // L: 118 } - var3 = this.pixels.length; // L: 138 - var4 = var2 * this.animationSpeed * var1; // L: 139 - var5 = var3 - 1; // L: 140 - if (this.animationDirection == 1) { // L: 141 + 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: 142 - var7 = var6 + var4 & var5; // L: 143 - Texture_animatedPixels[var6] = this.pixels[var7]; // L: 144 + 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: 146 - this.pixels = Texture_animatedPixels; // L: 147 - Texture_animatedPixels = var10; // L: 148 + var10 = this.pixels; // L: 127 + this.pixels = Texture_animatedPixels; // L: 128 + Texture_animatedPixels = var10; // L: 129 } - if (this.animationDirection == 2 || this.animationDirection == 4) { // L: 150 - if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 151 + 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: 153 + if (this.pixels.length == 4096) { // L: 134 var2 = 64; } else { - var2 = 128; // L: 154 + var2 = 128; // L: 135 } - var3 = this.pixels.length; // L: 155 - var4 = this.animationSpeed * var1; // L: 156 - var5 = var2 - 1; // L: 157 - if (this.animationDirection == 2) { // L: 158 + 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: 159 - for (var7 = 0; var7 < var2; ++var7) { // L: 160 - int var8 = var6 + var7; // L: 161 - int var9 = var6 + (var7 + var4 & var5); // L: 162 - Texture_animatedPixels[var8] = this.pixels[var9]; // L: 163 + 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: 166 - this.pixels = Texture_animatedPixels; // L: 167 - Texture_animatedPixels = var10; // L: 168 + var10 = this.pixels; // L: 147 + this.pixels = Texture_animatedPixels; // L: 148 + Texture_animatedPixels = var10; // L: 149 } } - } // L: 170 + } // L: 151 } diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java index 19a83b6aae..40eaea82f2 100644 --- a/runescape-client/src/main/java/TextureLoader.java +++ b/runescape-client/src/main/java/TextureLoader.java @@ -3,36 +3,36 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iw") +@ObfuscatedName("hk") @Implements("TextureLoader") public interface TextureLoader { - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "1291576532" + garbageValue = "-1172311447" ) @Export("getTexturePixels") int[] getTexturePixels(int var1); - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-200927796" + garbageValue = "-1180986754" ) @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1510277471" + descriptor = "(IB)Z", + garbageValue = "53" ) - boolean vmethod5096(int var1); + boolean vmethod4381(int var1); - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1828440657" + descriptor = "(IB)Z", + garbageValue = "40" ) @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 ae35a84d26..5d831b8227 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -1,55 +1,54 @@ -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("it") +@ObfuscatedName("ht") @Implements("TextureProvider") public class TextureProvider implements TextureLoader { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Lhg;" + descriptor = "[Lgo;" ) @Export("textures") Texture[] textures; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llv;" ) @Export("deque") NodeDeque deque; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1377781691 + intValue = -1556133807 ) @Export("capacity") int capacity; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 2008251437 + intValue = -1550792351 ) @Export("remaining") int remaining; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("brightness") double brightness; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 24561521 + intValue = 125957321 ) @Export("textureSize") int textureSize; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("archive") AbstractArchive archive; @ObfuscatedSignature( - descriptor = "(Lln;Lln;IDI)V" + descriptor = "(Llp;Llp;IDI)V" ) public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { this.deque = new NodeDeque(); // L: 9 @@ -72,10 +71,10 @@ public class TextureProvider implements TextureLoader { } // L: 29 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-728191973" + garbageValue = "-1270321324" ) @Export("getLoadedPercentage") public int getLoadedPercentage() { @@ -85,37 +84,37 @@ public class TextureProvider implements TextureLoader { for (int var4 = 0; var4 < var3.length; ++var4) { // L: 36 Texture var5 = var3[var4]; // L: 37 - if (var5 != null && var5.fileIds != null) { - var1 += var5.fileIds.length; - int[] var6 = var5.fileIds; + if (var5 != null && var5.fileIds != null) { // L: 39 + var1 += var5.fileIds.length; // L: 40 + int[] var6 = var5.fileIds; // L: 42 - for (int var7 = 0; var7 < var6.length; ++var7) { - int var8 = var6[var7]; - if (this.archive.method5864(var8)) { - ++var2; + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 43 + int var8 = var6[var7]; // L: 44 + if (this.archive.method5668(var8)) { // L: 46 + ++var2; // L: 47 } } } } - if (var1 == 0) { + if (var1 == 0) { // L: 55 return 0; } else { - return var2 * 100 / var1; + return var2 * 100 / var1; // L: 56 } } - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("setBrightness") public void setBrightness(double var1) { - this.brightness = var1; - this.clear(); + this.brightness = var1; // L: 60 + this.clear(); // L: 61 } // L: 62 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "1291576532" + garbageValue = "-1172311447" ) @Export("getTexturePixels") public int[] getTexturePixels(int var1) { @@ -137,47 +136,47 @@ public class TextureProvider implements TextureLoader { } this.deque.addLast(var2); // L: 79 - var2.isLoaded = true; - return var2.pixels; + var2.isLoaded = true; // L: 80 + return var2.pixels; // L: 81 } } - return null; + return null; // L: 84 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-200927796" + garbageValue = "-1180986754" ) @Export("getAverageTextureRGB") public int getAverageTextureRGB(int var1) { return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; // L: 88 89 } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1510277471" + descriptor = "(IB)Z", + garbageValue = "53" ) - public boolean vmethod5096(int var1) { - return this.textures[var1].field2511; // L: 93 + public boolean vmethod4381(int var1) { + return this.textures[var1].field2332; // L: 93 } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1828440657" + descriptor = "(IB)Z", + garbageValue = "40" ) @Export("isLowDetail") public boolean isLowDetail(int var1) { return this.textureSize == 64; // L: 97 } - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-17643" + descriptor = "(I)V", + garbageValue = "412770361" ) @Export("clear") public void clear() { @@ -191,10 +190,10 @@ public class TextureProvider implements TextureLoader { this.remaining = this.capacity; // L: 105 } // L: 106 - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-115024983" + garbageValue = "1167642279" ) @Export("animate") public void animate(int var1) { @@ -208,83 +207,59 @@ public class TextureProvider implements TextureLoader { } // L: 116 - @ObfuscatedName("i") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IZI)Z", - garbageValue = "-202742127" + descriptor = "(ILbb;ZI)I", + garbageValue = "-496024306" ) - static boolean method4963(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 - - 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; + static int method4246(int var0, Script var1, boolean var2) { + if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { // L: 4547 + if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { // L: 4551 + if (var0 != 7003 && var0 != 7013 && var0 != 7023) { // L: 4555 + if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { // L: 4559 + if (var0 != 7008 && var0 != 7018 && var0 != 7028) { // L: 4563 + if (var0 != 7031 && var0 != 7032) { // L: 4567 + if (var0 == 7033) { // L: 4572 + --class9.Interpreter_stringStackSize; // L: 4573 + return 1; // L: 4574 + } else if (var0 != 7036 && var0 != 7037) { // L: 4576 + if (var0 == 7038) { // L: 4580 + --class12.Interpreter_intStackSize; // L: 4581 + return 1; // L: 4582 + } else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { // L: 4584 + return 2; // L: 4588 + } else { + --class12.Interpreter_intStackSize; // L: 4585 + return 1; // L: 4586 + } + } else { + class12.Interpreter_intStackSize -= 2; // L: 4577 + return 1; // L: 4578 + } + } else { + --class9.Interpreter_stringStackSize; // L: 4568 + --class12.Interpreter_intStackSize; // L: 4569 + return 1; // L: 4570 + } + } else { + --class12.Interpreter_intStackSize; // L: 4564 + return 1; // L: 4565 + } + } else { + class12.Interpreter_intStackSize -= 2; // L: 4560 + return 1; // L: 4561 } - - if (var8 == '+') { // L: 50 - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { // L: 52 - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { // L: 53 - var10 = var8 - '7'; } else { - if (var8 < 'a' || var8 > 'z') { // L: 54 - return false; // L: 55 - } - - var10 = var8 - 'W'; + class12.Interpreter_intStackSize -= 2; // L: 4556 + return 1; // L: 4557 } - - 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 + } else { + class12.Interpreter_intStackSize -= 3; // L: 4552 + return 1; // L: 4553 } - - return var4; // L: 63 } else { - throw new IllegalArgumentException("" + var1); + class12.Interpreter_intStackSize -= 5; // L: 4548 + return 1; // L: 4549 } } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(S)Ljava/lang/String;", - garbageValue = "1605" - ) - static String method4950() { - StringBuilder var0 = new StringBuilder(); // L: 80 - - Message var2; - for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0.append(var2.text).append('\n')) { // L: 81 87 - var2 = (Message)var1.next(); // L: 82 - if (var2.sender != null && !var2.sender.isEmpty()) { // L: 84 - var0.append(var2.sender).append(':'); // L: 85 - } - } - - return var0.toString(); // L: 90 - } } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index 34c194f4ab..4354334a53 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -1,135 +1,133 @@ -import java.lang.management.GarbageCollectorMXBean; -import java.lang.management.ManagementFactory; -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hu") +@ObfuscatedName("gn") @Implements("Tile") public final class Tile extends Node { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 554063901 + intValue = 887186055 ) @Export("plane") int plane; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1735268707 + intValue = 719692751 ) @Export("x") int x; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1320451453 + intValue = 2070822957 ) @Export("y") int y; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 409854947 + intValue = -1571348595 ) @Export("originalPlane") int originalPlane; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lhr;" ) @Export("paint") SceneTilePaint paint; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lik;" + descriptor = "Lhu;" ) @Export("model") SceneTileModel model; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "Lhc;" ) @Export("boundaryObject") BoundaryObject boundaryObject; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lio;" + descriptor = "Lhf;" ) @Export("wallDecoration") WallDecoration wallDecoration; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lhp;" + descriptor = "Lga;" ) @Export("floorDecoration") FloorDecoration floorDecoration; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lhy;" + descriptor = "Lgz;" ) @Export("itemLayer") ItemLayer itemLayer; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 888964959 + intValue = -1697073381 ) @Export("gameObjectsCount") int gameObjectsCount; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Liy;" + descriptor = "[Lhx;" ) @Export("gameObjects") GameObject[] gameObjects; @ObfuscatedName("w") @Export("gameObjectEdgeMasks") int[] gameObjectEdgeMasks; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1954145803 + intValue = -344605411 ) @Export("gameObjectsEdgeMask") int gameObjectsEdgeMask; - @ObfuscatedName("d") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1615665333 + intValue = -1026469489 ) @Export("minPlane") int minPlane; - @ObfuscatedName("m") + @ObfuscatedName("g") @Export("drawPrimary") boolean drawPrimary; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("drawSecondary") boolean drawSecondary; - @ObfuscatedName("t") + @ObfuscatedName("n") @Export("drawGameObjects") boolean drawGameObjects; - @ObfuscatedName("g") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1788944153 + intValue = -1027035127 ) @Export("drawGameObjectEdges") int drawGameObjectEdges; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1042074251 + intValue = 1807728235 ) - int field2544; - @ObfuscatedName("a") + int field2372; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -147563717 + intValue = -588428605 ) - int field2545; - @ObfuscatedName("y") + int field2373; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1316845431 + intValue = -720858367 ) - int field2546; + int field2374; @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lhu;" + descriptor = "Lgn;" ) @Export("linkedBelowTile") Tile linkedBelowTile; @@ -138,59 +136,100 @@ public final class Tile extends Node { 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.originalPlane = this.plane = var1; this.x = var2; // L: 32 this.y = var3; // L: 33 } // L: 34 - @ObfuscatedName("al") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1950958863" + descriptor = "(S)Lnw;", + garbageValue = "-23548" ) - @Export("getGcDuration") - protected static int getGcDuration() { - int var0 = 0; // L: 574 - if (PcmPlayer.garbageCollector == null || !PcmPlayer.garbageCollector.isValid()) { // L: 575 - try { - Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 577 - - while (var1.hasNext()) { - GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 578 - if (var2.isValid()) { // L: 580 - PcmPlayer.garbageCollector = var2; // L: 581 - GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 582 - GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 583 - } - } - } catch (Throwable var11) { // L: 588 + public static class388 method3904() { + synchronized(class388.field4402) { // L: 27 + if (class388.field4401 == 0) { // L: 28 + return new class388(); + } else { + class388.field4402[--class388.field4401].method6861(); // L: 30 + return class388.field4402[class388.field4401]; // L: 31 } } - - if (PcmPlayer.garbageCollector != null) { // L: 590 - long var9 = class136.method2931(); // L: 591 - long var3 = PcmPlayer.garbageCollector.getCollectionTime(); // L: 592 - if (-1L != GameEngine.garbageCollectorLastCollectionTime) { // L: 593 - long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 594 - long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 595 - if (var7 != 0L) { // L: 596 - var0 = (int)(var5 * 100L / var7); - } - } - - GameEngine.garbageCollectorLastCollectionTime = var3; // L: 598 - GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 599 - } - - return var0; // L: 601 } - @ObfuscatedName("lk") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "418213211" + descriptor = "(ILbb;ZB)I", + garbageValue = "1" ) - static void method4603(int var0) { - Client.oculusOrbState = var0; // L: 12603 - } // L: 12604 + static int method3903(int var0, Script var1, boolean var2) { + Widget var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1312 + if (var0 == ScriptOpcodes.IF_GETX) { // L: 1313 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.x; // L: 1314 + return 1; // L: 1315 + } else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1317 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.y; // L: 1318 + return 1; // L: 1319 + } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1321 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.width; // L: 1322 + return 1; // L: 1323 + } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1325 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.height; // L: 1326 + return 1; // L: 1327 + } else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1329 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1330 + return 1; // L: 1331 + } else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1333 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.parentId; // L: 1334 + return 1; // L: 1335 + } else { + return 2; // L: 1337 + } + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(ILbb;ZB)I", + garbageValue = "-61" + ) + static int method3902(int var0, Script var1, boolean var2) { + if (var0 == 7100) { // L: 4592 + ++class12.Interpreter_intStackSize; // L: 4593 + return 1; // L: 4594 + } else if (var0 == 7101) { // L: 4596 + class9.Interpreter_stringStackSize += 2; // L: 4597 + return 1; // L: 4598 + } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { // L: 4600 + if (var0 == 7106) { // L: 4604 + ++class12.Interpreter_intStackSize; // L: 4605 + return 1; // L: 4606 + } else if (var0 == 7107) { // L: 4608 + ++class12.Interpreter_intStackSize; // L: 4609 + return 1; // L: 4610 + } else if (var0 == 7108) { // L: 4612 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = CollisionMap.method3788() ? 1 : 0; // L: 4613 + return 1; // L: 4614 + } else if (var0 == 7110) { // L: 4616 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4617 + return 1; // L: 4618 + } else if (var0 == 7120) { // L: 4620 + --class12.Interpreter_intStackSize; // L: 4621 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4622 + return 1; // L: 4623 + } else if (var0 == 7121) { // L: 4625 + class12.Interpreter_intStackSize -= 2; // L: 4626 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4627 + return 1; // L: 4628 + } else if (var0 == 7122) { // L: 4630 + class12.Interpreter_intStackSize -= 2; // L: 4631 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4632 + return 1; // L: 4633 + } else { + return 2; // L: 4635 + } + } else { + ++class12.Interpreter_intStackSize; // L: 4601 + return 1; // L: 4602 + } + } } diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java index bdf69dc998..863a85cb0c 100644 --- a/runescape-client/src/main/java/TileItem.java +++ b/runescape-client/src/main/java/TileItem.java @@ -1,28 +1,32 @@ -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("cu") +@ObfuscatedName("cg") @Implements("TileItem") public final class TileItem extends Renderable { - @ObfuscatedName("cv") - @ObfuscatedSignature( - descriptor = "[Lqq;" - ) - @Export("worldSelectStars") - static IndexedSprite[] worldSelectStars; - @ObfuscatedName("v") + @ObfuscatedName("sb") @ObfuscatedGetter( - intValue = -1512550431 + intValue = -1684889403 + ) + static int field1292; + @ObfuscatedName("ev") + @ObfuscatedSignature( + descriptor = "Lle;" + ) + @Export("archive9") + static Archive archive9; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -2046412949 ) @Export("id") int id; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1689491185 + intValue = 129863863 ) @Export("quantity") int quantity; @@ -30,90 +34,26 @@ public final class TileItem extends Renderable { TileItem() { } // L: 11 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)Liq;", - garbageValue = "103" + descriptor = "(I)Lhv;", + garbageValue = "-238822980" ) @Export("getModel") protected final Model getModel() { - return class19.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14 + return FileSystem.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14 } - @ObfuscatedName("v") + @ObfuscatedName("fk") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1886709718" + descriptor = "(Lgq;IIIB)V", + garbageValue = "11" ) - @Export("loadWorlds") - static boolean loadWorlds() { - try { - if (class293.World_request == null) { // L: 31 - class293.World_request = VerticalAlignment.urlRequester.request(new URL(WorldMapElement.field1836)); - } else if (class293.World_request.isDone()) { // L: 33 - byte[] var0 = class293.World_request.getResponse(); // L: 34 - Buffer var1 = new Buffer(var0); // L: 35 - var1.readInt(); - World.World_count = var1.readUnsignedShort(); - DevicePcmPlayerProvider.World_worlds = new World[World.World_count]; - - World var3; - for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 47 - var3 = DevicePcmPlayerProvider.World_worlds[var2] = new World(); - var3.id = var1.readUnsignedShort(); - var3.properties = var1.readInt(); // L: 42 - var3.host = var1.readStringCp1252NullTerminated(); - var3.activity = var1.readStringCp1252NullTerminated(); // L: 44 - var3.location = var1.readUnsignedByte(); - var3.population = var1.readShort(); // L: 46 - } - - class127.sortWorlds(DevicePcmPlayerProvider.World_worlds, 0, DevicePcmPlayerProvider.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49 - class293.World_request = null; // L: 50 - return true; // L: 51 + static void method2407(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && class12.clientPreferences.method2239() != 0) { // L: 3768 + if (var0.field2209 != null && var0.field2209.containsKey(var1)) { // L: 3769 + MouseHandler.method588((Integer)var0.field2209.get(var1), var2, var3); // L: 3770 } - } catch (Exception var4) { // L: 55 - var4.printStackTrace(); // L: 56 - class293.World_request = null; // L: 57 } - - return false; // L: 59 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IIS)I", - garbageValue = "-26385" - ) - public static int method2393(int var0, int var1) { - return (var0 << 8) + var1; // L: 13 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1980901442" - ) - static void method2395() { - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 36 - if (ArchiveDiskActionHandler.field3945 == 0) { // L: 37 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 38 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 39 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 41 - } - - ArchiveDiskActionHandler.field3945 = 600; // L: 43 - } - } // L: 45 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)Lbe;", - garbageValue = "-99479259" - ) - @Export("Messages_getMessage") - static Message Messages_getMessage(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40 - } + } // L: 3771 } diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index 125949d813..f0a204ad90 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -1,122 +1,398 @@ +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; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bi") +@ObfuscatedName("bn") @Implements("Tiles") public final class Tiles { - @ObfuscatedName("v") + @ObfuscatedName("rx") + static boolean field997; + @ObfuscatedName("o") @Export("Tiles_heights") static int[][][] Tiles_heights; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("Tiles_renderFlags") static byte[][][] Tiles_renderFlags; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1996311103 + intValue = 7708309 ) @Export("Tiles_minPlane") static int Tiles_minPlane; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("Tiles_underlays") static byte[][][] Tiles_underlays; - @ObfuscatedName("s") - static byte[][][] field983; - @ObfuscatedName("q") - static int[][] field998; - @ObfuscatedName("p") - @Export("Tiles_lightness") - static int[] Tiles_lightness; - @ObfuscatedName("g") - static final int[] field990; - @ObfuscatedName("x") - static final int[] field989; @ObfuscatedName("a") - static final int[] field992; - @ObfuscatedName("y") - static final int[] field993; - @ObfuscatedName("j") - static final int[] field997; + @Export("Tiles_overlays") + static byte[][][] Tiles_overlays; + @ObfuscatedName("m") + @Export("Tiles_shapes") + static byte[][][] Tiles_shapes; + @ObfuscatedName("w") + @Export("Tiles_hueMultiplier") + static int[] Tiles_hueMultiplier; @ObfuscatedName("e") + static final int[] field988; + @ObfuscatedName("h") + static final int[] field989; + @ObfuscatedName("f") + static final int[] field990; + @ObfuscatedName("d") + static final int[] field991; + @ObfuscatedName("j") static final int[] field995; @ObfuscatedName("z") + static final int[] field993; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1326469755 + intValue = -1755098149 ) @Export("rndHue") static int rndHue; - @ObfuscatedName("h") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1535844851 + intValue = -243886671 ) @Export("rndLightness") static int rndLightness; + @ObfuscatedName("fv") + @ObfuscatedGetter( + intValue = -1283558205 + ) + @Export("worldPort") + static int worldPort; static { Tiles_heights = new int[4][105][105]; // L: 16 Tiles_renderFlags = new byte[4][104][104]; // L: 17 Tiles_minPlane = 99; // L: 18 - field990 = new int[]{1, 2, 4, 8}; // L: 34 + field988 = new int[]{1, 2, 4, 8}; // L: 34 field989 = new int[]{16, 32, 64, 128}; // L: 35 - field992 = new int[]{1, 0, -1, 0}; // L: 36 - field993 = new int[]{0, -1, 0, 1}; // L: 37 - field997 = new int[]{1, -1, -1, 1}; // L: 38 - field995 = new int[]{-1, -1, 1, 1}; // L: 39 + field990 = new int[]{1, 0, -1, 0}; // L: 36 + field991 = new int[]{0, -1, 0, 1}; // L: 37 + field995 = new int[]{1, -1, -1, 1}; // L: 38 + field993 = new int[]{-1, -1, 1, 1}; // L: 39 rndHue = (int)(Math.random() * 17.0D) - 8; // L: 40 rndLightness = (int)(Math.random() * 33.0D) - 16; // L: 41 } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([BIIIIIIILhv;[Lgv;)V" + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", + garbageValue = "-1322064070" ) - static final void method2015(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) { - Buffer var10 = new Buffer(var0); // L: 298 - int var11 = -1; // L: 299 + public static void method1996(Applet var0, String var1) { + class29.field170 = var0; // L: 22 + if (var1 != null) { // L: 23 + class29.field168 = var1; + } + + } // L: 24 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "128" + ) + static final void method2017() { + InterfaceParent.method2067("Your friend list is full. Max of 200 for free users, and 400 for members"); // L: 130 + } // L: 131 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "([BIIIIIIILgm;[Lgh;)V" + ) + static final void method2033(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) { + Buffer var10 = new Buffer(var0); // L: 283 + int var11 = -1; // L: 284 while (true) { - int var12 = var10.method7743(); // L: 301 - if (var12 == 0) { // L: 302 - return; // L: 329 + int var12 = var10.method7531(); // L: 286 + if (var12 == 0) { // L: 287 + return; // L: 342 } - var11 += var12; // L: 303 - int var13 = 0; // L: 304 + var11 += var12; // L: 288 + int var13 = 0; // L: 289 while (true) { - int var14 = var10.readUShortSmart(); // L: 306 - if (var14 == 0) { // L: 307 + int var14 = var10.readUShortSmart(); // L: 291 + if (var14 == 0) { // L: 292 break; } - var13 += var14 - 1; // L: 308 - int var15 = var13 & 63; // L: 309 - int var16 = var13 >> 6 & 63; // L: 310 - int var17 = var13 >> 12; // L: 311 - int var18 = var10.readUnsignedByte(); // L: 312 - int var19 = var18 >> 2; // L: 313 - int var20 = var18 & 3; // L: 314 - if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { // L: 315 - ObjectComposition var21 = class146.getObjectDefinition(var11); // L: 316 - int var22 = var2 + StructComposition.method3611(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); // L: 317 - int var23 = var3 + class394.method7141(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); // L: 318 - if (var22 > 0 && var23 > 0 && var22 < 103 && var23 < 103) { // L: 319 - int var24 = var1; // L: 320 - if ((Tiles_renderFlags[1][var22][var23] & 2) == 2) { // L: 321 - var24 = var1 - 1; + var13 += var14 - 1; // L: 293 + int var15 = var13 & 63; // L: 294 + int var16 = var13 >> 6 & 63; // L: 295 + int var17 = var13 >> 12; // L: 296 + int var18 = var10.readUnsignedByte(); // L: 297 + int var19 = var18 >> 2; // L: 298 + int var20 = var18 & 3; // L: 299 + if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { // L: 300 + ObjectComposition var21 = class82.getObjectDefinition(var11); // L: 301 + int var24 = var16 & 7; // L: 304 + int var25 = var15 & 7; // L: 305 + int var27 = var21.sizeX; // L: 307 + int var28 = var21.sizeY; // L: 308 + int var29; + if ((var20 & 1) == 1) { // L: 310 + var29 = var27; // L: 311 + var27 = var28; // L: 312 + var28 = var29; // L: 313 + } + + int var26 = var7 & 3; // L: 315 + int var23; + if (var26 == 0) { // L: 316 + var23 = var24; // L: 317 + } else if (var26 == 1) { // L: 320 + var23 = var25; // L: 321 + } else if (var26 == 2) { // L: 324 + var23 = 7 - var24 - (var27 - 1); // L: 325 + } else { + var23 = 7 - var25 - (var28 - 1); // L: 328 + } + + var29 = var2 + var23; // L: 330 + int var30 = var3 + class117.method2717(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); // L: 331 + if (var29 > 0 && var30 > 0 && var29 < 103 && var30 < 103) { // L: 332 + int var31 = var1; // L: 333 + if ((Tiles_renderFlags[1][var29][var30] & 2) == 2) { // L: 334 + var31 = var1 - 1; } - CollisionMap var25 = null; // L: 322 - if (var24 >= 0) { // L: 323 - var25 = var9[var24]; + CollisionMap var32 = null; // L: 335 + if (var31 >= 0) { // L: 336 + var32 = var9[var31]; } - WorldMapElement.addObjects(var1, var22, var23, var11, var20 + var7 & 3, var19, var8, var25); // L: 324 + class19.addObjects(var1, var29, var30, var11, var20 + var7 & 3, var19, var8, var32); // L: 337 } } } } } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(ILbb;ZI)I", + garbageValue = "16711680" + ) + static int method2030(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2892 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2893 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2894 + return 1; // L: 2895 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2897 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2898 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2899 + return 1; // L: 2900 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2902 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2903 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2904 + return 1; // L: 2905 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2907 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2908 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2909 + return 1; // L: 2910 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2912 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2913 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2914 + return 1; // L: 2915 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2917 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2918 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2919 + return 1; // L: 2920 + } else { + int var13; + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2922 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2923 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2924 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2925 + return 1; // L: 2926 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2928 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2929 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2930 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2931 + return 1; // L: 2932 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2934 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2935 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2936 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2937 + return 1; // L: 2938 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2940 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2941 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2942 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2943 + return 1; // L: 2944 + } else { + boolean var12; + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2946 + var12 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2947 + if (class120.grandExchangeEvents != null) { // L: 2948 + class120.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2949 + } + + return 1; // L: 2951 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2953 + var12 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2954 + if (class120.grandExchangeEvents != null) { // L: 2955 + class120.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2956 + } + + return 1; // L: 2958 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2960 + class12.Interpreter_intStackSize -= 2; // L: 2961 + var12 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] == 1; // L: 2962 + boolean var11 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1] == 1; // L: 2963 + if (class120.grandExchangeEvents != null) { // L: 2964 + Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2965 + class120.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2966 + } + + return 1; // L: 2968 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2970 + var12 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2971 + if (class120.grandExchangeEvents != null) { // L: 2972 + class120.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2973 + } + + return 1; // L: 2975 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2977 + var12 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2978 + if (class120.grandExchangeEvents != null) { // L: 2979 + class120.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2980 + } + + return 1; // L: 2982 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2984 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class120.grandExchangeEvents == null ? 0 : class120.grandExchangeEvents.events.size(); // L: 2985 + return 1; // L: 2986 + } else { + GrandExchangeEvent var4; + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2988 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2989 + var4 = (GrandExchangeEvent)class120.grandExchangeEvents.events.get(var3); // L: 2990 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.world; // L: 2991 + return 1; // L: 2992 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2994 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2995 + var4 = (GrandExchangeEvent)class120.grandExchangeEvents.events.get(var3); // L: 2996 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2997 + return 1; // L: 2998 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 3000 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3001 + var4 = (GrandExchangeEvent)class120.grandExchangeEvents.events.get(var3); // L: 3002 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 3003 + return 1; // L: 3004 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 3006 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3007 + var4 = (GrandExchangeEvent)class120.grandExchangeEvents.events.get(var3); // L: 3008 + long var5 = class113.method2624() - UserComparator8.field1380 - var4.age; // L: 3009 + int var7 = (int)(var5 / 3600000L); // L: 3010 + int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 3011 + int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 3012 + String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 3013 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var10; // L: 3014 + return 1; // L: 3015 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 3017 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3018 + var4 = (GrandExchangeEvent)class120.grandExchangeEvents.events.get(var3); // L: 3019 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 3020 + return 1; // L: 3021 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 3023 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3024 + var4 = (GrandExchangeEvent)class120.grandExchangeEvents.events.get(var3); // L: 3025 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 3026 + return 1; // L: 3027 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 3029 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3030 + var4 = (GrandExchangeEvent)class120.grandExchangeEvents.events.get(var3); // L: 3031 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 3032 + return 1; // L: 3033 + } else { + return 2; // L: 3035 + } + } + } + } + } + + @ObfuscatedName("hp") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-47" + ) + static final void method2031() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7873 7874 7917 + if (var0.hitpoints > 0) { // L: 7875 + --var0.hitpoints; + } + + boolean var1; + int var2; + int var3; + ObjectComposition var4; + if (var0.hitpoints == 0) { // L: 7876 + if (var0.objectId >= 0) { // L: 7878 + var2 = var0.objectId; // L: 7880 + var3 = var0.field1129; // L: 7881 + var4 = class82.getObjectDefinition(var2); // L: 7883 + if (var3 == 11) { // L: 7884 + var3 = 10; + } + + if (var3 >= 5 && var3 <= 8) { // L: 7885 + var3 = 4; + } + + var1 = var4.method3589(var3); // L: 7886 + if (!var1) { // L: 7888 + continue; + } + } + + WorldMapData_1.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field1131, var0.field1129); // L: 7890 + var0.remove(); // L: 7891 + } else { + if (var0.delay > 0) { // L: 7895 + --var0.delay; + } + + if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102) { // L: 7896 + if (var0.id >= 0) { // L: 7898 + var2 = var0.id; // L: 7900 + var3 = var0.field1126; // L: 7901 + var4 = class82.getObjectDefinition(var2); // L: 7903 + if (var3 == 11) { // L: 7904 + var3 = 10; + } + + if (var3 >= 5 && var3 <= 8) { // L: 7905 + var3 = 4; + } + + var1 = var4.method3589(var3); // L: 7906 + if (!var1) { // L: 7908 + continue; + } + } + + WorldMapData_1.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field1126); // L: 7910 + var0.delay = -1; // L: 7911 + if (var0.objectId == var0.id && var0.objectId == -1) { // L: 7912 + var0.remove(); + } else if (var0.objectId == var0.id && var0.orientation == var0.field1131 && var0.field1126 == var0.field1129) { // L: 7913 + var0.remove(); + } + } + } + } + + } // L: 7919 } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index cdd269de65..9635c6272a 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -4,150 +4,152 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mu") +@ObfuscatedName("mn") @Implements("Timer") public class Timer { - @ObfuscatedName("nf") + @ObfuscatedName("tn") @ObfuscatedGetter( - intValue = -1068147205 + intValue = 593799609 ) - @Export("selectedSpellWidget") - static int selectedSpellWidget; - @ObfuscatedName("v") - @ObfuscatedGetter( - longValue = -3244593562421258965L - ) - long field4174; - @ObfuscatedName("c") - @ObfuscatedGetter( - longValue = 1641413866718548925L - ) - long field4172; - @ObfuscatedName("i") - public boolean field4179; - @ObfuscatedName("f") - @ObfuscatedGetter( - longValue = 7215038072955031607L - ) - long field4173; - @ObfuscatedName("b") - @ObfuscatedGetter( - longValue = -4614957419067559229L - ) - long field4175; - @ObfuscatedName("n") - @ObfuscatedGetter( - longValue = -584897100758161969L - ) - long field4171; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 225650281 - ) - int field4177; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -648366881 - ) - int field4178; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -809978943 - ) - int field4176; + static int field4239; + @ObfuscatedName("fh") + @Export("worldHost") + static String worldHost; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1244988383 + longValue = 6252735517652003957L ) - int field4180; + long field4243; + @ObfuscatedName("q") + @ObfuscatedGetter( + longValue = 6672603263529714973L + ) + long field4234; + @ObfuscatedName("l") + public boolean field4235; + @ObfuscatedName("k") + @ObfuscatedGetter( + longValue = 3502493809847278955L + ) + long field4233; + @ObfuscatedName("a") + @ObfuscatedGetter( + longValue = 1482756365689687747L + ) + long field4237; + @ObfuscatedName("m") + @ObfuscatedGetter( + longValue = 6358858334505222211L + ) + long field4238; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 1223349955 + ) + int field4242; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 2005745533 + ) + int field4240; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 677343331 + ) + int field4241; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -2040849017 + ) + int field4236; public Timer() { - this.field4174 = -1L; // L: 7 - this.field4172 = -1L; // L: 8 - this.field4179 = false; // L: 9 - this.field4173 = 0L; // L: 10 - this.field4175 = 0L; // L: 11 - this.field4171 = 0L; // L: 12 - this.field4177 = 0; // L: 13 - this.field4178 = 0; // L: 14 - this.field4176 = 0; // L: 15 - this.field4180 = 0; // L: 16 + this.field4243 = -1L; // L: 7 + this.field4234 = -1L; // L: 8 + this.field4235 = false; // L: 9 + this.field4233 = 0L; // L: 10 + this.field4237 = 0L; // L: 11 + this.field4238 = 0L; // L: 12 + this.field4242 = 0; // L: 13 + this.field4240 = 0; // L: 14 + this.field4241 = 0; // L: 15 + this.field4236 = 0; // L: 16 } - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" - ) - public void method6574() { - this.field4174 = class136.method2931(); // L: 19 - } // L: 20 - - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "369845371" + garbageValue = "-1914622703" ) - public void method6562() { - if (this.field4174 != -1L) { // L: 23 - this.field4175 = class136.method2931() - this.field4174; // L: 24 - this.field4174 = -1L; // L: 25 + public void method6374() { + this.field4243 = class113.method2624(); // L: 19 + } // L: 20 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "521585779" + ) + public void method6375() { + if (-1L != this.field4243) { // L: 23 + this.field4237 = class113.method2624() - this.field4243; // L: 24 + this.field4243 = -1L; // L: 25 } } // L: 27 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-52559849" + garbageValue = "744646168" ) - public void method6563(int var1) { - this.field4172 = class136.method2931(); // L: 30 - this.field4177 = var1; // L: 31 + public void method6369(int var1) { + this.field4234 = class113.method2624(); // L: 30 + this.field4242 = var1; // L: 31 } // L: 32 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-929974829" + garbageValue = "-689161961" ) - public void method6564() { - if (this.field4172 != -1L) { // L: 35 - this.field4173 = class136.method2931() - this.field4172; // L: 36 - this.field4172 = -1L; // L: 37 + public void method6370() { + if (this.field4234 != -1L) { // L: 35 + this.field4233 = class113.method2624() - this.field4234; // L: 36 + this.field4234 = -1L; // L: 37 } - ++this.field4176; // L: 39 - this.field4179 = true; // L: 40 + ++this.field4241; // L: 39 + this.field4235 = true; // L: 40 } // L: 41 - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-127" - ) - public void method6580() { - this.field4179 = false; // L: 44 - this.field4178 = 0; // L: 45 - } // L: 46 - - @ObfuscatedName("n") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1687652356" + garbageValue = "-607387453" ) - public void method6566() { - this.method6564(); // L: 49 + public void method6371() { + this.field4235 = false; // L: 44 + this.field4240 = 0; // L: 45 + } // L: 46 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1431625813" + ) + public void method6372() { + this.method6370(); // L: 49 } // L: 50 - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-598240073" + descriptor = "(Lpx;I)V", + garbageValue = "393397012" ) @Export("write") public void write(Buffer var1) { - long var2 = this.field4175; // L: 53 + long var2 = this.field4237; // L: 53 var2 /= 10L; // L: 55 if (var2 < 0L) { // L: 56 var2 = 0L; @@ -156,7 +158,7 @@ public class Timer { } var1.writeShort((int)var2); // L: 58 - long var4 = this.field4173; // L: 60 + long var4 = this.field4233; // L: 60 var4 /= 10L; // L: 62 if (var4 < 0L) { // L: 63 var4 = 0L; @@ -165,7 +167,7 @@ public class Timer { } var1.writeShort((int)var4); // L: 65 - long var6 = this.field4171; // L: 67 + long var6 = this.field4238; // L: 67 var6 /= 10L; // L: 69 if (var6 < 0L) { // L: 70 var6 = 0L; @@ -174,9 +176,23 @@ public class Timer { } var1.writeShort((int)var6); // L: 72 - var1.writeShort(this.field4177); // L: 74 - var1.writeShort(this.field4178); // L: 75 - var1.writeShort(this.field4176); // L: 76 - var1.writeShort(this.field4180); // L: 77 + var1.writeShort(this.field4242); // L: 74 + var1.writeShort(this.field4240); // L: 75 + var1.writeShort(this.field4241); // L: 76 + var1.writeShort(this.field4236); // L: 77 } // L: 78 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Llp;Llp;Llp;Llp;I)V", + garbageValue = "-1059775601" + ) + public static void method6381(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { + class134.Widget_archive = var0; // L: 220 + class162.Widget_modelsArchive = var1; // L: 221 + WorldMapCacheName.Widget_spritesArchive = var2; // L: 222 + class93.Widget_fontsArchive = var3; // L: 223 + NetSocket.Widget_interfaceComponents = new Widget[class134.Widget_archive.getGroupCount()][]; // L: 224 + class120.Widget_loadedInterfaces = new boolean[class134.Widget_archive.getGroupCount()]; // L: 225 + } // L: 226 } diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index 01fb93dd83..b144b75fa7 100644 --- a/runescape-client/src/main/java/TriBool.java +++ b/runescape-client/src/main/java/TriBool.java @@ -4,33 +4,32 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ni") +@ObfuscatedName("nq") @Implements("TriBool") public class TriBool { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnq;" ) @Export("TriBool_unknown") public static final TriBool TriBool_unknown; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnq;" ) @Export("TriBool_true") public static final TriBool TriBool_true; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnq;" ) @Export("TriBool_false") public static final TriBool TriBool_false; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 355454995 + intValue = 1003527319 ) - @Export("gameCyclesToDo") - static int gameCyclesToDo; + static int field4339; static { TriBool_unknown = new TriBool(); // L: 4 @@ -41,38 +40,17 @@ public class TriBool { TriBool() { } // L: 8 - @ObfuscatedName("v") + @ObfuscatedName("la") @ObfuscatedSignature( - descriptor = "(IB)Lfc;", - garbageValue = "-12" + descriptor = "(Lki;B)Ljava/lang/String;", + garbageValue = "-92" ) - public static VarcInt method6839(int var0) { - VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); // L: 17 - if (var1 != null) { // L: 18 - return var1; + @Export("Widget_getSpellActionName") + static String Widget_getSpellActionName(Widget var0) { + if (WorldMapSection1.Widget_unpackTargetMask(UrlRequester.getWidgetFlags(var0)) == 0) { // L: 12521 + return null; } else { - byte[] var2 = class384.VarcInt_archive.takeFile(19, var0); // L: 19 - var1 = new VarcInt(); // L: 20 - if (var2 != null) { // L: 21 - var1.method3414(new Buffer(var2)); - } - - VarcInt.VarcInt_cached.put(var1, (long)var0); // L: 22 - return var1; // L: 23 + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 12522 12523 12525 } } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(II)Ldf;", - garbageValue = "-468677079" - ) - static class118 method6838(int var0) { - class118 var1 = (class118)MusicPatchPcmStream.findEnumerated(class18.method258(), var0); // L: 35 - if (var1 == null) { - var1 = class118.field1433; // L: 36 - } - - return var1; // L: 37 - } } diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index f34c01e398..945680c65a 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -4,97 +4,55 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cw") +@ObfuscatedName("cb") @Implements("UrlRequest") public class UrlRequest { - @ObfuscatedName("v") + @ObfuscatedName("ef") + @ObfuscatedSignature( + descriptor = "Lle;" + ) + @Export("archive11") + static Archive archive11; + @ObfuscatedName("o") @Export("url") final URL url; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("isDone0") volatile boolean isDone0; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("response0") volatile byte[] response0; UrlRequest(URL var1) { - this.url = var1; // L: 114 - } // L: 115 + this.url = var1; // L: 115 + } // L: 116 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "16" + descriptor = "(I)Z", + garbageValue = "1235200526" ) @Export("isDone") public boolean isDone() { - return this.isDone0; // L: 118 + return this.isDone0; // L: 119 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "1979081265" + garbageValue = "-1622605923" ) @Export("getResponse") public byte[] getResponse() { - return this.response0; // L: 122 + return this.response0; // L: 123 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)Ljava/lang/String;", - garbageValue = "1" + garbageValue = "28" ) - public String method2554() { - return this.url.toString(); // L: 126 + public String method2556() { + return this.url.toString(); // L: 127 } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1489870449" - ) - public static void method2564() { - class54.reflectionChecks = new IterableNodeDeque(); // L: 24 - } // L: 25 - - @ObfuscatedName("ks") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "232574947" - ) - static void method2551(int var0, int var1) { - MenuAction var2 = Interpreter.tempMenuAction; // L: 11865 - if (var2 != null) { // L: 11867 - class9.menuAction(var2.param0, var2.param1, var2.opcode, var2.identifier, var2.action, var2.action, var0, var1); // L: 11868 - } - - Interpreter.tempMenuAction = null; // L: 11871 - } // L: 11872 - - @ObfuscatedName("mr") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "1100" - ) - static void method2560() { - if (Client.field759 && GrandExchangeEvents.localPlayer != null) { // L: 12618 - int var0 = GrandExchangeEvents.localPlayer.pathX[0]; // L: 12619 - int var1 = GrandExchangeEvents.localPlayer.pathY[0]; // L: 12620 - if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { // L: 12621 - return; - } - - class10.oculusOrbFocalPointX = GrandExchangeEvents.localPlayer.x; // L: 12622 - int var2 = WorldMapLabel.getTileHeight(GrandExchangeEvents.localPlayer.x, GrandExchangeEvents.localPlayer.y, class18.Client_plane) - Client.camFollowHeight; // L: 12623 - if (var2 < Decimator.field397) { // L: 12624 - Decimator.field397 = var2; - } - - ClientPacket.oculusOrbFocalPointY = GrandExchangeEvents.localPlayer.y; // L: 12625 - Client.field759 = false; // L: 12626 - } - - } // L: 12628 } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index 6a317f0e4b..f035f076cb 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -9,16 +9,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ck") +@ObfuscatedName("ce") @Implements("UrlRequester") public abstract class UrlRequester implements Runnable { - @ObfuscatedName("v") + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lqd;" + ) + static IndexedSprite field1354; + @ObfuscatedName("o") @Export("thread") final Thread thread; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("isClosed") volatile boolean isClosed; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("requests") Queue requests; @@ -29,149 +34,743 @@ public abstract class UrlRequester implements Runnable { this.thread.start(); // L: 21 } // L: 22 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lcw;I)V", - garbageValue = "1977687936" + descriptor = "(Lcb;I)V", + garbageValue = "717056983" ) - abstract void vmethod2546(UrlRequest var1) throws IOException; + abstract void vmethod2544(UrlRequest var1) throws IOException; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(Ljava/net/URLConnection;B)V", - garbageValue = "28" + garbageValue = "-70" ) void method2517(URLConnection var1) { - var1.setConnectTimeout(5000); // L: 49 - var1.setReadTimeout(5000); // L: 50 - var1.setUseCaches(false); // L: 51 - var1.setRequestProperty("Connection", "close"); // L: 52 - } // L: 53 + var1.setConnectTimeout(5000); // L: 50 + var1.setReadTimeout(5000); // L: 51 + var1.setUseCaches(false); // L: 52 + var1.setRequestProperty("Connection", "close"); // L: 53 + } // L: 54 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/net/URLConnection;Lcw;B)V", - garbageValue = "4" + descriptor = "(Ljava/net/URLConnection;Lcb;B)V", + garbageValue = "97" ) void method2518(URLConnection var1, UrlRequest var2) { - DataInputStream var3 = null; // L: 56 + DataInputStream var3 = null; // L: 57 try { - int var5 = var1.getContentLength(); // L: 59 - var3 = new DataInputStream(var1.getInputStream()); // L: 60 + int var5 = var1.getContentLength(); + var3 = new DataInputStream(var1.getInputStream()); byte[] var4; - if (var5 >= 0) { // L: 61 - var4 = new byte[var5]; // L: 62 - var3.readFully(var4); // L: 63 + if (var5 >= 0) { + var4 = new byte[var5]; + var3.readFully(var4); } else { - var4 = new byte[0]; // L: 66 - byte[] var6 = ArchiveDiskActionHandler.ByteArrayPool_getArray(5000); // L: 67 + var4 = new byte[0]; // L: 67 + byte[] var6 = class116.ByteArrayPool_getArray(5000); // L: 68 byte[] var8; - for (int var7 = var3.read(var6, 0, var6.length); var7 > -1; var4 = var8) { // L: 68 69 73 - var8 = new byte[var4.length + var7]; // L: 70 - System.arraycopy(var4, 0, var8, 0, var4.length); // L: 71 - System.arraycopy(var6, 0, var8, var4.length, var7); // L: 72 + for (int var7 = var3.read(var6, 0, var6.length); var7 > -1; var4 = var8) { // L: 69 70 74 + var8 = new byte[var4.length + var7]; // L: 71 + System.arraycopy(var4, 0, var8, 0, var4.length); // L: 72 + System.arraycopy(var6, 0, var8, var4.length, var7); // L: 73 } - UserComparator10.ByteArrayPool_release(var6); // L: 75 + class168.ByteArrayPool_release(var6); // L: 76 } - var2.response0 = var4; // L: 77 - } catch (IOException var10) { // L: 79 + var2.response0 = var4; // L: 78 + } catch (IOException var10) { // L: 80 } - if (var3 != null) { // L: 80 + if (var3 != null) { // L: 81 try { - var3.close(); // L: 82 - } catch (IOException var9) { // L: 84 + var3.close(); // L: 83 + } catch (IOException var9) { // L: 85 } } - } // L: 86 + } // L: 87 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;B)Lcw;", - garbageValue = "30" + descriptor = "(Ljava/net/URL;I)Lcb;", + garbageValue = "-1608503592" ) @Export("request") public UrlRequest request(URL var1) { - UrlRequest var2 = new UrlRequest(var1); // L: 89 - synchronized(this) { // L: 90 - this.requests.add(var2); // L: 91 - this.notify(); // L: 92 - return var2; // L: 94 + UrlRequest var2 = new UrlRequest(var1); // L: 90 + synchronized(this) { // L: 91 + this.requests.add(var2); // L: 92 + this.notify(); // L: 93 + return var2; // L: 95 } } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "73" + descriptor = "(I)V", + garbageValue = "382803574" ) @Export("close") public void close() { - this.isClosed = true; // L: 98 + this.isClosed = true; // L: 99 try { - synchronized(this) { // L: 100 - this.notify(); // L: 101 - } // L: 102 + synchronized(this) { // L: 101 + this.notify(); // L: 102 + } // L: 103 - this.thread.join(); // L: 103 - } catch (InterruptedException var4) { // L: 105 + this.thread.join(); // L: 104 + } catch (InterruptedException var4) { // L: 106 } - } // L: 106 + } // L: 107 public void run() { - while (!this.isClosed) { // L: 25 + while (!this.isClosed) { // L: 26 try { UrlRequest var1; - synchronized(this) { // L: 28 - var1 = (UrlRequest)this.requests.poll(); // L: 29 - if (var1 == null) { // L: 30 + synchronized(this) { // L: 29 + var1 = (UrlRequest)this.requests.poll(); // L: 30 + if (var1 == null) { // L: 31 try { - this.wait(); // L: 32 - } catch (InterruptedException var5) { // L: 34 + this.wait(); // L: 33 + } catch (InterruptedException var5) { } continue; } } - this.vmethod2546(var1); // L: 38 - } catch (Exception var7) { // L: 40 - Widget.RunException_sendStackTrace((String)null, var7); // L: 41 + this.vmethod2544(var1); // L: 39 + } catch (Exception var7) { // L: 41 + ArchiveDiskActionHandler.RunException_sendStackTrace((String)null, var7); // L: 42 } } - } // L: 44 + } // L: 45 - @ObfuscatedName("ik") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1814729991" + descriptor = "([BB)[B", + garbageValue = "21" ) - static final void method2537(int var0, int var1) { - if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { // L: 8618 - if (Client.showMouseOverText) { // L: 8619 - int var2 = GameBuild.method5773(); // L: 8620 - String var3; - if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { // L: 8622 - var3 = "Use" + " " + Client.selectedItemName + " " + "->"; - } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { // L: 8623 - var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->"; - } else { - var3 = AbstractUserComparator.method6736(var2); // L: 8624 - } + static byte[] method2537(byte[] var0) { + int var1 = var0.length; // L: 35 + byte[] var2 = new byte[var1]; // L: 36 + System.arraycopy(var0, 0, var2, 0, var1); // L: 37 + return var2; // L: 38 + } - if (Client.menuOptionsCount > 2) { // L: 8625 - var3 = var3 + UserComparator9.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; - } + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "44420485" + ) + public static void method2538(int var0) { + class273.musicPlayerStatus = 1; // L: 58 + ClanChannelMember.musicTrackArchive = null; // L: 59 + StructComposition.musicTrackGroupId = -1; // L: 60 + FriendsList.musicTrackFileId = -1; // L: 61 + Clock.musicTrackVolume = 0; // L: 62 + VertexNormal.musicTrackBoolean = false; // L: 63 + GrandExchangeEvent.pcmSampleLength = var0; // L: 64 + } // L: 65 - RouteStrategy.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); // L: 8626 + @ObfuscatedName("gy") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-127" + ) + @Export("doCheat") + static final void doCheat(String var0) { + if (var0.equalsIgnoreCase("toggleroof")) { // L: 3894 + class12.clientPreferences.method2219(!class12.clientPreferences.method2222()); // L: 3895 + if (class12.clientPreferences.method2222()) { // L: 3896 + WorldMapEvent.addGameMessage(99, "", "Roofs are now all hidden"); // L: 3897 + } else { + WorldMapEvent.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 3900 } } - } // L: 8627 + + if (var0.equalsIgnoreCase("displayfps")) { // L: 3903 + class12.clientPreferences.method2228(); + } + + if (var0.equalsIgnoreCase("renderself")) { // L: 3904 + Client.renderSelf = !Client.renderSelf; + } + + if (var0.equalsIgnoreCase("mouseovertext")) { + Client.showMouseOverText = !Client.showMouseOverText; // L: 3905 + } + + if (Client.staffModLevel >= 2) { // L: 3906 + if (var0.equalsIgnoreCase("errortest")) { // L: 3907 + throw new RuntimeException(); + } + + if (var0.equalsIgnoreCase("showcoord")) { // L: 3908 + ServerPacket.worldMap.showCoord = !ServerPacket.worldMap.showCoord; + } + + if (var0.equalsIgnoreCase("fpson")) { // L: 3909 + class12.clientPreferences.method2227(true); + } + + if (var0.equalsIgnoreCase("fpsoff")) { // L: 3910 + class12.clientPreferences.method2227(false); + } + + if (var0.equalsIgnoreCase("gc")) { // L: 3911 + System.gc(); + } + + if (var0.equalsIgnoreCase("clientdrop")) { // L: 3912 + class129.method2812(); + } + } + + PacketBufferNode var1 = WallDecoration.getPacketBufferNode(ClientPacket.field2988, Client.packetWriter.isaacCipher); // L: 3915 + var1.packetBuffer.writeByte(var0.length() + 1); // L: 3916 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 3917 + Client.packetWriter.addNode(var1); // L: 3918 + } // L: 3919 + + @ObfuscatedName("hd") + @ObfuscatedSignature( + descriptor = "(Lci;B)V", + garbageValue = "-115" + ) + static final void method2536(PendingSpawn var0) { + long var1 = 0L; // L: 7853 + int var3 = -1; // L: 7854 + int var4 = 0; // L: 7855 + int var5 = 0; // L: 7856 + if (var0.type == 0) { // L: 7857 + var1 = class175.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 1) { // L: 7858 + var1 = class175.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 2) { // L: 7859 + var1 = class175.scene.getGameObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 3) { + var1 = class175.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); // L: 7860 + } + + if (0L != var1) { // L: 7861 + int var6 = class175.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 7862 + var3 = NetSocket.Entity_unpackID(var1); // L: 7863 + var4 = var6 & 31; // L: 7864 + var5 = var6 >> 6 & 3; // L: 7865 + } + + var0.objectId = var3; // L: 7867 + var0.field1129 = var4; // L: 7868 + var0.field1131 = var5; // L: 7869 + } // L: 7870 + + @ObfuscatedName("hn") + @ObfuscatedSignature( + descriptor = "(Lca;IILgd;I)V", + garbageValue = "-1504276994" + ) + static final void method2540(Player var0, int var1, int var2, class193 var3) { + int var4 = var0.pathX[0]; // L: 8321 + int var5 = var0.pathY[0]; // L: 8322 + int var6 = var0.transformedSize(); // L: 8323 + if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { // L: 8324 + if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { // L: 8325 + int var8 = var0.transformedSize(); // L: 8327 + RouteStrategy var9 = class65.method1879(var1, var2); // L: 8328 + CollisionMap var10 = Client.collisionMaps[var0.plane]; // L: 8329 + int[] var11 = Client.field772; // L: 8330 + int[] var12 = Client.field773; // L: 8331 + + int var13; + int var14; + for (var13 = 0; var13 < 128; ++var13) { // L: 8333 + for (var14 = 0; var14 < 128; ++var14) { // L: 8334 + class194.directions[var13][var14] = 0; // L: 8335 + class194.distances[var13][var14] = 99999999; // L: 8336 + } + } + + int var15; + int var16; + byte var18; + int var19; + int var20; + int var22; + int var24; + int var25; + int var26; + int var27; + boolean var33; + int var35; + int var36; + int var38; + if (var8 == 1) { // L: 8340 + var33 = AbstractWorldMapIcon.method4863(var4, var5, var9, var10); + } else { + byte var17; + byte var21; + int[][] var23; + boolean var34; + if (var8 == 2) { // L: 8341 + var15 = var4; // L: 8344 + var16 = var5; // L: 8345 + var17 = 64; // L: 8346 + var18 = 64; // L: 8347 + var19 = var4 - var17; // L: 8348 + var20 = var5 - var18; // L: 8349 + class194.directions[var17][var18] = 99; // L: 8350 + class194.distances[var17][var18] = 0; // L: 8351 + var21 = 0; // L: 8352 + var22 = 0; // L: 8353 + class194.bufferX[var21] = var4; // L: 8354 + var38 = var21 + 1; + class194.bufferY[var21] = var5; // L: 8355 + var23 = var10.flags; // L: 8356 + + while (true) { + if (var38 == var22) { // L: 8357 + Varps.field3348 = var15; // L: 8457 + class194.field2255 = var16; // L: 8458 + var34 = false; // L: 8459 + break; + } + + var15 = class194.bufferX[var22]; // L: 8358 + var16 = class194.bufferY[var22]; // L: 8359 + var22 = var22 + 1 & 4095; // L: 8360 + var35 = var15 - var19; // L: 8361 + var36 = var16 - var20; // L: 8362 + var24 = var15 - var10.xInset; // L: 8363 + var25 = var16 - var10.yInset; // L: 8364 + if (var9.hasArrived(2, var15, var16, var10)) { // L: 8365 + Varps.field3348 = var15; // L: 8366 + class194.field2255 = var16; // L: 8367 + var34 = true; // L: 8368 + break; + } + + var26 = class194.distances[var35][var36] + 1; // L: 8371 + if (var35 > 0 && class194.directions[var35 - 1][var36] == 0 && (var23[var24 - 1][var25] & 19136782) == 0 && (var23[var24 - 1][var25 + 1] & 19136824) == 0) { // L: 8372 8373 8374 8375 + class194.bufferX[var38] = var15 - 1; // L: 8376 + class194.bufferY[var38] = var16; // L: 8377 + var38 = var38 + 1 & 4095; // L: 8378 + class194.directions[var35 - 1][var36] = 2; // L: 8379 + class194.distances[var35 - 1][var36] = var26; // L: 8380 + } + + if (var35 < 126 && class194.directions[var35 + 1][var36] == 0 && (var23[var24 + 2][var25] & 19136899) == 0 && (var23[var24 + 2][var25 + 1] & 19136992) == 0) { // L: 8382 8383 8384 8385 + class194.bufferX[var38] = var15 + 1; // L: 8386 + class194.bufferY[var38] = var16; // L: 8387 + var38 = var38 + 1 & 4095; // L: 8388 + class194.directions[var35 + 1][var36] = 8; // L: 8389 + class194.distances[var35 + 1][var36] = var26; // L: 8390 + } + + if (var36 > 0 && class194.directions[var35][var36 - 1] == 0 && (var23[var24][var25 - 1] & 19136782) == 0 && (var23[var24 + 1][var25 - 1] & 19136899) == 0) { // L: 8392 8393 8394 8395 + class194.bufferX[var38] = var15; // L: 8396 + class194.bufferY[var38] = var16 - 1; // L: 8397 + var38 = var38 + 1 & 4095; // L: 8398 + class194.directions[var35][var36 - 1] = 1; // L: 8399 + class194.distances[var35][var36 - 1] = var26; // L: 8400 + } + + if (var36 < 126 && class194.directions[var35][var36 + 1] == 0 && (var23[var24][var25 + 2] & 19136824) == 0 && (var23[var24 + 1][var25 + 2] & 19136992) == 0) { // L: 8402 8403 8404 8405 + class194.bufferX[var38] = var15; // L: 8406 + class194.bufferY[var38] = var16 + 1; // L: 8407 + var38 = var38 + 1 & 4095; // L: 8408 + class194.directions[var35][var36 + 1] = 4; // L: 8409 + class194.distances[var35][var36 + 1] = var26; // L: 8410 + } + + if (var35 > 0 && var36 > 0 && class194.directions[var35 - 1][var36 - 1] == 0 && (var23[var24 - 1][var25] & 19136830) == 0 && (var23[var24 - 1][var25 - 1] & 19136782) == 0 && (var23[var24][var25 - 1] & 19136911) == 0) { // L: 8412 8413 8414 8415 8416 + class194.bufferX[var38] = var15 - 1; // L: 8417 + class194.bufferY[var38] = var16 - 1; // L: 8418 + var38 = var38 + 1 & 4095; // L: 8419 + class194.directions[var35 - 1][var36 - 1] = 3; // L: 8420 + class194.distances[var35 - 1][var36 - 1] = var26; // L: 8421 + } + + if (var35 < 126 && var36 > 0 && class194.directions[var35 + 1][var36 - 1] == 0 && (var23[var24 + 1][var25 - 1] & 19136911) == 0 && (var23[var24 + 2][var25 - 1] & 19136899) == 0 && (var23[var24 + 2][var25] & 19136995) == 0) { // L: 8423 8424 8425 8426 8427 + class194.bufferX[var38] = var15 + 1; // L: 8428 + class194.bufferY[var38] = var16 - 1; // L: 8429 + var38 = var38 + 1 & 4095; // L: 8430 + class194.directions[var35 + 1][var36 - 1] = 9; // L: 8431 + class194.distances[var35 + 1][var36 - 1] = var26; // L: 8432 + } + + if (var35 > 0 && var36 < 126 && class194.directions[var35 - 1][var36 + 1] == 0 && (var23[var24 - 1][var25 + 1] & 19136830) == 0 && (var23[var24 - 1][var25 + 2] & 19136824) == 0 && (var23[var24][var25 + 2] & 19137016) == 0) { // L: 8434 8435 8436 8437 8438 + class194.bufferX[var38] = var15 - 1; // L: 8439 + class194.bufferY[var38] = var16 + 1; // L: 8440 + var38 = var38 + 1 & 4095; // L: 8441 + class194.directions[var35 - 1][var36 + 1] = 6; // L: 8442 + class194.distances[var35 - 1][var36 + 1] = var26; // L: 8443 + } + + if (var35 < 126 && var36 < 126 && class194.directions[var35 + 1][var36 + 1] == 0 && (var23[var24 + 1][var25 + 2] & 19137016) == 0 && (var23[var24 + 2][var25 + 2] & 19136992) == 0 && (var23[var24 + 2][var25 + 1] & 19136995) == 0) { // L: 8445 8446 8447 8448 8449 + class194.bufferX[var38] = var15 + 1; // L: 8450 + class194.bufferY[var38] = var16 + 1; // L: 8451 + var38 = var38 + 1 & 4095; // L: 8452 + class194.directions[var35 + 1][var36 + 1] = 12; // L: 8453 + class194.distances[var35 + 1][var36 + 1] = var26; // L: 8454 + } + } + + var33 = var34; // L: 8461 + } else { + var15 = var4; // L: 8466 + var16 = var5; // L: 8467 + var17 = 64; // L: 8468 + var18 = 64; // L: 8469 + var19 = var4 - var17; // L: 8470 + var20 = var5 - var18; // L: 8471 + class194.directions[var17][var18] = 99; // L: 8472 + class194.distances[var17][var18] = 0; // L: 8473 + var21 = 0; // L: 8474 + var22 = 0; // L: 8475 + class194.bufferX[var21] = var4; // L: 8476 + var38 = var21 + 1; + class194.bufferY[var21] = var5; // L: 8477 + var23 = var10.flags; // L: 8478 + + label670: + while (true) { + label668: + while (true) { + do { + do { + do { + label645: + do { + if (var38 == var22) { // L: 8479 + Varps.field3348 = var15; // L: 8599 + class194.field2255 = var16; // L: 8600 + var34 = false; // L: 8601 + break label670; + } + + var15 = class194.bufferX[var22]; // L: 8480 + var16 = class194.bufferY[var22]; // L: 8481 + var22 = var22 + 1 & 4095; // L: 8482 + var35 = var15 - var19; // L: 8483 + var36 = var16 - var20; // L: 8484 + var24 = var15 - var10.xInset; // L: 8485 + var25 = var16 - var10.yInset; // L: 8486 + if (var9.hasArrived(var8, var15, var16, var10)) { // L: 8487 + Varps.field3348 = var15; // L: 8488 + class194.field2255 = var16; // L: 8489 + var34 = true; // L: 8490 + break label670; + } + + var26 = class194.distances[var35][var36] + 1; // L: 8493 + if (var35 > 0 && class194.directions[var35 - 1][var36] == 0 && (var23[var24 - 1][var25] & 19136782) == 0 && (var23[var24 - 1][var25 + var8 - 1] & 19136824) == 0) { // L: 8494 8495 8496 8497 + var27 = 1; + + while (true) { + if (var27 >= var8 - 1) { + class194.bufferX[var38] = var15 - 1; // L: 8501 + class194.bufferY[var38] = var16; // L: 8502 + var38 = var38 + 1 & 4095; // L: 8503 + class194.directions[var35 - 1][var36] = 2; // L: 8504 + class194.distances[var35 - 1][var36] = var26; // L: 8505 + break; + } + + if ((var23[var24 - 1][var27 + var25] & 19136830) != 0) { // L: 8499 + break; + } + + ++var27; // L: 8498 + } + } + + if (var35 < 128 - var8 && class194.directions[var35 + 1][var36] == 0 && (var23[var24 + var8][var25] & 19136899) == 0 && (var23[var8 + var24][var8 + var25 - 1] & 19136992) == 0) { // L: 8507 8508 8509 8510 + var27 = 1; + + while (true) { + if (var27 >= var8 - 1) { + class194.bufferX[var38] = var15 + 1; // L: 8514 + class194.bufferY[var38] = var16; // L: 8515 + var38 = var38 + 1 & 4095; // L: 8516 + class194.directions[var35 + 1][var36] = 8; // L: 8517 + class194.distances[var35 + 1][var36] = var26; // L: 8518 + break; + } + + if ((var23[var24 + var8][var25 + var27] & 19136995) != 0) { // L: 8512 + break; + } + + ++var27; // L: 8511 + } + } + + if (var36 > 0 && class194.directions[var35][var36 - 1] == 0 && (var23[var24][var25 - 1] & 19136782) == 0 && (var23[var24 + var8 - 1][var25 - 1] & 19136899) == 0) { // L: 8520 8521 8522 8523 + var27 = 1; + + while (true) { + if (var27 >= var8 - 1) { + class194.bufferX[var38] = var15; // L: 8527 + class194.bufferY[var38] = var16 - 1; // L: 8528 + var38 = var38 + 1 & 4095; // L: 8529 + class194.directions[var35][var36 - 1] = 1; // L: 8530 + class194.distances[var35][var36 - 1] = var26; // L: 8531 + break; + } + + if ((var23[var27 + var24][var25 - 1] & 19136911) != 0) { // L: 8525 + break; + } + + ++var27; // L: 8524 + } + } + + if (var36 < 128 - var8 && class194.directions[var35][var36 + 1] == 0 && (var23[var24][var8 + var25] & 19136824) == 0 && (var23[var24 + var8 - 1][var25 + var8] & 19136992) == 0) { // L: 8533 8534 8535 8536 + var27 = 1; + + while (true) { + if (var27 >= var8 - 1) { + class194.bufferX[var38] = var15; // L: 8540 + class194.bufferY[var38] = var16 + 1; // L: 8541 + var38 = var38 + 1 & 4095; // L: 8542 + class194.directions[var35][var36 + 1] = 4; // L: 8543 + class194.distances[var35][var36 + 1] = var26; // L: 8544 + break; + } + + if ((var23[var27 + var24][var8 + var25] & 19137016) != 0) { // L: 8538 + break; + } + + ++var27; // L: 8537 + } + } + + if (var35 > 0 && var36 > 0 && class194.directions[var35 - 1][var36 - 1] == 0 && (var23[var24 - 1][var25 - 1] & 19136782) == 0) { // L: 8546 8547 8548 + var27 = 1; + + while (true) { + if (var27 >= var8) { + class194.bufferX[var38] = var15 - 1; // L: 8553 + class194.bufferY[var38] = var16 - 1; // L: 8554 + var38 = var38 + 1 & 4095; // L: 8555 + class194.directions[var35 - 1][var36 - 1] = 3; // L: 8556 + class194.distances[var35 - 1][var36 - 1] = var26; // L: 8557 + break; + } + + if ((var23[var24 - 1][var27 + (var25 - 1)] & 19136830) != 0 || (var23[var27 + (var24 - 1)][var25 - 1] & 19136911) != 0) { // L: 8550 8551 + break; + } + + ++var27; // L: 8549 + } + } + + if (var35 < 128 - var8 && var36 > 0 && class194.directions[var35 + 1][var36 - 1] == 0 && (var23[var24 + var8][var25 - 1] & 19136899) == 0) { // L: 8559 8560 8561 + var27 = 1; + + while (true) { + if (var27 >= var8) { + class194.bufferX[var38] = var15 + 1; // L: 8566 + class194.bufferY[var38] = var16 - 1; // L: 8567 + var38 = var38 + 1 & 4095; // L: 8568 + class194.directions[var35 + 1][var36 - 1] = 9; // L: 8569 + class194.distances[var35 + 1][var36 - 1] = var26; // L: 8570 + break; + } + + if ((var23[var8 + var24][var27 + (var25 - 1)] & 19136995) != 0 || (var23[var27 + var24][var25 - 1] & 19136911) != 0) { // L: 8563 8564 + break; + } + + ++var27; // L: 8562 + } + } + + if (var35 > 0 && var36 < 128 - var8 && class194.directions[var35 - 1][var36 + 1] == 0 && (var23[var24 - 1][var25 + var8] & 19136824) == 0) { // L: 8572 8573 8574 + for (var27 = 1; var27 < var8; ++var27) { // L: 8575 + if ((var23[var24 - 1][var25 + var27] & 19136830) != 0 || (var23[var27 + (var24 - 1)][var8 + var25] & 19137016) != 0) { // L: 8576 8577 + continue label645; + } + } + + class194.bufferX[var38] = var15 - 1; // L: 8579 + class194.bufferY[var38] = var16 + 1; // L: 8580 + var38 = var38 + 1 & 4095; // L: 8581 + class194.directions[var35 - 1][var36 + 1] = 6; // L: 8582 + class194.distances[var35 - 1][var36 + 1] = var26; // L: 8583 + } + } while(var35 >= 128 - var8); // L: 8585 + } while(var36 >= 128 - var8); + } while(class194.directions[var35 + 1][var36 + 1] != 0); // L: 8586 + } while((var23[var24 + var8][var25 + var8] & 19136992) != 0); // L: 8587 + + for (var27 = 1; var27 < var8; ++var27) { // L: 8588 + if ((var23[var27 + var24][var8 + var25] & 19137016) != 0 || (var23[var24 + var8][var25 + var27] & 19136995) != 0) { // L: 8589 8590 + continue label668; + } + } + + class194.bufferX[var38] = var15 + 1; // L: 8592 + class194.bufferY[var38] = var16 + 1; // L: 8593 + var38 = var38 + 1 & 4095; // L: 8594 + class194.directions[var35 + 1][var36 + 1] = 12; // L: 8595 + class194.distances[var35 + 1][var36 + 1] = var26; // L: 8596 + } + } + + var33 = var34; // L: 8603 + } + } + + int var7; + label718: { + var14 = var4 - 64; // L: 8605 + var15 = var5 - 64; // L: 8606 + var16 = Varps.field3348; // L: 8607 + var35 = class194.field2255; // L: 8608 + if (!var33) { // L: 8609 + var36 = Integer.MAX_VALUE; // L: 8611 + var19 = Integer.MAX_VALUE; // L: 8612 + byte var37 = 10; // L: 8613 + var38 = var9.approxDestinationX; // L: 8614 + var22 = var9.approxDestinationY; // L: 8615 + int var32 = var9.approxDestinationSizeX; // L: 8616 + var24 = var9.approxDestinationSizeY; // L: 8617 + + for (var25 = var38 - var37; var25 <= var38 + var37; ++var25) { // L: 8618 + for (var26 = var22 - var37; var26 <= var22 + var37; ++var26) { // L: 8619 + var27 = var25 - var14; // L: 8620 + int var28 = var26 - var15; // L: 8621 + if (var27 >= 0 && var28 >= 0 && var27 < 128 && var28 < 128 && class194.distances[var27][var28] < 100) { // L: 8622 8623 + int var29 = 0; // L: 8624 + if (var25 < var38) { // L: 8625 + var29 = var38 - var25; + } else if (var25 > var38 + var32 - 1) { // L: 8626 + var29 = var25 - (var32 + var38 - 1); + } + + int var30 = 0; // L: 8627 + if (var26 < var22) { // L: 8628 + var30 = var22 - var26; + } else if (var26 > var22 + var24 - 1) { // L: 8629 + var30 = var26 - (var22 + var24 - 1); + } + + int var31 = var29 * var29 + var30 * var30; // L: 8630 + if (var31 < var36 || var36 == var31 && class194.distances[var27][var28] < var19) { // L: 8631 + var36 = var31; // L: 8632 + var19 = class194.distances[var27][var28]; // L: 8633 + var16 = var25; // L: 8634 + var35 = var26; // L: 8635 + } + } + } + } + + if (var36 == Integer.MAX_VALUE) { // L: 8641 + var7 = -1; // L: 8642 + break label718; + } + } + + if (var4 == var16 && var35 == var5) { // L: 8651 + var11[0] = var16; // L: 8652 + var12[0] = var35; // L: 8653 + var7 = 0; // L: 8654 + } else { + var18 = 0; // L: 8657 + class194.bufferX[var18] = var16; // L: 8660 + var36 = var18 + 1; + class194.bufferY[var18] = var35; // L: 8661 + + for (var19 = var20 = class194.directions[var16 - var14][var35 - var15]; var4 != var16 || var5 != var35; var19 = class194.directions[var16 - var14][var35 - var15]) { // L: 8662 8663 8673 + if (var19 != var20) { // L: 8664 + var20 = var19; // L: 8665 + class194.bufferX[var36] = var16; // L: 8666 + class194.bufferY[var36++] = var35; // L: 8667 + } + + if ((var19 & 2) != 0) { // L: 8669 + ++var16; + } else if ((var19 & 8) != 0) { // L: 8670 + --var16; + } + + if ((var19 & 1) != 0) { // L: 8671 + ++var35; + } else if ((var19 & 4) != 0) { // L: 8672 + --var35; + } + } + + var38 = 0; // L: 8675 + + while (var36-- > 0) { // L: 8676 + var11[var38] = class194.bufferX[var36]; // L: 8677 + var12[var38++] = class194.bufferY[var36]; // L: 8678 + if (var38 >= var11.length) { // L: 8679 + break; + } + } + + var7 = var38; // L: 8681 + } + } + + var13 = var7; // L: 8683 + if (var7 >= 1) { // L: 8684 + for (var14 = 0; var14 < var13 - 1; ++var14) { // L: 8685 + var0.method2119(Client.field772[var14], Client.field773[var14], var3); + } + + } + } + } + } // L: 8686 + + @ObfuscatedName("id") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "16711680" + ) + static final boolean method2539(int var0) { + if (var0 < 0) { // L: 8901 + return false; + } else { + int var1 = Client.menuOpcodes[var0]; // L: 8902 + if (var1 >= 2000) { // L: 8903 + var1 -= 2000; + } + + return var1 == 1007; // L: 8904 + } + } + + @ObfuscatedName("lc") + @ObfuscatedSignature( + descriptor = "(Lki;B)I", + garbageValue = "58" + ) + @Export("getWidgetFlags") + static int getWidgetFlags(Widget var0) { + IntegerNode var1 = (IntegerNode)Client.widgetFlags.get((long)var0.childIndex + ((long)var0.id << 32)); // L: 12503 + return var1 != null ? var1.integer : var0.flags; // L: 12504 12505 + } } diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index 460e7edb5c..1c7ac15ce4 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -1,20 +1,26 @@ import 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("nn") +@ObfuscatedName("nb") @Implements("User") public class User implements Comparable { - @ObfuscatedName("i") + @ObfuscatedName("fo") + @ObfuscatedGetter( + intValue = 1414295177 + ) + static int field4323; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lqb;" + descriptor = "Lqv;" ) @Export("username") Username username; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lqb;" + descriptor = "Lqv;" ) @Export("previousUsername") Username previousUsername; @@ -22,72 +28,217 @@ public class User implements Comparable { User() { } // L: 9 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lnn;I)I", - garbageValue = "842367957" + descriptor = "(Lnb;I)I", + garbageValue = "434999779" ) @Export("compareTo_user") public int compareTo_user(User var1) { - return this.username.compareToTyped(var1.username); // L: 32 + return this.username.compareToTyped(var1.username); } - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(B)Lqb;", - garbageValue = "0" + descriptor = "(B)Lqv;", + garbageValue = "32" ) @Export("getUsername") public Username getUsername() { return this.username; // L: 12 } - @ObfuscatedName("h") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-348962548" + garbageValue = "-2016669072" ) @Export("getName") public String getName() { return this.username == null ? "" : this.username.getName(); // L: 16 17 } - @ObfuscatedName("ae") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1206801353" + garbageValue = "-1824467120" ) @Export("getPreviousName") public String getPreviousName() { - return this.previousUsername == null ? "" : this.previousUsername.getName(); // L: 21 22 + return this.previousUsername == null ? "" : this.previousUsername.getName(); } - @ObfuscatedName("aq") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lqb;Lqb;B)V", - garbageValue = "39" + descriptor = "(Lqv;Lqv;I)V", + garbageValue = "-2084414447" ) @Export("set") void set(Username var1, Username var2) { - if (var1 == null) { // L: 26 + if (var1 == null) { throw new NullPointerException(); } else { - this.username = var1; // L: 27 - this.previousUsername = var2; // L: 28 + this.username = var1; + this.previousUsername = var2; } - } // L: 29 + } public int compareTo(Object var1) { - return this.compareTo_user((User)var1); // L: 36 + return this.compareTo_user((User)var1); } - @ObfuscatedName("jh") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "53251261" + descriptor = "(Lpx;Ljava/lang/String;B)I", + garbageValue = "1" ) - @Export("getTapToDrop") - static boolean getTapToDrop() { - return Client.tapToDrop; // L: 11175 + public static int method6525(Buffer var0, String var1) { + int var2 = var0.offset; // L: 18 + int var4 = var1.length(); // L: 21 + byte[] var5 = new byte[var4]; // L: 22 + + for (int var6 = 0; var6 < var4; ++var6) { // L: 23 + char var7 = var1.charAt(var6); // L: 24 + if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 25 + var5[var6] = (byte)var7; + } else if (var7 == 8364) { // L: 26 + var5[var6] = -128; + } else if (var7 == 8218) { // L: 27 + var5[var6] = -126; + } else if (var7 == 402) { // L: 28 + var5[var6] = -125; + } else if (var7 == 8222) { // L: 29 + var5[var6] = -124; + } else if (var7 == 8230) { // L: 30 + var5[var6] = -123; + } else if (var7 == 8224) { // L: 31 + var5[var6] = -122; + } else if (var7 == 8225) { // L: 32 + var5[var6] = -121; + } else if (var7 == 710) { // L: 33 + var5[var6] = -120; + } else if (var7 == 8240) { // L: 34 + var5[var6] = -119; + } else if (var7 == 352) { // L: 35 + var5[var6] = -118; + } else if (var7 == 8249) { // L: 36 + var5[var6] = -117; + } else if (var7 == 338) { // L: 37 + var5[var6] = -116; + } else if (var7 == 381) { // L: 38 + var5[var6] = -114; + } else if (var7 == 8216) { // L: 39 + var5[var6] = -111; + } else if (var7 == 8217) { // L: 40 + var5[var6] = -110; + } else if (var7 == 8220) { // L: 41 + var5[var6] = -109; + } else if (var7 == 8221) { // L: 42 + var5[var6] = -108; + } else if (var7 == 8226) { // L: 43 + var5[var6] = -107; + } else if (var7 == 8211) { + var5[var6] = -106; // L: 44 + } else if (var7 == 8212) { // L: 45 + var5[var6] = -105; + } else if (var7 == 732) { // L: 46 + var5[var6] = -104; + } else if (var7 == 8482) { // L: 47 + var5[var6] = -103; + } else if (var7 == 353) { // L: 48 + var5[var6] = -102; + } else if (var7 == 8250) { // L: 49 + var5[var6] = -101; + } else if (var7 == 339) { // L: 50 + var5[var6] = -100; + } else if (var7 == 382) { // L: 51 + var5[var6] = -98; + } else if (var7 == 376) { // L: 52 + var5[var6] = -97; + } else { + var5[var6] = 63; // L: 53 + } + } + + var0.writeSmartByteShort(var5.length); // L: 58 + var0.offset += class282.huffman.compress(var5, 0, var5.length, var0.array, var0.offset); // L: 59 + return var0.offset - var2; // L: 60 } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Llp;IIB)Z", + garbageValue = "94" + ) + public static boolean method6514(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); // L: 165 + if (var3 == null) { // L: 166 + return false; + } else { + RouteStrategy.SpriteBuffer_decode(var3); // L: 167 + return true; // L: 168 + } + } + + @ObfuscatedName("hl") + @ObfuscatedSignature( + descriptor = "(IIIIIIII)V", + garbageValue = "-2040403661" + ) + static final void method6523(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var8 = var6 - 334; // L: 5505 + if (var8 < 0) { // L: 5506 + var8 = 0; + } else if (var8 > 100) { // L: 5507 + var8 = 100; + } + + int var9 = (Client.zoomWidth - Client.zoomHeight) * var8 / 100 + Client.zoomHeight; // L: 5508 + int var7 = var5 * var9 / 256; // L: 5509 + var8 = 2048 - var3 & 2047; // L: 5512 + var9 = 2048 - var4 & 2047; // L: 5513 + int var10 = 0; // L: 5514 + int var11 = 0; // L: 5515 + int var12 = var7; // L: 5516 + int var13; + int var14; + int var15; + if (var8 != 0) { // L: 5517 + var13 = Rasterizer3D.Rasterizer3D_sine[var8]; // L: 5518 + var14 = Rasterizer3D.Rasterizer3D_cosine[var8]; // L: 5519 + var15 = var11 * var14 - var13 * var7 >> 16; // L: 5520 + var12 = var13 * var11 + var14 * var7 >> 16; // L: 5521 + var11 = var15; // L: 5522 + } + + if (var9 != 0) { // L: 5524 + var13 = Rasterizer3D.Rasterizer3D_sine[var9]; // L: 5525 + var14 = Rasterizer3D.Rasterizer3D_cosine[var9]; // L: 5526 + var15 = var14 * var10 + var12 * var13 >> 16; // L: 5527 + var12 = var14 * var12 - var13 * var10 >> 16; // L: 5528 + var10 = var15; // L: 5529 + } + + if (Client.isCameraLocked) { // L: 5531 + class271.field3221 = var0 - var10; // L: 5532 + Message.field469 = var1 - var11; // L: 5533 + NPC.field1262 = var2 - var12; // L: 5534 + Interpreter.field838 = var3; // L: 5535 + Timer.field4239 = var4; // L: 5536 + } else { + class343.cameraX = var0 - var10; // L: 5539 + class295.cameraY = var1 - var11; // L: 5540 + FaceNormal.cameraZ = var2 - var12; // L: 5541 + GameEngine.cameraPitch = var3; // L: 5542 + StudioGame.cameraYaw = var4; // L: 5543 + } + + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (HorizontalAlignment.oculusOrbFocalPointX >> 7 != ModelData0.localPlayer.x >> 7 || class28.oculusOrbFocalPointY >> 7 != ModelData0.localPlayer.y >> 7)) { // L: 5545 5546 + var13 = ModelData0.localPlayer.plane; // L: 5547 + var14 = (HorizontalAlignment.oculusOrbFocalPointX >> 7) + SecureRandomCallable.baseX; // L: 5548 + var15 = (class28.oculusOrbFocalPointY >> 7) + GrandExchangeOfferOwnWorldComparator.baseY; // L: 5549 + class123.method2781(var14, var15, var13, true); // L: 5550 + } + + } // L: 5553 } diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index 4e60d400a6..eedd1f50f8 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -4,10 +4,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qh") +@ObfuscatedName("qp") @Implements("UserComparator1") public class UserComparator1 implements Comparator { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("reversed") final boolean reversed; @@ -15,10 +15,10 @@ public class UserComparator1 implements Comparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnn;Lnn;I)I", - garbageValue = "-206715996" + descriptor = "(Lnb;Lnb;I)I", + garbageValue = "2106284151" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index b4772979bc..fdfbc56cf5 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -3,10 +3,16 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dp") +@ObfuscatedName("dj") @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { - @ObfuscatedName("v") + @ObfuscatedName("rb") + @ObfuscatedSignature( + descriptor = "Let;" + ) + @Export("guestClanChannel") + static ClanChannel guestClanChannel; + @ObfuscatedName("o") @Export("reversed") final boolean reversed; @@ -14,10 +20,10 @@ public class UserComparator10 extends AbstractUserComparator { this.reversed = var1; // L: 11 } // L: 12 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnf;Lnf;I)I", - garbageValue = "-1424673720" + descriptor = "(Lns;Lns;B)I", + garbageValue = "-115" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -31,63 +37,4 @@ public class UserComparator10 extends AbstractUserComparator { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22 } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "1465062374" - ) - @Export("ByteArrayPool_release") - public static synchronized void ByteArrayPool_release(byte[] var0) { - if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < ByteArrayPool.field4159) { // L: 116 - ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 117 - } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < ByteArrayPool.field4160) { // L: 120 - ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 121 - } else if (var0.length == 10000 && ByteArrayPool.ByteArrayPool_largeCount < ByteArrayPool.field4161) { // L: 124 - ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 125 - } else if (var0.length == 30000 && ByteArrayPool.field4163 < ByteArrayPool.field4152) { // L: 128 - ByteArrayPool.field4162[++ByteArrayPool.field4163 - 1] = var0; // L: 129 - } else { - if (BoundaryObject.ByteArrayPool_arrays != null) { // L: 132 - for (int var1 = 0; var1 < FloorOverlayDefinition.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 133 - if (var0.length == FloorOverlayDefinition.ByteArrayPool_alternativeSizes[var1] && class128.ByteArrayPool_altSizeArrayCounts[var1] < BoundaryObject.ByteArrayPool_arrays[var1].length) { // L: 134 - BoundaryObject.ByteArrayPool_arrays[var1][class128.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 135 - return; // L: 136 - } - } - } - - } - } // L: 118 122 126 130 140 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1291930273" - ) - static void method2622() { - ItemContainer.itemContainers = new NodeHashTable(32); // L: 78 - } // L: 79 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "56" - ) - public static boolean method2629(int var0) { - return (var0 >> 31 & 1) != 0; // L: 41 - } - - @ObfuscatedName("ip") - @ObfuscatedSignature( - descriptor = "(III)Lgt;", - garbageValue = "1713441982" - ) - static RouteStrategy method2623(int var0, int var1) { - Client.field783.approxDestinationX = var0; // L: 8598 - Client.field783.approxDestinationY = var1; // L: 8599 - Client.field783.approxDestinationSizeX = 1; // L: 8600 - Client.field783.approxDestinationSizeY = 1; // L: 8601 - return Client.field783; // L: 8602 - } } diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index e854d84601..7ce049d1c4 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -4,10 +4,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qr") +@ObfuscatedName("qn") @Implements("UserComparator2") public class UserComparator2 implements Comparator { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("reversed") final boolean reversed; @@ -15,10 +15,10 @@ public class UserComparator2 implements Comparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnn;Lnn;I)I", - garbageValue = "812232162" + descriptor = "(Lnb;Lnb;I)I", + garbageValue = "-380169429" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index 0b42c14a1e..0e549e6050 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -1,13 +1,23 @@ +import java.io.ByteArrayInputStream; +import java.io.File; +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.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; +import net.runelite.rs.Reflection; -@ObfuscatedName("dg") +@ObfuscatedName("dy") @Implements("UserComparator3") public class UserComparator3 extends AbstractUserComparator { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("reversed") final boolean reversed; @@ -15,10 +25,10 @@ public class UserComparator3 extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnf;Lnf;B)I", - garbageValue = "-94" + descriptor = "(Lns;Lns;B)I", + garbageValue = "1" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -33,216 +43,144 @@ public class UserComparator3 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)Lgs;", - garbageValue = "127" + descriptor = "(Lpc;I)V", + garbageValue = "1236779387" ) - public static HitSplatDefinition method2602(int var0) { - HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); // L: 52 - if (var1 != null) { // L: 53 - return var1; - } else { - byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); // L: 54 - var1 = new HitSplatDefinition(); // L: 55 - if (var2 != null) { // L: 56 - var1.decode(new Buffer(var2)); - } + @Export("performReflectionCheck") + public static void performReflectionCheck(PacketBuffer var0) { + ReflectionCheck var1 = (ReflectionCheck)class33.reflectionChecks.last(); // L: 25 + if (var1 != null) { // L: 26 + int var2 = var0.offset; // L: 27 + var0.writeInt(var1.id); // L: 28 - HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); // L: 57 - return var1; // L: 58 - } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "105" - ) - static int method2607(int var0, Script var1, boolean var2) { - boolean var3 = true; // L: 858 - Widget var4; - if (var0 >= 2000) { // L: 860 - var0 -= 1000; // L: 861 - var4 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 862 - var3 = false; // L: 863 - } else { - var4 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 865 - } - - int var11; - if (var0 == ScriptOpcodes.CC_SETOP) { // L: 866 - var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; // L: 867 - if (var11 >= 0 && var11 <= 9) { // L: 868 - var4.setAction(var11, Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]); // L: 872 - return 1; // L: 873 - } else { - --class122.Interpreter_stringStackSize; // L: 869 - return 1; // L: 870 - } - } else { - int var6; - if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 875 - Interpreter.Interpreter_intStackSize -= 2; // L: 876 - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 877 - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 878 - var4.parent = ItemComposition.getWidgetChild(var11, var6); // L: 879 - return 1; // L: 880 - } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 882 - var4.isScrollBar = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 883 - return 1; // L: 884 - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 886 - var4.dragZoneSize = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 887 - return 1; // L: 888 - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 890 - var4.dragThreshold = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 891 - return 1; // L: 892 - } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 894 - var4.dataText = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 895 - return 1; // L: 896 - } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 898 - var4.spellActionName = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 899 - return 1; // L: 900 - } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 902 - var4.actions = null; // L: 903 - return 1; // L: 904 - } else if (var0 == 1308) { // L: 906 - var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 907 - return 1; // L: 908 - } else if (var0 == 1309) { // L: 910 - --Interpreter.Interpreter_intStackSize; // L: 911 - return 1; // L: 912 - } else { - int var7; - byte[] var8; - if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 914 - byte var5; - if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 944 - Interpreter.Interpreter_intStackSize -= 2; // L: 945 - var5 = 10; // L: 946 - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; // L: 947 - byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; // L: 948 - ArchiveDiskActionHandler.Widget_setKey(var4, var5, var8, var9); // L: 949 - return 1; // L: 950 - } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 952 - Interpreter.Interpreter_intStackSize -= 3; // L: 953 - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; // L: 954 - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 955 - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 956 - if (var11 >= 0 && var11 <= 9) { // L: 957 - EnumComposition.Widget_setKeyRate(var4, var11, var6, var7); // L: 960 - return 1; // L: 961 - } else { - throw new RuntimeException(); // L: 958 - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 963 - var5 = 10; // L: 964 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 965 - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 966 - EnumComposition.Widget_setKeyRate(var4, var5, var6, var7); // L: 967 - return 1; // L: 968 - } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 970 - --Interpreter.Interpreter_intStackSize; // L: 971 - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; // L: 972 - if (var11 >= 0 && var11 <= 9) { // L: 973 - class67.Widget_setKeyIgnoreHeld(var4, var11); // L: 976 - return 1; // L: 977 - } else { - throw new RuntimeException(); // L: 974 - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 979 - var5 = 10; // L: 980 - class67.Widget_setKeyIgnoreHeld(var4, var5); // L: 981 - return 1; // L: 982 - } else { - return 2; // L: 984 - } + for (int var3 = 0; var3 < var1.size; ++var3) { // L: 29 + if (var1.creationErrors[var3] != 0) { // L: 30 + var0.writeByte(var1.creationErrors[var3]); // L: 31 } else { - byte[] var10 = null; // L: 915 - var8 = null; // L: 916 - if (var3) { // L: 917 - Interpreter.Interpreter_intStackSize -= 10; // L: 918 - - for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 920 921 + try { + int var4 = var1.operations[var3]; // L: 35 + Field var5; + int var6; + if (var4 == 0) { // L: 36 + var5 = var1.fields[var3]; // L: 37 + var6 = Reflection.getInt(var5, (Object)null); // L: 38 + var0.writeByte(0); // L: 39 + var0.writeInt(var6); // L: 40 + } else if (var4 == 1) { // L: 42 + var5 = var1.fields[var3]; // L: 43 + Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 44 + var0.writeByte(0); // L: 45 + } else if (var4 == 2) { // L: 47 + var5 = var1.fields[var3]; // L: 48 + var6 = var5.getModifiers(); // L: 49 + var0.writeByte(0); // L: 50 + var0.writeInt(var6); // L: 51 } - if (var7 > 0) { // L: 923 - var10 = new byte[var7 / 2]; // L: 924 - var8 = new byte[var7 / 2]; // L: 925 + Method var25; + if (var4 != 3) { // L: 53 + if (var4 == 4) { // L: 73 + var25 = var1.methods[var3]; // L: 74 + var6 = var25.getModifiers(); // L: 75 + var0.writeByte(0); // L: 76 + var0.writeInt(var6); // L: 77 + } + } else { + var25 = var1.methods[var3]; // L: 54 + byte[][] var10 = var1.arguments[var3]; // L: 55 + Object[] var7 = new Object[var10.length]; // L: 56 - for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 926 - var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize]; // L: 927 - var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize + 1]; // L: 928 + for (int var8 = 0; var8 < var10.length; ++var8) { // L: 57 + ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 58 + var7[var8] = var9.readObject(); // L: 59 + } + + Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 61 + if (var11 == null) { // L: 62 + var0.writeByte(0); + } else if (var11 instanceof Number) { // L: 63 + var0.writeByte(1); // L: 64 + var0.writeLong(((Number)var11).longValue()); // L: 65 + } else if (var11 instanceof String) { // L: 67 + var0.writeByte(2); // L: 68 + var0.writeStringCp1252NullTerminated((String)var11); // L: 69 + } else { + var0.writeByte(4); // L: 71 } } - } else { - Interpreter.Interpreter_intStackSize -= 2; // L: 933 - var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; // L: 934 - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; // L: 935 - } - - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; // L: 937 - if (var7 >= 0 && var7 <= 9) { // L: 938 - ArchiveDiskActionHandler.Widget_setKey(var4, var7, var10, var8); // L: 941 - return 1; // L: 942 - } else { - throw new RuntimeException(); // L: 939 + } catch (ClassNotFoundException var13) { // L: 80 + var0.writeByte(-10); // L: 81 + } catch (InvalidClassException var14) { // L: 83 + var0.writeByte(-11); // L: 84 + } catch (StreamCorruptedException var15) { // L: 86 + var0.writeByte(-12); // L: 87 + } catch (OptionalDataException var16) { // L: 89 + var0.writeByte(-13); // L: 90 + } catch (IllegalAccessException var17) { // L: 92 + var0.writeByte(-14); // L: 93 + } catch (IllegalArgumentException var18) { // L: 95 + var0.writeByte(-15); // L: 96 + } catch (InvocationTargetException var19) { // L: 98 + var0.writeByte(-16); // L: 99 + } catch (SecurityException var20) { // L: 101 + var0.writeByte(-17); // L: 102 + } catch (IOException var21) { // L: 104 + var0.writeByte(-18); // L: 105 + } catch (NullPointerException var22) { // L: 107 + var0.writeByte(-19); // L: 108 + } catch (Exception var23) { // L: 110 + var0.writeByte(-20); // L: 111 + } catch (Throwable var24) { // L: 113 + var0.writeByte(-21); // L: 114 } } } + + var0.writeCrc(var2); // L: 117 + var1.remove(); // L: 118 + } + } // L: 119 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Lpu;", + garbageValue = "-1588971004" + ) + @Export("getPreferencesFile") + public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { + File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); // L: 285 + if (var3.exists()) { // L: 286 + try { + AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 288 + return var10; // L: 289 + } catch (IOException var9) { // L: 291 + } + } + + String var4 = ""; // L: 293 + if (class11.cacheGamebuild == 33) { // L: 294 + var4 = "_rc"; + } else if (class11.cacheGamebuild == 34) { // L: 295 + var4 = "_wip"; + } + + File var5 = new File(BufferedSource.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 296 + AccessFile var6; + if (!var2 && var5.exists()) { // L: 297 + try { + var6 = new AccessFile(var5, "rw", 10000L); // L: 299 + return var6; // L: 300 + } catch (IOException var8) { // L: 302 + } + } + + try { + var6 = new AccessFile(var3, "rw", 10000L); // L: 305 + return var6; // L: 306 + } catch (IOException var7) { // L: 308 + throw new RuntimeException(); // L: 309 } } - - @ObfuscatedName("hv") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "485258649" - ) - @Export("updateItemPile") - static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[class18.Client_plane][var0][var1]; // L: 8007 - if (var2 == null) { // L: 8008 - ArchiveLoader.scene.removeGroundItemPile(class18.Client_plane, var0, var1); // L: 8009 - } else { - long var3 = -99999999L; // L: 8012 - TileItem var5 = null; // L: 8013 - - TileItem var6; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 8014 8015 8023 - ItemComposition var7 = class19.ItemDefinition_get(var6.id); // L: 8016 - long var11 = (long)var7.price; // L: 8017 - if (var7.isStackable == 1) { // L: 8018 - var11 *= (long)(var6.quantity + 1); - } - - if (var11 > var3) { // L: 8019 - var3 = var11; // L: 8020 - var5 = var6; // L: 8021 - } - } - - if (var5 == null) { // L: 8025 - ArchiveLoader.scene.removeGroundItemPile(class18.Client_plane, var0, var1); // L: 8026 - } else { - var2.addLast(var5); // L: 8029 - TileItem var13 = null; // L: 8030 - TileItem var8 = null; // L: 8031 - - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 8032 8033 8038 - if (var5.id != var6.id) { // L: 8034 - if (var13 == null) { // L: 8035 - var13 = var6; - } - - if (var6.id != var13.id && var8 == null) { // L: 8036 - var8 = var6; - } - } - } - - long var9 = GameObject.calculateTag(var0, var1, 3, false, 0); // L: 8040 - ArchiveLoader.scene.newGroundItemPile(class18.Client_plane, var0, var1, WorldMapLabel.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class18.Client_plane), var5, var9, var13, var8); // L: 8041 - } - } - } // L: 8010 8027 8042 } diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index c9d058072f..7028866c75 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -4,10 +4,16 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cx") +@ObfuscatedName("cp") @Implements("UserComparator4") public class UserComparator4 implements Comparator { - @ObfuscatedName("v") + @ObfuscatedName("iq") + @ObfuscatedSignature( + descriptor = "[Lqr;" + ) + @Export("headIconPkSprites") + static SpritePixels[] headIconPkSprites; + @ObfuscatedName("o") @Export("reversed") final boolean reversed; @@ -15,21 +21,57 @@ public class UserComparator4 implements Comparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnf;Lnf;B)I", - garbageValue = "66" + descriptor = "(Lns;Lns;I)I", + garbageValue = "1947776738" ) @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); // L: 22 + } + 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("q") + @ObfuscatedSignature( + descriptor = "(II)Lgk;", + garbageValue = "-894640319" + ) + public static HitSplatDefinition method2567(int var0) { + HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); + var1 = new HitSplatDefinition(); + if (var2 != null) { // L: 56 + var1.decode(new Buffer(var2)); + } + + HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); // L: 57 + return var1; // L: 58 + } } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(ILlp;IIIZI)V", + garbageValue = "1953673398" + ) + public static void method2573(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { + class273.musicPlayerStatus = 1; // L: 48 + ClanChannelMember.musicTrackArchive = var1; // L: 49 + StructComposition.musicTrackGroupId = var2; // L: 50 + FriendsList.musicTrackFileId = var3; // L: 51 + Clock.musicTrackVolume = var4; // L: 52 + VertexNormal.musicTrackBoolean = var5; // L: 53 + GrandExchangeEvent.pcmSampleLength = var0; // L: 54 + } // L: 55 } diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index 2ff0b9b49e..71bc4fa0da 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -3,10 +3,16 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dd") +@ObfuscatedName("dg") @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { - @ObfuscatedName("v") + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lfo;" + ) + @Export("clock") + static Clock clock; + @ObfuscatedName("o") @Export("reversed") final boolean reversed; @@ -14,79 +20,106 @@ public class UserComparator5 extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnf;Lnf;I)I", - garbageValue = "-2036334399" + descriptor = "(Lns;Lns;I)I", + garbageValue = "1182231062" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var1.world != 0) { // L: 14 - if (var2.world == 0) { // L: 15 + if (var1.world != 0) { + if (var2.world == 0) { return this.reversed ? -1 : 1; } } else if (var2.world != 0) { - return this.reversed ? 1 : -1; // L: 18 + return this.reversed ? 1 : -1; } - return this.compareUser(var1, var2); // L: 20 + return this.compareUser(var1, var2); } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 24 + return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIB)Lqi;", - garbageValue = "-28" + descriptor = "(CI)B", + garbageValue = "949320153" ) - static SpritePixels method2599(int var0, int var1, int var2) { - DemotingHashTable var3 = WorldMapRegion.WorldMapRegion_cachedSprites; // L: 38 - long var4 = (long)(var2 << 16 | var0 << 8 | var1); // L: 41 - return (SpritePixels)var3.get(var4); // L: 43 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Lln;Lln;B)V", - garbageValue = "0" - ) - public static void method2592(AbstractArchive var0, AbstractArchive var1) { - HealthBarDefinition.HealthBarDefinition_archive = var0; // L: 32 - HealthBarDefinition.field1863 = var1; // L: 33 - } // L: 34 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(III)Lbd;", - garbageValue = "121897231" - ) - static Script method2600(int var0, int var1) { - Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); // L: 56 - if (var2 != null) { // L: 57 - return var2; // L: 58 + @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) { + var1 = -111; // L: 26 + } 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 { - String var3 = String.valueOf(var0); // L: 60 - int var4 = class152.archive12.getGroupId(var3); // L: 61 - if (var4 == -1) { // L: 62 - return null; // L: 63 - } else { - byte[] var5 = class152.archive12.takeFileFlat(var4); // L: 65 - if (var5 != null) { // L: 66 - if (var5.length <= 1) { // L: 67 - return null; // L: 68 - } - - var2 = PcmPlayer.newScript(var5); // L: 70 - if (var2 != null) { // L: 71 - Script.Script_cached.put(var2, (long)(var0 << 16)); // L: 72 - return var2; // L: 73 - } - } - - return null; // L: 76 - } + var1 = 63; // L: 40 } + + return var1; // L: 41 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-1482615831" + ) + @Export("isCharAlphabetic") + public static boolean isCharAlphabetic(char var0) { + return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 146 } } diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index d63f8d7662..677a1ca92a 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -1,68 +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("ds") +@ObfuscatedName("dd") @Implements("UserComparator6") public class UserComparator6 extends AbstractUserComparator { - @ObfuscatedName("v") + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1676231481 + ) + @Export("idxCount") + public static int idxCount; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lqr;" + ) + @Export("leftTitleSprite") + static SpritePixels leftTitleSprite; + @ObfuscatedName("o") @Export("reversed") final boolean reversed; public UserComparator6(boolean var1) { this.reversed = var1; // L: 10 - } // L: 11 + } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnf;Lnf;B)I", - garbageValue = "-108" + descriptor = "(Lns;Lns;B)I", + garbageValue = "7" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var1.world != 0 && var2.world != 0) { // L: 14 - return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 15 + if (var1.world != 0 && var2.world != 0) { + return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); } else { return this.compareUser(var1, var2); // L: 17 } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 + return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)Lgi;", - garbageValue = "-4" + descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", + garbageValue = "1" ) - public static VarbitComposition method2643(int var0) { - VarbitComposition var1 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 28 - if (var1 != null) { // L: 29 - return var1; - } else { - byte[] var2 = class11.VarbitDefinition_archive.takeFile(14, var0); // L: 30 - var1 = new VarbitComposition(); // L: 31 - if (var2 != null) { // L: 32 - var1.decode(new Buffer(var2)); + public static String method2619(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 = UserComparator5.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 } - - VarbitComposition.VarbitDefinition_cached.put(var1, (long)var0); // L: 33 - return var1; // L: 34 } + + return var2.toString(); // L: 28 } - - @ObfuscatedName("lv") - @ObfuscatedSignature( - descriptor = "([BII)V", - garbageValue = "1110458768" - ) - static void method2646(byte[] var0, int var1) { - if (Client.randomDatData == null) { // L: 12567 - Client.randomDatData = new byte[24]; - } - - class350.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); // L: 12568 - } // L: 12569 } diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index 8d5a78bb28..cdc2cf770a 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -3,10 +3,16 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dj") +@ObfuscatedName("dp") @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { - @ObfuscatedName("v") + @ObfuscatedName("hv") + @ObfuscatedSignature( + descriptor = "Lce;" + ) + @Export("urlRequester") + static UrlRequester urlRequester; + @ObfuscatedName("o") @Export("reversed") final boolean reversed; @@ -14,10 +20,10 @@ public class UserComparator7 extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnf;Lnf;I)I", - garbageValue = "1628043901" + descriptor = "(Lns;Lns;B)I", + garbageValue = "-76" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -32,24 +38,22 @@ public class UserComparator7 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } - @ObfuscatedName("v") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lln;Lln;Lln;B)V", - garbageValue = "1" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;S)V", + garbageValue = "-27109" ) - public static void method2590(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { - HitSplatDefinition.HitSplatDefinition_archive = var0; // L: 46 - class282.field3261 = var1; // L: 47 - class349.HitSplatDefinition_fontsArchive = var2; // L: 48 - } // L: 49 + @Export("addChatMessage") + 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 + } - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IB)Lfe;", - garbageValue = "-59" - ) - @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 - } + 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; // L: 31 + } // L: 32 } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index cc246fd742..abb3747e83 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -1,18 +1,23 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dr") +@ObfuscatedName("dc") @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { - @ObfuscatedName("ej") - @ObfuscatedSignature( - descriptor = "Llx;" + @ObfuscatedName("ut") + @ObfuscatedGetter( + longValue = -7758235146448266581L ) - @Export("archive1") - static Archive archive1; - @ObfuscatedName("v") + static long field1380; + @ObfuscatedName("qe") + @ObfuscatedSignature( + descriptor = "Loa;" + ) + static class392 field1378; + @ObfuscatedName("o") @Export("reversed") final boolean reversed; @@ -20,10 +25,10 @@ public class UserComparator8 extends AbstractUserComparator { this.reversed = var1; // L: 11 } // L: 12 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnf;Lnf;I)I", - garbageValue = "1968732766" + descriptor = "(Lns;Lns;I)I", + garbageValue = "-1656446017" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -42,50 +47,166 @@ public class UserComparator8 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 25 } - @ObfuscatedName("f") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Ldt;[F[FB)V", - garbageValue = "-60" + descriptor = "(Llp;IIIZI)V", + garbageValue = "-1992647557" ) - static void method2574(class117 var0, float[] var1, float[] var2) { - if (var0 != null) { // L: 285 - var0.field1422 = var1[0]; // L: 288 - float var3 = var1[3] - var1[0]; // L: 289 - float var4 = var2[3] - var2[0]; // L: 290 - float var5 = var1[1] - var1[0]; // L: 291 - float var6 = 0.0F; // L: 292 - float var7 = 0.0F; // L: 293 - if (0.0D != (double)var5) { // L: 294 - var6 = (var2[1] - var2[0]) / var5; // L: 295 + public static void method2574(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { + class273.musicPlayerStatus = 1; // L: 32 + ClanChannelMember.musicTrackArchive = var0; // L: 33 + StructComposition.musicTrackGroupId = var1; // L: 34 + FriendsList.musicTrackFileId = var2; // L: 35 + Clock.musicTrackVolume = var3; // L: 36 + VertexNormal.musicTrackBoolean = var4; // L: 37 + GrandExchangeEvent.pcmSampleLength = 10000; // L: 38 + } // L: 39 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "([Lbx;II[I[IB)V", + garbageValue = "94" + ) + @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 (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) { + var12 = 2001; // L: 138 + } + } 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 (var11 != var12) { // 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 + } } - var5 = var1[3] - var1[2]; // L: 297 - if ((double)var5 != 0.0D) { // L: 298 - var7 = (var2[3] - var2[2]) / var5; // L: 299 - } - - float var8 = 1.0F / (var3 * var3); // L: 301 - float var9 = var3 * var6; // L: 302 - float var10 = var3 * var7; // L: 303 - var0.field1415[0] = (var9 + var10 - var4 - var4) * var8 / var3; // L: 304 - var0.field1415[1] = var8 * (var4 + var4 + var4 - var9 - var9 - var10); // L: 305 - var0.field1415[2] = var6; // L: 306 - var0.field1415[3] = var2[0]; // L: 307 + sortWorlds(var0, var1, var6, var3, var4); // L: 165 + sortWorlds(var0, var6 + 1, var2, var3, var4); // L: 166 } - } // L: 286 308 - @ObfuscatedName("gt") + } // L: 168 + + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lcb;I)V", - garbageValue = "1404835546" + descriptor = "(IB)Z", + garbageValue = "-27" ) - static final void method2578(Actor var0) { - int var1 = Math.max(1, var0.field1143 - Client.cycle); // L: 4055 - int var2 = var0.field1150 * 64 + var0.field1129 * 128; // L: 4056 - int var3 = var0.field1150 * 64 + var0.field1160 * 128; // L: 4057 - var0.x += (var2 - var0.x) / var1; // L: 4058 - var0.y += (var3 - var0.y) / var1; // L: 4059 - var0.field1179 = 0; // L: 4060 - var0.orientation = var0.field1135; // L: 4061 - } // L: 4062 + public static boolean method2581(int var0) { + return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false; // L: 232 233 + } + + @ObfuscatedName("jg") + @ObfuscatedSignature( + descriptor = "([Lki;Lki;ZI)V", + garbageValue = "2006024990" + ) + @Export("revalidateWidgetScroll") + static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 1123320165 * 1605814381 : var1.width * -1172311447 * -153829927; // L: 10765 + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 530662929 * -578131215 : var1.height * 214283987 * -459533989; // L: 10766 + Language.resizeInterface(var0, var1.id, var3, var4, var2); // L: 10767 + if (var1.children != null) { // L: 10768 + Language.resizeInterface(var1.children, var1.id, var3, var4, var2); + } + + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 10769 + if (var5 != null) { // L: 10770 + int var6 = var5.group; // L: 10771 + if (WorldMapDecoration.loadInterface(var6)) { // L: 10773 + Language.resizeInterface(NetSocket.Widget_interfaceComponents[var6], -1, var3, var4, var2); // L: 10774 + } + } + + if (var1.contentType == 1337) { // L: 10777 + } + + } // L: 10778 } diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 6d389b9dc5..4e89d5904f 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -3,18 +3,17 @@ 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("de") +@ObfuscatedName("dh") @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { - @ObfuscatedName("fi") + @ObfuscatedName("uo") @ObfuscatedGetter( - intValue = -976382879 + intValue = 1940467607 ) - @Export("js5Port") - static int js5Port; - @ObfuscatedName("v") + @Export("foundItemIdCount") + static int foundItemIdCount; + @ObfuscatedName("o") @Export("reversed") final boolean reversed; @@ -22,10 +21,10 @@ public class UserComparator9 extends AbstractUserComparator { this.reversed = var1; // L: 11 } // L: 12 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnf;Lnf;I)I", - garbageValue = "-1564138205" + descriptor = "(Lns;Lns;B)I", + garbageValue = "16" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -37,373 +36,15 @@ public class UserComparator9 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("c") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "-27" - ) - @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; // L: 22 - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Ldt;FZI)F", - garbageValue = "1213299067" - ) - static float method2616(class117 var0, float var1, boolean var2) { - float var3 = 0.0F; // L: 199 - if (var0 != null && var0.method2715() != 0) { // L: 200 - float var4 = (float)var0.field1411[0].field1373; // L: 203 - float var5 = (float)var0.field1411[var0.method2715() - 1].field1373; // L: 204 - float var6 = var5 - var4; // L: 205 - if (0.0D == (double)var6) { // L: 206 - return var0.field1411[0].field1376; // L: 207 - } else { - float var7 = 0.0F; // L: 209 - if (var1 > var5) { // L: 210 - var7 = (var1 - var5) / var6; // L: 211 - } else { - var7 = (var1 - var4) / var6; // L: 214 - } - - double var8 = (double)((int)var7); // L: 216 - float var10 = Math.abs((float)((double)var7 - var8)); // L: 217 - float var11 = var10 * var6; // L: 218 - var8 = Math.abs(1.0D + var8); // L: 219 - double var12 = var8 / 2.0D; // L: 220 - double var14 = (double)((int)var12); // L: 221 - var10 = (float)(var12 - var14); // L: 222 - float var16; - float var17; - if (var2) { // L: 225 - if (var0.field1409 == class116.field1401) { // L: 226 - if (0.0D != (double)var10) { // L: 227 - var11 += var4; // L: 228 - } else { - var11 = var5 - var11; // L: 231 - } - } else if (var0.field1409 != class116.field1400 && var0.field1409 != class116.field1406) { // L: 234 - if (var0.field1409 == class116.field1399) { // L: 237 - var11 = var4 - var1; // L: 238 - var16 = var0.field1411[0].field1371; // L: 239 - var17 = var0.field1411[0].field1377; // L: 240 - var3 = var0.field1411[0].field1376; // L: 241 - if ((double)var16 != 0.0D) { // L: 242 - var3 -= var17 * var11 / var16; // L: 243 - } - - return var3; // L: 245 - } - } else { - var11 = var5 - var11; // L: 235 - } - } else if (var0.field1410 == class116.field1401) { // L: 249 - if (0.0D != (double)var10) { // L: 250 - var11 = var5 - var11; // L: 251 - } else { - var11 += var4; // L: 254 - } - } else if (var0.field1410 != class116.field1400 && var0.field1410 != class116.field1406) { // L: 257 - if (var0.field1410 == class116.field1399) { // L: 260 - var11 = var1 - var5; // L: 261 - var16 = var0.field1411[var0.method2715() - 1].field1369; // L: 262 - var17 = var0.field1411[var0.method2715() - 1].field1374; // L: 263 - var3 = var0.field1411[var0.method2715() - 1].field1376; // L: 264 - if ((double)var16 != 0.0D) { // L: 265 - var3 += var11 * var17 / var16; // L: 266 - } - - return var3; // L: 268 - } - } else { - var11 += var4; // L: 258 - } - - var3 = class10.method92(var0, var11); // L: 271 - float var18; - if (var2 && var0.field1409 == class116.field1406) { // L: 273 - var18 = var0.field1411[var0.method2715() - 1].field1376 - var0.field1411[0].field1376; // L: 274 - var3 = (float)((double)var3 - (double)var18 * var8); // L: 275 - } else if (!var2 && var0.field1410 == class116.field1406) { // L: 277 - var18 = var0.field1411[var0.method2715() - 1].field1376 - var0.field1411[0].field1376; // L: 278 - var3 = (float)((double)var3 + (double)var18 * var8); // L: 279 - } - - return var3; // L: 281 - } - } else { - return var3; // L: 201 - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "2" - ) - static int method2621(int var0, Script var1, boolean var2) { - int var4 = -1; // L: 612 - Widget var3; - if (var0 >= 2000) { // L: 613 - var0 -= 1000; // L: 614 - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 615 - var3 = class127.getWidget(var4); // L: 616 - } else { - var3 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 618 - } - - if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 619 - Interpreter.Interpreter_intStackSize -= 2; // L: 620 - var3.scrollX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 621 - if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 622 - var3.scrollX = var3.scrollWidth - var3.width; - } - - if (var3.scrollX < 0) { // L: 623 - var3.scrollX = 0; - } - - var3.scrollY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 624 - if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 625 - var3.scrollY = var3.scrollHeight - var3.height; - } - - if (var3.scrollY < 0) { // L: 626 - var3.scrollY = 0; - } - - class346.invalidateWidget(var3); // L: 627 - return 1; // L: 628 - } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 630 - var3.color = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 631 - class346.invalidateWidget(var3); // L: 632 - return 1; // L: 633 - } else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 635 - var3.fill = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 636 - class346.invalidateWidget(var3); // L: 637 - return 1; // L: 638 - } else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 640 - var3.transparencyTop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 641 - class346.invalidateWidget(var3); // L: 642 - return 1; // L: 643 - } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 645 - var3.lineWid = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 646 - class346.invalidateWidget(var3); // L: 647 - return 1; // L: 648 - } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 650 - var3.spriteId2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 651 - class346.invalidateWidget(var3); // L: 652 - return 1; // L: 653 - } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 655 - var3.spriteAngle = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 656 - class346.invalidateWidget(var3); // L: 657 - return 1; // L: 658 - } else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 660 - var3.spriteTiling = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 661 - class346.invalidateWidget(var3); // L: 662 - return 1; // L: 663 - } else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 665 - var3.modelType = 1; // L: 666 - var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 667 - class346.invalidateWidget(var3); // L: 668 - return 1; // L: 669 - } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 671 - Interpreter.Interpreter_intStackSize -= 6; // L: 672 - var3.modelOffsetX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 673 - var3.modelOffsetY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 674 - var3.modelAngleX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 675 - var3.modelAngleY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 676 - var3.modelAngleZ = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; // L: 677 - var3.modelZoom = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 5]; // L: 678 - class346.invalidateWidget(var3); // L: 679 - return 1; // L: 680 - } else { - int var8; - if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 682 - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 683 - if (var8 != var3.sequenceId) { // L: 684 - var3.sequenceId = var8; // L: 685 - var3.modelFrame = 0; // L: 686 - var3.modelFrameCycle = 0; // L: 687 - class346.invalidateWidget(var3); // L: 688 - } - - return 1; // L: 690 - } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 692 - var3.modelOrthog = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 693 - class346.invalidateWidget(var3); // L: 694 - return 1; // L: 695 - } else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 697 - String var7 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 698 - if (!var7.equals(var3.text)) { // L: 699 - var3.text = var7; // L: 700 - class346.invalidateWidget(var3); // L: 701 - } - - return 1; // L: 703 - } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 705 - var3.fontId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 706 - class346.invalidateWidget(var3); // L: 707 - return 1; // L: 708 - } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 710 - Interpreter.Interpreter_intStackSize -= 3; // L: 711 - var3.textXAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 712 - var3.textYAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 713 - var3.textLineHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 714 - class346.invalidateWidget(var3); // L: 715 - return 1; // L: 716 - } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 718 - var3.textShadowed = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 719 - class346.invalidateWidget(var3); // L: 720 - return 1; // L: 721 - } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 723 - var3.outline = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 724 - class346.invalidateWidget(var3); // L: 725 - return 1; // L: 726 - } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 728 - var3.spriteShadow = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 729 - class346.invalidateWidget(var3); // L: 730 - return 1; // L: 731 - } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 733 - var3.spriteFlipV = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 734 - class346.invalidateWidget(var3); // L: 735 - return 1; // L: 736 - } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 738 - var3.spriteFlipH = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 739 - class346.invalidateWidget(var3); // L: 740 - return 1; // L: 741 - } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 743 - Interpreter.Interpreter_intStackSize -= 2; // L: 744 - var3.scrollWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 745 - var3.scrollHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 746 - class346.invalidateWidget(var3); // L: 747 - if (var4 != -1 && var3.type == 0) { // L: 748 - AbstractByteArrayCopier.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); - } - - return 1; // L: 749 - } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 751 - class268.resumePauseWidget(var3.id, var3.childIndex); // L: 752 - Client.meslayerContinueWidget = var3; // L: 753 - class346.invalidateWidget(var3); // L: 754 - return 1; // L: 755 - } else if (var0 == 1122) { // L: 757 - var3.spriteId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 758 - class346.invalidateWidget(var3); // L: 759 - return 1; // L: 760 - } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 762 - var3.color2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 763 - class346.invalidateWidget(var3); // L: 764 - return 1; // L: 765 - } else if (var0 == 1124) { // L: 767 - var3.transparencyBot = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 768 - class346.invalidateWidget(var3); // L: 769 - return 1; // L: 770 - } else if (var0 == 1125) { // L: 772 - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 773 - FillMode var6 = (FillMode)MusicPatchPcmStream.findEnumerated(class291.FillMode_values(), var8); // L: 774 - if (var6 != null) { // L: 775 - var3.fillMode = var6; // L: 776 - class346.invalidateWidget(var3); // L: 777 - } - - return 1; // L: 779 - } else { - boolean var5; - if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 781 - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 782 - var3.field3369 = var5; // L: 783 - return 1; // L: 784 - } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 786 - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 787 - var3.modelTransparency = var5; // L: 788 - return 1; // L: 789 - } else if (var0 == 1128) { // L: 791 - Interpreter.Interpreter_intStackSize -= 2; // L: 792 - return 1; // L: 793 - } else if (var0 == 1129) { // L: 795 - var3.field3487 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 796 - class346.invalidateWidget(var3); // L: 797 - return 1; // L: 798 - } else if (var0 == 1130) { // L: 800 - var3.method5618(Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize], VerticalAlignment.urlRequester, MusicPatchPcmStream.method5456()); // L: 801 - return 1; // L: 802 - } else if (var0 == 1131) { // L: 804 - Interpreter.Interpreter_intStackSize -= 2; // L: 805 - var3.method5722(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 806 - return 1; // L: 807 - } else if (var0 == 1132) { // L: 809 - var3.method5672(Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize], Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 810 - return 1; // L: 811 - } else { - return 2; // L: 813 - } - } - } - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "74" - ) - static final int method2615(int var0, int var1, int var2) { - int var3 = var0 / var2; // L: 891 - int var4 = var0 & var2 - 1; // L: 892 - int var5 = var1 / var2; // L: 893 - int var6 = var1 & var2 - 1; // L: 894 - int var7 = class293.method5599(var3, var5); // L: 895 - int var8 = class293.method5599(var3 + 1, var5); // L: 896 - int var9 = class293.method5599(var3, var5 + 1); // L: 897 - int var10 = class293.method5599(var3 + 1, var5 + 1); // L: 898 - int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 901 - int var11 = ((65536 - var12) * var7 >> 16) + (var12 * var8 >> 16); // L: 902 - int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 907 - int var13 = ((65536 - var14) * var9 >> 16) + (var10 * var14 >> 16); // L: 908 - int var16 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; // L: 913 - int var15 = ((65536 - var16) * var11 >> 16) + (var13 * var16 >> 16); // L: 914 - return var15; // L: 916 - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lky;I)I", - garbageValue = "-1509768740" - ) - static int method2617(Widget var0) { - if (var0.type != 11) { // L: 1227 - --class122.Interpreter_stringStackSize; // L: 1228 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 1229 - return 1; // L: 1230 - } else { - String var1 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 1232 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var0.method5623(var1); // L: 1233 - return 1; // L: 1234 - } - } - - @ObfuscatedName("j") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1180428712" + garbageValue = "-652974265" ) - protected static final void method2619() { - class431.clock.mark(); // L: 429 - - int var0; - for (var0 = 0; var0 < 32; ++var0) { // L: 430 - GameEngine.graphicsTickTimes[var0] = 0L; - } - - for (var0 = 0; var0 < 32; ++var0) { // L: 431 - GameEngine.clientTickTimes[var0] = 0L; - } - - TriBool.gameCyclesToDo = 0; // L: 432 - } // L: 433 + static final void method2601() { + InterfaceParent.method2067("You can't add yourself to your own ignore list"); // L: 178 + } // L: 179 } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index f7e9d14204..80592102b9 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -1,3 +1,4 @@ +import java.awt.Component; import java.util.Arrays; import java.util.Comparator; import java.util.HashMap; @@ -7,34 +8,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nv") +@ObfuscatedName("nl") @Implements("UserList") public abstract class UserList { - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -962501009 + intValue = 2080752723 ) @Export("capacity") final int capacity; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1469945805 + intValue = -1966841579 ) @Export("size") int size; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "[Lnn;" + descriptor = "[Lnb;" ) @Export("array") User[] array; - @ObfuscatedName("p") + @ObfuscatedName("c") @Export("usernamesMap") HashMap usernamesMap; @ObfuscatedName("w") @Export("previousUsernamesMap") HashMap previousUsernamesMap; - @ObfuscatedName("k") + @ObfuscatedName("b") @Export("comparator") Comparator comparator; @@ -47,26 +48,26 @@ public abstract class UserList { this.previousUsernamesMap = new HashMap(var1 / 8); // L: 20 } // L: 21 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Lnn;", - garbageValue = "-2105397576" + descriptor = "(I)Lnb;", + garbageValue = "-1695844600" ) @Export("newInstance") abstract User newInstance(); - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(II)[Lnn;", - garbageValue = "1888809026" + descriptor = "(II)[Lnb;", + garbageValue = "1788836658" ) @Export("newTypedArray") abstract User[] newTypedArray(int var1); - @ObfuscatedName("al") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-126" + descriptor = "(I)V", + garbageValue = "1710894760" ) @Export("clear") public void clear() { @@ -76,30 +77,30 @@ public abstract class UserList { this.previousUsernamesMap.clear(); // L: 27 } // L: 28 - @ObfuscatedName("av") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1142855250" + garbageValue = "1290388264" ) @Export("getSize") public int getSize() { return this.size; // L: 31 } - @ObfuscatedName("at") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "15215" + descriptor = "(B)Z", + garbageValue = "96" ) @Export("isFull") public boolean isFull() { - return this.size == this.capacity; // L: 35 + return this.capacity == this.size; // L: 35 } - @ObfuscatedName("an") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lqb;I)Z", - garbageValue = "-2040208013" + descriptor = "(Lqv;B)Z", + garbageValue = "5" ) @Export("contains") public boolean contains(Username var1) { @@ -110,41 +111,41 @@ public abstract class UserList { } } - @ObfuscatedName("ay") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Lqb;I)Lnn;", - garbageValue = "85985954" + descriptor = "(Lqv;I)Lnb;", + garbageValue = "1663082435" ) @Export("getByUsername") public User getByUsername(Username var1) { - User var2 = this.getByCurrentUsername(var1); // L: 45 - return var2 != null ? var2 : this.getByPreviousUsername(var1); // L: 46 47 + User var2 = this.getByCurrentUsername(var1); + return var2 != null ? var2 : this.getByPreviousUsername(var1); } - @ObfuscatedName("ag") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Lqb;I)Lnn;", - garbageValue = "-723468130" + descriptor = "(Lqv;I)Lnb;", + garbageValue = "-952962769" ) @Export("getByCurrentUsername") User getByCurrentUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); // L: 51 52 } - @ObfuscatedName("ah") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Lqb;I)Lnn;", - garbageValue = "1714959015" + descriptor = "(Lqv;I)Lnb;", + garbageValue = "-1144019727" ) @Export("getByPreviousUsername") User getByPreviousUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); // L: 56 57 } - @ObfuscatedName("ac") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lqb;I)Z", - garbageValue = "1454726576" + descriptor = "(Lqv;I)Z", + garbageValue = "-154697884" ) @Export("removeByUsername") public final boolean removeByUsername(Username var1) { @@ -157,10 +158,10 @@ public abstract class UserList { } } - @ObfuscatedName("ab") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Lnn;I)V", - garbageValue = "1184769229" + descriptor = "(Lnb;I)V", + garbageValue = "-625173400" ) @Export("remove") final void remove(User var1) { @@ -171,20 +172,20 @@ public abstract class UserList { } } // L: 72 - @ObfuscatedName("au") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(Lqb;B)Lnn;", - garbageValue = "72" + descriptor = "(Lqv;I)Lnb;", + garbageValue = "243716509" ) @Export("addLastNoPreviousUsername") User addLastNoPreviousUsername(Username var1) { return this.addLast(var1, (Username)null); // L: 75 } - @ObfuscatedName("af") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lqb;Lqb;I)Lnn;", - garbageValue = "155101250" + descriptor = "(Lqv;Lqv;B)Lnb;", + garbageValue = "96" ) @Export("addLast") User addLast(Username var1, Username var2) { @@ -199,10 +200,10 @@ public abstract class UserList { } } - @ObfuscatedName("ad") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(II)Lnn;", - garbageValue = "1336383728" + descriptor = "(II)Lnb;", + garbageValue = "627727149" ) @Export("get") public final User get(int var1) { @@ -213,10 +214,10 @@ public abstract class UserList { } } - @ObfuscatedName("ai") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "71" + descriptor = "(I)V", + garbageValue = "771974288" ) @Export("sort") public final void sort() { @@ -228,10 +229,10 @@ public abstract class UserList { } // L: 99 - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Lnn;Lqb;Lqb;I)V", - garbageValue = "2114154350" + descriptor = "(Lnb;Lqv;Lqv;I)V", + garbageValue = "2080271698" ) @Export("changeName") final void changeName(User var1, Username var2, Username var3) { @@ -240,10 +241,10 @@ public abstract class UserList { this.mapPut(var1); // L: 104 } // L: 105 - @ObfuscatedName("ar") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(Lnn;I)I", - garbageValue = "1398600558" + descriptor = "(Lnb;I)I", + garbageValue = "969083323" ) @Export("indexOf") final int indexOf(User var1) { @@ -256,10 +257,10 @@ public abstract class UserList { return -1; // L: 111 } - @ObfuscatedName("ap") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lnn;I)V", - garbageValue = "2123373059" + descriptor = "(Lnb;B)V", + garbageValue = "-1" ) @Export("mapRemove") final void mapRemove(User var1) { @@ -273,19 +274,19 @@ public abstract class UserList { } } // L: 117 - @ObfuscatedName("az") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lnn;B)V", - garbageValue = "0" + descriptor = "(Lnb;I)V", + garbageValue = "-1080072428" ) @Export("arrayAddLast") final void arrayAddLast(User var1) { this.array[++this.size - 1] = var1; // L: 120 } // L: 121 - @ObfuscatedName("as") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Lnn;B)V", + descriptor = "(Lnb;B)V", garbageValue = "1" ) @Export("mapPut") @@ -300,10 +301,10 @@ public abstract class UserList { } // L: 131 - @ObfuscatedName("aa") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1984344824" + garbageValue = "324092894" ) @Export("arrayRemove") final void arrayRemove(int var1) { @@ -314,20 +315,20 @@ public abstract class UserList { } // L: 138 - @ObfuscatedName("bj") + @ObfuscatedName("ay") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "633444578" + garbageValue = "-1263316171" ) @Export("removeComparator") public final void removeComparator() { this.comparator = null; // L: 144 } // L: 145 - @ObfuscatedName("bm") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(Ljava/util/Comparator;I)V", - garbageValue = "-2147310039" + garbageValue = "1203709497" ) @Export("addComparator") public final void addComparator(Comparator var1) { @@ -338,4 +339,25 @@ public abstract class UserList { } } // L: 154 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)[Ljn;", + garbageValue = "-1215110903" + ) + static LoginPacket[] method6607() { + return new LoginPacket[]{LoginPacket.field3195, LoginPacket.field3191, LoginPacket.field3194, LoginPacket.field3196, LoginPacket.field3193, LoginPacket.field3192}; // L: 22 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "980107475" + ) + static void method6543(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 } diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index 41082d84ea..65da2f9313 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -3,96 +3,96 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("qb") +@ObfuscatedName("qv") @Implements("Username") public class Username implements Comparable { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("name") String name; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("cleanName") String cleanName; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lpe;)V" + descriptor = "(Ljava/lang/String;Lpj;)V" ) public Username(String var1, LoginType var2) { this.name = var1; // L: 16 - this.cleanName = class196.method3900(var1, var2); // L: 17 + this.cleanName = ArchiveDiskActionHandler.method5612(var1, var2); // L: 17 } // L: 18 public Username(String var1) { this.name = var1; // L: 11 - this.cleanName = class196.method3900(var1, LoginType.oldscape); // L: 12 + this.cleanName = ArchiveDiskActionHandler.method5612(var1, LoginType.oldscape); // L: 12 } // L: 13 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1852169176" + garbageValue = "523836369" ) @Export("getName") public String getName() { return this.name; // L: 21 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(B)Ljava/lang/String;", - garbageValue = "0" + garbageValue = "23" ) - public String method8243() { + public String method8148() { return this.cleanName; // L: 25 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "125" + garbageValue = "27" ) @Export("hasCleanName") public boolean hasCleanName() { return this.cleanName != null; // L: 29 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lqb;I)I", - garbageValue = "1960668931" + descriptor = "(Lqv;I)I", + garbageValue = "1240776928" ) @Export("compareToTyped") public int compareToTyped(Username var1) { - if (this.cleanName == null) { // L: 53 - return var1.cleanName == null ? 0 : 1; // L: 54 55 + if (this.cleanName == null) { // L: 56 + return var1.cleanName == null ? 0 : 1; // L: 57 58 } else { - return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 57 58 + return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 60 61 } } public boolean equals(Object var1) { - if (var1 instanceof Username) { // L: 33 - Username var2 = (Username)var1; // L: 34 - if (this.cleanName == null) { // L: 35 - return var2.cleanName == null; - } else if (var2.cleanName == null) { // L: 36 + if (var1 instanceof Username) { // L: 34 + Username var2 = (Username)var1; // L: 35 + if (this.cleanName == null) { + return var2.cleanName == null; // L: 36 + } else if (var2.cleanName == null) { // L: 37 return false; } else { - return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 37 38 + return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 38 39 } } else { - return false; // L: 40 + return false; // L: 41 } } public int hashCode() { - return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 44 45 - } - - public String toString() { - return this.getName(); // L: 49 + return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 46 47 } public int compareTo(Object var1) { - return this.compareToTyped((Username)var1); // L: 62 + return this.compareToTyped((Username)var1); // L: 65 + } + + public String toString() { + return this.getName(); // L: 52 } } diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java index 3d86985dc8..2dfb1987a9 100644 --- a/runescape-client/src/main/java/Usernamed.java +++ b/runescape-client/src/main/java/Usernamed.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("np") +@ObfuscatedName("nj") @Implements("Usernamed") public interface Usernamed { - @ObfuscatedName("la") + @ObfuscatedName("lt") @ObfuscatedSignature( - descriptor = "(I)Lqb;", - garbageValue = "529633925" + descriptor = "(B)Lqv;", + garbageValue = "-38" ) @Export("username") Username username(); diff --git a/runescape-client/src/main/java/VarbitComposition.java b/runescape-client/src/main/java/VarbitComposition.java index 3bd76ec116..90c27159ed 100644 --- a/runescape-client/src/main/java/VarbitComposition.java +++ b/runescape-client/src/main/java/VarbitComposition.java @@ -4,43 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gi") +@ObfuscatedName("ge") @Implements("VarbitComposition") public class VarbitComposition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Llp;" + ) + @Export("VarbitDefinition_archive") + public static AbstractArchive VarbitDefinition_archive; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lir;" ) @Export("VarbitDefinition_cached") public static EvictingDualNodeHashTable VarbitDefinition_cached; - @ObfuscatedName("n") - static final int[] field1970; - @ObfuscatedName("i") + @ObfuscatedName("m") + static final int[] field2039; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -775301691 + intValue = 449659853 ) @Export("baseVar") public int baseVar; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1129048987 + intValue = -1293091049 ) @Export("startBit") public int startBit; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 153132931 + intValue = -1571653715 ) @Export("endBit") public int endBit; static { VarbitDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 - field1970 = new int[32]; // L: 15 + field2039 = new int[32]; // L: 15 int var0 = 2; // L: 18 for (int var1 = 0; var1 < 32; ++var1) { // L: 19 - field1970[var1] = var0 - 1; // L: 20 + field2039[var1] = var0 - 1; // L: 20 var0 += var0; // L: 21 } @@ -49,10 +55,10 @@ public class VarbitComposition extends DualNode { VarbitComposition() { } // L: 25 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "391271030" + descriptor = "(Lpx;I)V", + garbageValue = "1433634569" ) @Export("decode") void decode(Buffer var1) { @@ -66,10 +72,10 @@ public class VarbitComposition extends DualNode { } } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-467631265" + descriptor = "(Lpx;II)V", + garbageValue = "1729188867" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -81,48 +87,31 @@ public class VarbitComposition extends DualNode { } // L: 52 - @ObfuscatedName("hq") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-1670747147" + descriptor = "(IIIZIB)J", + garbageValue = "-48" ) - @Export("worldToScreen") - static final void worldToScreen(int var0, int var1, int var2) { - if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 5402 - int var3 = WorldMapLabel.getTileHeight(var0, var1, class18.Client_plane) - var2; // L: 5407 - var0 -= WorldMapLabelSize.cameraX; // L: 5408 - var3 -= ItemContainer.cameraY; // L: 5409 - var1 -= class154.cameraZ; // L: 5410 - int var4 = Rasterizer3D.Rasterizer3D_sine[class147.cameraPitch]; // L: 5411 - int var5 = Rasterizer3D.Rasterizer3D_cosine[class147.cameraPitch]; // L: 5412 - int var6 = Rasterizer3D.Rasterizer3D_sine[class21.cameraYaw]; // L: 5413 - int var7 = Rasterizer3D.Rasterizer3D_cosine[class21.cameraYaw]; // L: 5414 - int var8 = var0 * var7 + var6 * var1 >> 16; // L: 5415 - var1 = var7 * var1 - var0 * var6 >> 16; // L: 5416 - var0 = var8; // L: 5417 - var8 = var5 * var3 - var4 * var1 >> 16; // L: 5418 - var1 = var5 * var1 + var3 * var4 >> 16; // L: 5419 - if (var1 >= 50) { // L: 5421 - Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 5422 - Client.viewportTempY = Client.viewportHeight / 2 + var8 * Client.viewportZoom / var1; // L: 5423 - } else { - Client.viewportTempX = -1; // L: 5426 - Client.viewportTempY = -1; // L: 5427 - } - - } else { - Client.viewportTempX = -1; // L: 5403 - Client.viewportTempY = -1; // L: 5404 + @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: 88 + if (var3) { // L: 89 + var5 |= 65536L; } - } // L: 5405 5429 - @ObfuscatedName("ko") + return var5; // L: 90 + } + + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1667758885" + descriptor = "(IIIB)I", + garbageValue = "-113" ) - static final int method3578() { - float var0 = 200.0F * ((float)class131.clientPreferences.method2240() - 0.5F); // L: 11994 - return 100 - Math.round(var0); // L: 11995 + static int method3489(int var0, int var1, int var2) { + if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) { // L: 912 + return 0; + } else { + return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; // L: 913 + } } } diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index ed67ee9090..cf901b4d6a 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -1,30 +1,24 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fc") +@ObfuscatedName("fe") @Implements("VarcInt") public class VarcInt extends DualNode { - @ObfuscatedName("uy") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Llf;" + descriptor = "Llp;" ) - public static class326 field1841; - @ObfuscatedName("c") + @Export("VarcInt_archive") + public static AbstractArchive VarcInt_archive; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("VarcInt_cached") - static EvictingDualNodeHashTable VarcInt_cached; - @ObfuscatedName("ho") - @ObfuscatedGetter( - intValue = -248717599 - ) - @Export("baseY") - static int baseY; - @ObfuscatedName("i") + public static EvictingDualNodeHashTable VarcInt_cached; + @ObfuscatedName("l") @Export("persist") public boolean persist; @@ -32,35 +26,153 @@ public class VarcInt extends DualNode { VarcInt_cached = new EvictingDualNodeHashTable(64); // L: 11 } - VarcInt() { + public VarcInt() { this.persist = false; // L: 12 - } // L: 14 + } - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-400441754" + descriptor = "(Lpx;I)V", + garbageValue = "-2122743256" ) - void method3414(Buffer var1) { + public void method3315(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 28 - if (var2 == 0) { // L: 29 - return; // L: 32 + int var2 = var1.readUnsignedByte(); // L: 16 + if (var2 == 0) { // L: 17 + return; // L: 20 } - this.method3407(var1, var2); // L: 30 + this.method3316(var1, var2); // L: 18 } } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lpi;IB)V", - garbageValue = "114" + descriptor = "(Lpx;IS)V", + garbageValue = "223" ) - void method3407(Buffer var1, int var2) { - if (var2 == 2) { // L: 35 - this.persist = true; // L: 36 + void method3316(Buffer var1, int var2) { + if (var2 == 2) { // L: 23 + this.persist = true; // L: 24 } - } // L: 39 + } // L: 27 + + @ObfuscatedName("q") + static boolean method3323(long var0) { + return class357.method6392(var0) == 2; // L: 48 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1980570860" + ) + public static int method3324(int var0) { + var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); // L: 53 + var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); // L: 54 + var0 = var0 + (var0 >>> 4) & 252645135; // L: 55 + var0 += var0 >>> 8; // L: 56 + var0 += var0 >>> 16; // L: 57 + return var0 & 255; // L: 58 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(IIIZIZI)V", + garbageValue = "447479880" + ) + @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 = World.World_worlds[var6]; // L: 180 + World.World_worlds[var6] = World.World_worlds[var1]; // L: 181 + World.World_worlds[var1] = var8; // L: 182 + + for (int var9 = var0; var9 < var1; ++var9) { // L: 183 + World var11 = World.World_worlds[var9]; // L: 185 + int var12 = KeyHandler.compareWorlds(var11, var8, var2, var3); // L: 187 + int var10; + if (var12 != 0) { // L: 188 + if (var3) { // L: 189 + var10 = -var12; // L: 190 + } else { + var10 = var12; // L: 194 + } + } else if (var4 == -1) { // L: 198 + var10 = 0; // L: 199 + } else { + int var13 = KeyHandler.compareWorlds(var11, var8, var4, var5); // L: 202 + if (var5) { // L: 203 + var10 = -var13; + } else { + var10 = var13; // L: 204 + } + } + + if (var10 <= 0) { // L: 206 + World var14 = World.World_worlds[var9]; // L: 207 + World.World_worlds[var9] = World.World_worlds[var7]; // L: 208 + World.World_worlds[var7++] = var14; // L: 209 + } + } + + World.World_worlds[var1] = World.World_worlds[var7]; // L: 213 + World.World_worlds[var7] = var8; // L: 214 + doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); // L: 215 + doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); // L: 216 + } + + } // L: 218 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1070094417" + ) + public static void method3321() { + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 82 + } // L: 83 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-396189333" + ) + public static void method3325() { + class453.SpriteBuffer_xOffsets = null; // L: 223 + class453.SpriteBuffer_yOffsets = null; // L: 224 + ScriptFrame.SpriteBuffer_spriteWidths = null; // L: 225 + class453.SpriteBuffer_spriteHeights = null; // L: 226 + Decimator.SpriteBuffer_spritePalette = null; // L: 227 + class127.SpriteBuffer_pixels = null; // L: 228 + } // L: 229 + + @ObfuscatedName("ke") + @ObfuscatedSignature( + descriptor = "(IIIILqr;Lka;B)V", + garbageValue = "-10" + ) + @Export("worldToMinimap") + static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + int var6 = var3 * var3 + var2 * var2; // L: 12380 + if (var6 > 4225 && var6 < 90000) { // L: 12381 + int var7 = Client.camAngleY & 2047; // L: 12382 + int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 12383 + int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 12384 + int var10 = var9 * var2 + var3 * var8 >> 16; // L: 12385 + int var11 = var3 * var9 - var8 * var2 >> 16; // L: 12386 + double var12 = Math.atan2((double)var10, (double)var11); // L: 12387 + int var14 = var5.width / 2 - 25; // L: 12388 + int var15 = (int)(Math.sin(var12) * (double)var14); // L: 12389 + int var16 = (int)(Math.cos(var12) * (double)var14); // L: 12390 + byte var17 = 20; // L: 12391 + class344.redHintArrowSprite.method7992(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 12392 + } else { + PcmPlayer.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 12394 + } + + } // L: 12395 } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index 0011d2e829..c228c7a078 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -9,381 +9,429 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cj") +@Deprecated +@ObfuscatedName("cu") @Implements("Varcs") public class Varcs { - @ObfuscatedName("ai") - @Export("hasFocus") - protected static boolean hasFocus; - @ObfuscatedName("hc") - @Export("regionLandArchives") - static byte[][] regionLandArchives; - @ObfuscatedName("iz") - @ObfuscatedGetter( - intValue = 1381253271 + @ObfuscatedName("dg") + @ObfuscatedSignature( + descriptor = "Lcv;" ) - @Export("selectedItemId") - static int selectedItemId; - @ObfuscatedName("i") + @Export("mouseRecorder") + static MouseRecorder mouseRecorder; + @ObfuscatedName("du") + @ObfuscatedSignature( + descriptor = "Lnf;" + ) + @Export("js5Socket") + static AbstractSocket js5Socket; + @ObfuscatedName("fl") + @ObfuscatedGetter( + intValue = 731803613 + ) + static int field1329; + @ObfuscatedName("hq") + @ObfuscatedSignature( + descriptor = "Lmx;" + ) + @Export("fontPlain11") + static Font fontPlain11; + @ObfuscatedName("l") @Export("intsPersistence") boolean[] intsPersistence; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("map") Map map; - @ObfuscatedName("b") + /** @deprecated */ + @ObfuscatedName("a") @Export("strings") String[] strings; - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("unwrittenChanges") boolean unwrittenChanges; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - longValue = 9211291169100794773L + longValue = -8040896661134893849L ) - long field1296; + long field1324; Varcs() { - this.unwrittenChanges = false; // L: 22 - int var1 = class10.archive2.getGroupFileCount(19); // L: 26 - this.map = new HashMap(); // L: 27 - this.intsPersistence = new boolean[var1]; // L: 28 + this.unwrittenChanges = false; // L: 25 + int var1 = class356.archive2.getGroupFileCount(19); // L: 29 + this.map = new HashMap(); + this.intsPersistence = new boolean[var1]; int var2; - for (var2 = 0; var2 < var1; ++var2) { // L: 29 - VarcInt var3 = TriBool.method6839(var2); // L: 30 - this.intsPersistence[var2] = var3.persist; // L: 31 + for (var2 = 0; var2 < var1; ++var2) { + VarcInt var4 = (VarcInt)VarcInt.VarcInt_cached.get((long)var2); + VarcInt var3; + if (var4 != null) { + var3 = var4; + } else { + byte[] var5 = VarcInt.VarcInt_archive.takeFile(19, var2); + var4 = new VarcInt(); + if (var5 != null) { + var4.method3315(new Buffer(var5)); // L: 42 + } + + VarcInt.VarcInt_cached.put(var4, (long)var2); // L: 43 + var3 = var4; // L: 44 + } + + this.intsPersistence[var2] = var3.persist; // L: 47 } - var2 = 0; // L: 33 - if (class10.archive2.method5824(15)) { // L: 34 - var2 = class10.archive2.getGroupFileCount(15); // L: 35 + var2 = 0; // L: 49 + if (class356.archive2.method5634(15)) { // L: 50 + var2 = class356.archive2.getGroupFileCount(15); // L: 51 } - this.strings = new String[var2]; // L: 37 - this.read(); // L: 38 - } // L: 39 + this.strings = new String[var2]; // L: 53 + this.read(); // L: 54 + } // L: 55 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1258010190" + descriptor = "(IIB)V", + garbageValue = "-43" ) @Export("setInt") void setInt(int var1, int var2) { - this.map.put(var1, var2); // L: 42 - if (this.intsPersistence[var1]) { // L: 43 - this.unwrittenChanges = true; + this.map.put(var1, var2); // L: 58 + if (this.intsPersistence[var1]) { + this.unwrittenChanges = true; // L: 59 } - } // L: 44 + } // L: 60 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IS)I", - garbageValue = "-20847" + descriptor = "(II)I", + garbageValue = "-1629880183" ) @Export("getInt") int getInt(int var1) { - Object var2 = this.map.get(var1); // L: 47 - return var2 instanceof Integer ? (Integer)var2 : -1; // L: 48 49 51 + Object var2 = this.map.get(var1); // L: 63 + return var2 instanceof Integer ? (Integer)var2 : -1; // L: 64 65 67 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "1112436939" + garbageValue = "-89263666" ) @Export("setString") void setString(int var1, String var2) { - this.map.put(var1, var2); // L: 55 - } // L: 56 + this.map.put(var1, var2); // L: 71 + } // L: 72 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/String;", - garbageValue = "-1225749706" + garbageValue = "1860266342" ) @Export("getString") String getString(int var1) { - Object var2 = this.map.get(var1); // L: 59 - return var2 instanceof String ? (String)var2 : ""; // L: 60 61 63 + Object var2 = this.map.get(var1); // L: 75 + return var2 instanceof String ? (String)var2 : ""; // L: 76 77 79 } - @ObfuscatedName("b") + /** @deprecated */ + @Deprecated + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "-974893641" + garbageValue = "409167370" ) @Export("setStringOld") void setStringOld(int var1, String var2) { - this.strings[var1] = var2; // L: 67 - } // L: 68 + this.strings[var1] = var2; // L: 84 + } // L: 85 - @ObfuscatedName("n") + /** @deprecated */ + @Deprecated + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/String;", - garbageValue = "852602780" + garbageValue = "2082376569" ) @Export("getStringOld") String getStringOld(int var1) { - return this.strings[var1]; // L: 71 + return this.strings[var1]; // L: 89 } - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "41" + descriptor = "(I)V", + garbageValue = "181729030" ) @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: 93 + if (!this.intsPersistence[var1]) { // L: 94 + this.map.remove(var1); // L: 95 } } - 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: 98 + this.strings[var1] = null; // L: 99 } - } // L: 83 + } // L: 101 - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ZI)Lph;", - garbageValue = "291389659" + descriptor = "(ZI)Lpu;", + garbageValue = "-1693869936" ) @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return ModeWhere.getPreferencesFile("2", Messages.field1305.name, var1); // L: 86 + return UserComparator3.getPreferencesFile("2", ApproximateRouteStrategy.field473.name, var1); // L: 104 } - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-729376145" + descriptor = "(B)V", + garbageValue = "82" ) @Export("write") void write() { - AccessFile var1 = this.getPreferencesFile(true); // L: 90 + AccessFile var1 = this.getPreferencesFile(true); // L: 108 try { - int var2 = 3; // L: 92 - int var3 = 0; // L: 93 - Iterator var4 = this.map.entrySet().iterator(); // L: 94 + int var2 = 3; // L: 110 + int var3 = 0; // L: 111 + Iterator var4 = this.map.entrySet().iterator(); // L: 112 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: 113 + int var6 = (Integer)var5.getKey(); // L: 115 + if (this.intsPersistence[var6]) { // L: 116 + Object var7 = var5.getValue(); // L: 117 + var2 += 3; // L: 118 + if (var7 instanceof Integer) { // L: 119 var2 += 4; - } else if (var7 instanceof String) { // L: 102 - var2 += class425.stringCp1252NullTerminatedByteSize((String)var7); + } else if (var7 instanceof String) { // L: 120 + var2 += class392.stringCp1252NullTerminatedByteSize((String)var7); } - ++var3; // L: 103 + ++var3; // L: 121 } } - 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 var28 = new Buffer(var2); // L: 125 + var28.writeByte(2); // L: 126 + var28.writeShort(var3); // L: 127 + Iterator var29 = this.map.entrySet().iterator(); // L: 128 - label147: + label145: while (true) { - Entry var16; - int var17; + Entry var17; + int var18; do { - if (!var28.hasNext()) { - var1.write(var27.array, 0, var27.offset); // L: 140 - break label147; + if (!var29.hasNext()) { + var1.write(var28.array, 0, var28.offset); // L: 162 + break label145; } - var16 = (Entry)var28.next(); // L: 111 - var17 = (Integer)var16.getKey(); // L: 113 - } while(!this.intsPersistence[var17]); // L: 114 + var17 = (Entry)var29.next(); // L: 129 + var18 = (Integer)var17.getKey(); // L: 131 + } while(!this.intsPersistence[var18]); // L: 132 - var27.writeShort(var17); // L: 115 - Object var8 = var16.getValue(); // L: 116 - Class var10 = var8.getClass(); // L: 118 - class431[] var11 = class431.method7584(); // L: 121 - int var12 = 0; + var28.writeShort(var18); // L: 133 + Object var8 = var17.getValue(); // L: 134 + Class var10 = var8.getClass(); // L: 136 + class433[] var11 = new class433[]{class433.field4655, class433.field4656, class433.field4664}; // L: 141 + class433[] var12 = var11; // L: 143 + int var13 = 0; - class431 var9; + class433 var9; while (true) { - if (var12 >= var11.length) { - var9 = null; // L: 132 + if (var13 >= var12.length) { + var9 = null; // L: 154 break; } - class431 var13 = var11[var12]; // L: 123 - if (var10 == var13.field4593) { // L: 125 - var9 = var13; // L: 126 - break; // L: 127 + class433 var14 = var12[var13]; // L: 145 + if (var10 == var14.field4667) { // L: 147 + var9 = var14; // L: 148 + break; // L: 149 } - ++var12; // L: 122 + ++var13; // L: 144 } - var27.writeByte(var9.field4596); // L: 135 - class431.method7579(var8, var27); // L: 136 + var28.writeByte(var9.field4658); // L: 157 + class433.method7420(var8, var28); // L: 158 } - } catch (Exception var25) { // L: 142 + } catch (Exception var26) { // L: 164 } finally { try { - var1.close(); // L: 145 - } catch (Exception var24) { // L: 147 + var1.close(); // L: 167 + } catch (Exception var25) { // L: 169 } } - this.unwrittenChanges = false; // L: 149 - this.field1296 = class136.method2931(); // L: 150 - } // L: 151 + this.unwrittenChanges = false; // L: 171 + this.field1324 = class113.method2624(); // L: 172 + } // L: 173 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1780086074" + descriptor = "(S)V", + garbageValue = "-16764" ) @Export("read") void read() { - AccessFile var1 = this.getPreferencesFile(false); // L: 154 + AccessFile var1 = this.getPreferencesFile(false); // L: 176 - label226: { + label214: { try { - byte[] var2 = new byte[(int)var1.length()]; // L: 156 + byte[] var2 = new byte[(int)var1.length()]; // L: 178 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: 179 180 183 + var4 = var1.read(var2, var3, var2.length - var3); // L: 181 + if (var4 == -1) { // L: 182 throw new EOFException(); } } - Buffer var14 = new Buffer(var2); // L: 163 - if (var14.array.length - var14.offset >= 1) { // L: 164 - int var15 = var14.readUnsignedByte(); // L: 165 - if (var15 >= 0 && var15 <= 2) { // L: 166 - int var7; - int var8; - int var9; - int var16; - if (var15 >= 2) { // L: 167 - var16 = var14.readUnsignedShort(); // L: 168 - var7 = 0; - - while (true) { - if (var7 >= var16) { - break label226; - } - - var8 = var14.readUnsignedShort(); // L: 170 - var9 = var14.readUnsignedByte(); // L: 171 - class431 var10 = (class431)MusicPatchPcmStream.findEnumerated(class431.method7584(), var9); // L: 172 - Object var11 = var10.method7581(var14); // L: 173 - if (this.intsPersistence[var8]) { // L: 174 - this.map.put(var8, var11); // L: 175 - } - - ++var7; // L: 169 - } - } else { - var16 = var14.readUnsignedShort(); // L: 180 - - 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 - } - } - - var7 = var14.readUnsignedShort(); // L: 188 - var8 = 0; - - while (true) { - if (var8 >= var7) { - break label226; - } - - var14.readUnsignedShort(); // L: 190 - var14.readStringCp1252NullTerminated(); // L: 191 - ++var8; // L: 189 - } - } + Buffer var15 = new Buffer(var2); // L: 185 + if (var15.array.length - var15.offset >= 1) { + int var16 = var15.readUnsignedByte(); // L: 187 + if (var16 < 0 || var16 > 2) { + return; // L: 188 } - return; // L: 200 + int var7; + int var8; + int var9; + int var17; + if (var16 >= 2) { // L: 189 + var17 = var15.readUnsignedShort(); // L: 190 + var7 = 0; + + while (true) { + if (var7 >= var17) { + break label214; + } + + var8 = var15.readUnsignedShort(); // L: 192 + var9 = var15.readUnsignedByte(); // L: 193 + class433[] var10 = new class433[]{class433.field4655, class433.field4656, class433.field4664}; // L: 196 + class433 var11 = (class433)class291.findEnumerated(var10, var9); // L: 198 + Object var12 = var11.method7423(var15); // L: 199 + if (this.intsPersistence[var8]) { // L: 200 + this.map.put(var8, var12); // L: 201 + } + + ++var7; // L: 191 + } + } else { + var17 = var15.readUnsignedShort(); // L: 206 + + for (var7 = 0; var7 < var17; ++var7) { // L: 207 + var8 = var15.readUnsignedShort(); // L: 208 + var9 = var15.readInt(); // L: 209 + if (this.intsPersistence[var8]) { // L: 210 + this.map.put(var8, var9); // L: 211 + } + } + + var7 = var15.readUnsignedShort(); // L: 214 + var8 = 0; + + while (true) { + if (var8 >= var7) { + break label214; + } + + var15.readUnsignedShort(); // L: 216 + var15.readStringCp1252NullTerminated(); // L: 217 + ++var8; // L: 215 + } + } } - } catch (Exception var25) { // L: 195 - break label226; + } catch (Exception var26) { // L: 221 + break label214; } finally { try { - var1.close(); // L: 198 - } catch (Exception var24) { + var1.close(); // L: 224 + } catch (Exception var25) { // L: 226 } } - return; + return; // L: 186 } - this.unwrittenChanges = false; // L: 202 - } // L: 203 + this.unwrittenChanges = false; // L: 228 + } // L: 229 - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2021693946" + garbageValue = "-590305740" ) @Export("tryWrite") void tryWrite() { - if (this.unwrittenChanges && this.field1296 < class136.method2931() - 60000L) { // L: 206 - this.write(); // L: 207 + if (this.unwrittenChanges && this.field1324 < class113.method2624() - 60000L) { // L: 232 + this.write(); // L: 233 } - } // L: 209 + } // L: 235 - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-23" + descriptor = "(I)Z", + garbageValue = "2147209332" ) @Export("hasUnwrittenChanges") boolean hasUnwrittenChanges() { - return this.unwrittenChanges; // L: 212 + return this.unwrittenChanges; // L: 238 } - @ObfuscatedName("gz") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1953067165" + garbageValue = "-405806506" ) - static void method2463() { - int var0 = Players.Players_count; // L: 4773 - int[] var1 = Players.Players_indices; // L: 4774 + static void method2466() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 30 + if (var0.stream1 != null) { // L: 31 + class122.pcmStreamMixer.removeSubStream(var0.stream1); // L: 32 + var0.stream1 = null; // L: 33 + } - for (int var2 = 0; var2 < var0; ++var2) { // L: 4775 - if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { // L: 4776 - ArchiveLoader.addPlayerToScene(Client.players[var1[var2]], true); // L: 4777 + if (var0.stream2 != null) { // L: 35 + class122.pcmStreamMixer.removeSubStream(var0.stream2); // L: 36 + var0.stream2 = null; // L: 37 } } - } // L: 4779 + ObjectSound.objectSounds.clear(); // L: 40 + } // L: 41 - @ObfuscatedName("hl") + @ObfuscatedName("fe") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "7" + descriptor = "(IB)V", + garbageValue = "32" ) - static boolean method2441() { - return (Client.drawPlayerNames & 1) != 0; // L: 4853 - } + @Export("forceDisconnect") + static final void forceDisconnect(int var0) { + SecureRandomCallable.logOut(); // L: 3027 + switch(var0) { // L: 3028 + case 1: + class126.method2799(24); // L: 3040 + class345.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 3041 + break; + case 2: + class126.method2799(24); // L: 3032 + class345.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 3033 + } + + } // L: 3046 } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index 1f948ee1d3..1292ae7b5d 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -1,698 +1,142 @@ +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("fb") +@ObfuscatedName("fi") @Implements("VarpDefinition") public class VarpDefinition extends DualNode { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("VarpDefinition_archive") public static AbstractArchive VarpDefinition_archive; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -18460315 + intValue = -230043691 ) @Export("VarpDefinition_fileCount") public static int VarpDefinition_fileCount; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("VarpDefinition_cached") public static EvictingDualNodeHashTable VarpDefinition_cached; - @ObfuscatedName("hx") - @Export("regionMapArchiveIds") - static int[] regionMapArchiveIds; - @ObfuscatedName("f") + @ObfuscatedName("ex") + @ObfuscatedSignature( + descriptor = "Lle;" + ) + @Export("archive19") + static Archive archive19; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -2056271889 + intValue = 1780230935 ) @Export("type") public int type; static { - VarpDefinition_cached = new EvictingDualNodeHashTable(64); // L: 12 + VarpDefinition_cached = new EvictingDualNodeHashTable(64); } VarpDefinition() { this.type = 0; // L: 13 } // L: 15 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "856991189" + descriptor = "(Lpx;B)V", + garbageValue = "-125" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 29 - if (var2 == 0) { // L: 30 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { return; // L: 33 } - this.decodeNext(var1, var2); // L: 31 + this.decodeNext(var1, var2); } } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "2104717847" + descriptor = "(Lpx;IB)V", + garbageValue = "29" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 5) { // L: 36 + if (var2 == 5) { this.type = var1.readUnsignedShort(); } } // L: 38 - @ObfuscatedName("je") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([Lky;IIIIIIII)V", - garbageValue = "2009471440" + descriptor = "(Ljava/lang/String;I)Ljava/io/File;", + garbageValue = "1012009903" ) - @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: 11189 - Widget var9 = var0[var8]; // L: 11190 - if (var9 != null && var9.parentId == var1 && (var9.method5617() || class326.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent)) { // L: 11191 11192 11193 - if (var9.isIf3) { // L: 11194 - if (class1.isComponentHidden(var9)) { // L: 11195 - continue; - } - } else if (var9.type == 0 && var9 != DevicePcmPlayerProvider.mousedOverWidgetIf1 && class1.isComponentHidden(var9)) { // L: 11198 - continue; - } + @Export("getFile") + static File getFile(String var0) { + if (!FileSystem.FileSystem_hasPermissions) { // L: 16 + throw new RuntimeException(""); + } else { + File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); // L: 17 + if (var1 != null) { // L: 18 + return var1; + } else { + File var2 = new File(FileSystem.FileSystem_cacheDir, var0); // L: 19 + RandomAccessFile var3 = null; // L: 20 - if (var9.type == 11 && var9.method5629(VerticalAlignment.urlRequester)) { // L: 11200 11201 - class346.invalidateWidget(var9); // L: 11202 - AbstractByteArrayCopier.revalidateWidgetScroll(var9.children, var9, true); // L: 11203 - if (var9.field3462 != null) { // L: 11204 - ScriptEvent var10 = new ScriptEvent(); // L: 11205 - var10.widget = var9; // L: 11206 - var10.args = var9.field3462; // L: 11207 - Client.scriptEvents.addFirst(var10); // L: 11208 - } - } - - int var26 = var9.x + var6; // L: 11212 - int var11 = var7 + var9.y; // L: 11213 - int var12; - int var13; - int var14; - int var15; - int var17; - int var18; - if (var9.type == 2) { // L: 11218 - var12 = var2; // L: 11219 - var13 = var3; // L: 11220 - var14 = var4; // L: 11221 - var15 = var5; // L: 11222 - } else { - int var16; - if (var9.type == 9) { // L: 11224 - var16 = var26; // L: 11225 - var17 = var11; // L: 11226 - var18 = var26 + var9.width; // L: 11227 - int var19 = var11 + var9.height; // L: 11228 - if (var18 < var26) { // L: 11229 - var16 = var18; // L: 11231 - var18 = var26; // L: 11232 - } - - if (var19 < var11) { // L: 11234 - var17 = var19; // L: 11236 - var19 = var11; // L: 11237 - } - - ++var18; // L: 11239 - ++var19; // L: 11240 - var12 = var16 > var2 ? var16 : var2; // L: 11241 - var13 = var17 > var3 ? var17 : var3; // L: 11242 - var14 = var18 < var4 ? var18 : var4; // L: 11243 - var15 = var19 < var5 ? var19 : var5; // L: 11244 + try { + File var4 = new File(var2.getParent()); // L: 22 + if (!var4.exists()) { // L: 23 + throw new RuntimeException(""); } else { - var16 = var26 + var9.width; // L: 11247 - var17 = var11 + var9.height; // L: 11248 - var12 = var26 > var2 ? var26 : var2; // L: 11249 - var13 = var11 > var3 ? var11 : var3; // L: 11250 - var14 = var16 < var4 ? var16 : var4; // L: 11251 - var15 = var17 < var5 ? var17 : var5; // L: 11252 + var3 = new RandomAccessFile(var2, "rw"); // L: 24 + int var5 = var3.read(); // L: 25 + var3.seek(0L); // L: 26 + var3.write(var5); // L: 27 + var3.seek(0L); // L: 28 + var3.close(); // L: 29 + FileSystem.FileSystem_cacheFiles.put(var0, var2); // L: 30 + return var2; // L: 31 } - } - - if (var9 == Client.clickedWidget) { // L: 11254 - Client.field687 = true; // L: 11255 - Client.field688 = var26; // L: 11256 - Client.field757 = var11; // L: 11257 - } - - boolean var34 = false; // L: 11259 - if (var9.field3414) { // L: 11260 - switch(Client.field668) { // L: 11261 - case 0: - var34 = true; // L: 11268 - case 1: - default: - break; - case 2: - if (Client.field628 == var9.id >>> 16) { // L: 11271 - var34 = true; // L: 11272 - } - break; - case 3: - if (var9.id == Client.field628) { // L: 11263 - var34 = true; // L: 11264 - } - } - } - - if (var34 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 11277 - if (var9.isIf3) { // L: 11278 - ScriptEvent var27; - if (var9.noClickThrough) { // L: 11279 - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11280 - for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11281 - if (var27.isMouseInputEvent) { // L: 11282 - var27.remove(); // L: 11283 - var27.widget.containsMouse = false; // L: 11284 - } - } - - if (class124.widgetDragDuration == 0) { // L: 11287 - Client.clickedWidget = null; // L: 11288 - Client.clickedWidgetParent = null; // L: 11289 - } - - if (!Client.isMenuOpen) { // L: 11291 - ByteArrayPool.addCancelMenuEntry(); // L: 11292 - } - } - } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11296 11297 - for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11298 - if (var27.isMouseInputEvent && var27.widget.onScroll == var27.args) { // L: 11299 - var27.remove(); // L: 11300 - } - } + } catch (Exception var8) { + try { + if (var3 != null) { // L: 35 + var3.close(); // L: 36 + var3 = null; // L: 37 } + } catch (Exception var7) { // L: 40 } - var17 = MouseHandler.MouseHandler_x; // L: 11306 - var18 = MouseHandler.MouseHandler_y; // L: 11307 - if (MouseHandler.MouseHandler_lastButton != 0) { // L: 11308 - var17 = MouseHandler.MouseHandler_lastPressedX; // L: 11309 - var18 = MouseHandler.MouseHandler_lastPressedY; // L: 11310 - } - - boolean var35 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 11312 - if (var9.contentType == 1337) { // L: 11313 - if (!Client.isLoading && !Client.isMenuOpen && var35) { // L: 11314 - ClanMate.addSceneMenuOptions(var17, var18, var12, var13); - } - } else if (var9.contentType == 1338) { // L: 11317 - class14.checkIfMinimapClicked(var9, var26, var11); // L: 11318 - } else { - if (var9.contentType == 1400) { // L: 11321 - ScriptFrame.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var35, var26, var11, var9.width, var9.height); // L: 11322 - } - - if (!Client.isMenuOpen && var35) { // L: 11324 - if (var9.contentType == 1400) { // L: 11325 - ScriptFrame.worldMap.addElementMenuOptions(var26, var11, var9.width, var9.height, var17, var18); // L: 11326 - } else { - class138.Widget_addToMenu(var9, var17 - var26, var18 - var11); // L: 11329 - } - } - - boolean var21; - int var29; - if (var34) { // L: 11332 - for (int var20 = 0; var20 < var9.field3415.length; ++var20) { // L: 11333 - var21 = false; // L: 11334 - boolean var28 = false; // L: 11335 - if (!var21 && var9.field3415[var20] != null) { // L: 11336 - for (var29 = 0; var29 < var9.field3415[var20].length; ++var29) { // L: 11337 - boolean var24 = false; // L: 11338 - if (var9.field3484 != null) { // L: 11339 - var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3415[var20][var29]]; // L: 11340 - } - - if (ArchiveLoader.method2062(var9.field3415[var20][var29]) || var24) { // L: 11342 - var21 = true; // L: 11343 - if (var9.field3484 != null && var9.field3484[var20] > Client.cycle) { // L: 11344 - break; - } - - byte var33 = var9.field3485[var20][var29]; // L: 11345 - if (var33 == 0 || ((var33 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var33 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var33 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var33 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 11346 11347 11348 11349 11350 - var28 = true; // L: 11352 - break; - } - } - } - } - - if (var28) { // L: 11358 - if (var20 < 10) { // L: 11359 - WorldMapLabelSize.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if (var20 == 10) { // L: 11360 - FriendSystem.Widget_runOnTargetLeave(); // L: 11361 - Renderable.selectSpell(var9.id, var9.childIndex, WorldMapID.Widget_unpackTargetMask(class326.getWidgetFlags(var9)), var9.itemId); // L: 11362 - Client.selectedSpellActionName = class152.Widget_getSpellActionName(var9); // L: 11363 - if (Client.selectedSpellActionName == null) { // L: 11364 - Client.selectedSpellActionName = "null"; - } - - Client.selectedSpellName = var9.dataText + UserComparator9.colorStartTag(16777215); // L: 11365 - } - - var29 = var9.field3417[var20]; // L: 11367 - if (var9.field3484 == null) { // L: 11368 - var9.field3484 = new int[var9.field3415.length]; - } - - if (var9.field3418 == null) { // L: 11369 - var9.field3418 = new int[var9.field3415.length]; - } - - if (var29 != 0) { // L: 11370 - if (var9.field3484[var20] == 0) { // L: 11371 - var9.field3484[var20] = var29 + Client.cycle + var9.field3418[var20]; - } else { - var9.field3484[var20] = var29 + Client.cycle; // L: 11372 - } - } else { - var9.field3484[var20] = Integer.MAX_VALUE; // L: 11374 - } - } - - if (!var21 && var9.field3484 != null) { // L: 11376 11377 - var9.field3484[var20] = 0; - } - } - } - - if (var9.isIf3) { // L: 11381 - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11382 - var35 = true; - } else { - var35 = false; // L: 11383 - } - - boolean var36 = false; // L: 11384 - if ((MouseHandler.MouseHandler_currentButton == 1 || !GameBuild.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var35) { // L: 11385 - var36 = true; - } - - var21 = false; // L: 11386 - if ((MouseHandler.MouseHandler_lastButton == 1 || !GameBuild.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 11387 - var21 = true; - } - - int[] var22; - if (var21) { // L: 11388 - ParamComposition.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var26, MouseHandler.MouseHandler_lastPressedY - var11); // L: 11389 - if (var9.type == 11 && var9.method5721(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY)) { // L: 11390 - switch(var9.method5625()) { // L: 11391 - case 0: - class391.openURL(var9.method5627(), true, false); // L: 11393 - break; - case 1: - if (ParamComposition.method3596(class326.getWidgetFlags(var9))) { // L: 11396 - var22 = var9.method5628(); // L: 11397 - if (var22 != null) { // L: 11398 - PacketBufferNode var23 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2975, Client.packetWriter.isaacCipher); // L: 11399 - var23.packetBuffer.writeIntME(var22[0]); // L: 11400 - var23.packetBuffer.method7710(var9.childIndex); // L: 11401 - var23.packetBuffer.method7721(var22[1]); // L: 11402 - var23.packetBuffer.method7723(var9.method5647()); // L: 11403 - var23.packetBuffer.method7721(var22[2]); // L: 11404 - var23.packetBuffer.writeInt(var9.id); // L: 11405 - Client.packetWriter.addNode(var23); // L: 11406 - } - } - } - } - } - - if (var9.contentType == 1400) { // L: 11413 - ScriptFrame.worldMap.method7217(var17, var18, var35 & var36, var35 & var21); // L: 11414 - } - - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var35 && DirectByteArrayCopier.method5516(class326.getWidgetFlags(var9))) { // L: 11416 - Client.draggedOnWidget = var9; - } - - if (var9 == Client.clickedWidgetParent) { // L: 11417 - Client.field696 = true; // L: 11418 - Client.field773 = var26; // L: 11419 - Client.field686 = var11; // L: 11420 - } - - if (var9.hasListener) { // L: 11422 - ScriptEvent var37; - if (var35 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 11423 - var37 = new ScriptEvent(); // L: 11424 - var37.isMouseInputEvent = true; // L: 11425 - var37.widget = var9; // L: 11426 - var37.mouseY = Client.mouseWheelRotation; // L: 11427 - var37.args = var9.onScroll; // L: 11428 - Client.scriptEvents.addFirst(var37); // L: 11429 - } - - if (Client.clickedWidget != null || class142.dragInventoryWidget != null || Client.isMenuOpen) { // L: 11431 - var21 = false; // L: 11432 - var36 = false; // L: 11433 - var35 = false; // L: 11434 - } - - if (!var9.isClicked && var21) { // L: 11436 - var9.isClicked = true; // L: 11437 - if (var9.onClick != null) { // L: 11438 - var37 = new ScriptEvent(); // L: 11439 - var37.isMouseInputEvent = true; // L: 11440 - var37.widget = var9; // L: 11441 - var37.mouseX = MouseHandler.MouseHandler_lastPressedX - var26; // L: 11442 - var37.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 11443 - var37.args = var9.onClick; // L: 11444 - Client.scriptEvents.addFirst(var37); // L: 11445 - } - } - - if (var9.isClicked && var36 && var9.onClickRepeat != null) { // L: 11448 11449 - var37 = new ScriptEvent(); // L: 11450 - var37.isMouseInputEvent = true; // L: 11451 - var37.widget = var9; // L: 11452 - var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11453 - var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11454 - var37.args = var9.onClickRepeat; // L: 11455 - Client.scriptEvents.addFirst(var37); // L: 11456 - } - - if (var9.isClicked && !var36) { // L: 11459 - var9.isClicked = false; // L: 11460 - if (var9.onRelease != null) { // L: 11461 - var37 = new ScriptEvent(); // L: 11462 - var37.isMouseInputEvent = true; // L: 11463 - var37.widget = var9; // L: 11464 - var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11465 - var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11466 - var37.args = var9.onRelease; // L: 11467 - Client.field711.addFirst(var37); // L: 11468 - } - } - - if (var36 && var9.onHold != null) { // L: 11471 11472 - var37 = new ScriptEvent(); // L: 11473 - var37.isMouseInputEvent = true; // L: 11474 - var37.widget = var9; // L: 11475 - var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11476 - var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11477 - var37.args = var9.onHold; // L: 11478 - Client.scriptEvents.addFirst(var37); // L: 11479 - } - - if (!var9.containsMouse && var35) { // L: 11482 - var9.containsMouse = true; // L: 11483 - if (var9.onMouseOver != null) { // L: 11484 - var37 = new ScriptEvent(); // L: 11485 - var37.isMouseInputEvent = true; // L: 11486 - var37.widget = var9; // L: 11487 - var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11488 - var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11489 - var37.args = var9.onMouseOver; // L: 11490 - Client.scriptEvents.addFirst(var37); // L: 11491 - } - } - - if (var9.containsMouse && var35 && var9.onMouseRepeat != null) { // L: 11494 11495 - var37 = new ScriptEvent(); // L: 11496 - var37.isMouseInputEvent = true; // L: 11497 - var37.widget = var9; // L: 11498 - var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11499 - var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11500 - var37.args = var9.onMouseRepeat; // L: 11501 - Client.scriptEvents.addFirst(var37); // L: 11502 - } - - if (var9.containsMouse && !var35) { // L: 11505 - var9.containsMouse = false; // L: 11506 - if (var9.onMouseLeave != null) { // L: 11507 - var37 = new ScriptEvent(); // L: 11508 - var37.isMouseInputEvent = true; // L: 11509 - var37.widget = var9; // L: 11510 - var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11511 - var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11512 - var37.args = var9.onMouseLeave; // L: 11513 - Client.field711.addFirst(var37); // L: 11514 - } - } - - if (var9.onTimer != null) { // L: 11517 - var37 = new ScriptEvent(); // L: 11518 - var37.widget = var9; // L: 11519 - var37.args = var9.onTimer; // L: 11520 - Client.field710.addFirst(var37); // L: 11521 - } - - ScriptEvent var25; - int var39; - int var40; - if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3479) { // L: 11523 - if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3479 <= 32) { // L: 11524 - label825: - for (var40 = var9.field3479; var40 < Client.changedVarpCount; ++var40) { // L: 11531 - var29 = Client.changedVarps[var40 & 31]; // L: 11532 - - for (var39 = 0; var39 < var9.varTransmitTriggers.length; ++var39) { // L: 11533 - if (var29 == var9.varTransmitTriggers[var39]) { // L: 11534 - var25 = new ScriptEvent(); // L: 11535 - var25.widget = var9; // L: 11536 - var25.args = var9.onVarTransmit; // L: 11537 - Client.scriptEvents.addFirst(var25); // L: 11538 - break label825; // L: 11539 - } - } - } - } else { - var37 = new ScriptEvent(); // L: 11525 - var37.widget = var9; // L: 11526 - var37.args = var9.onVarTransmit; // L: 11527 - Client.scriptEvents.addFirst(var37); // L: 11528 - } - - var9.field3479 = Client.changedVarpCount; // L: 11544 - } - - if (var9.onInvTransmit != null && Client.field695 > var9.field3480) { // L: 11546 - if (var9.invTransmitTriggers != null && Client.field695 - var9.field3480 <= 32) { // L: 11547 - label801: - for (var40 = var9.field3480; var40 < Client.field695; ++var40) { // L: 11554 - var29 = Client.changedItemContainers[var40 & 31]; // L: 11555 - - for (var39 = 0; var39 < var9.invTransmitTriggers.length; ++var39) { // L: 11556 - if (var29 == var9.invTransmitTriggers[var39]) { // L: 11557 - var25 = new ScriptEvent(); // L: 11558 - var25.widget = var9; // L: 11559 - var25.args = var9.onInvTransmit; // L: 11560 - Client.scriptEvents.addFirst(var25); // L: 11561 - break label801; // L: 11562 - } - } - } - } else { - var37 = new ScriptEvent(); // L: 11548 - var37.widget = var9; // L: 11549 - var37.args = var9.onInvTransmit; // L: 11550 - Client.scriptEvents.addFirst(var37); // L: 11551 - } - - var9.field3480 = Client.field695; // L: 11567 - } - - if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3433) { // L: 11569 - if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3433 <= 32) { // L: 11570 - label777: - for (var40 = var9.field3433; var40 < Client.changedSkillsCount; ++var40) { // L: 11577 - var29 = Client.changedSkills[var40 & 31]; // L: 11578 - - for (var39 = 0; var39 < var9.statTransmitTriggers.length; ++var39) { // L: 11579 - if (var29 == var9.statTransmitTriggers[var39]) { // L: 11580 - var25 = new ScriptEvent(); // L: 11581 - var25.widget = var9; // L: 11582 - var25.args = var9.onStatTransmit; // L: 11583 - Client.scriptEvents.addFirst(var25); // L: 11584 - break label777; // L: 11585 - } - } - } - } else { - var37 = new ScriptEvent(); // L: 11571 - var37.widget = var9; // L: 11572 - var37.args = var9.onStatTransmit; // L: 11573 - Client.scriptEvents.addFirst(var37); // L: 11574 - } - - var9.field3433 = Client.changedSkillsCount; // L: 11590 - } - - if (Client.chatCycle > var9.field3478 && var9.onChatTransmit != null) { // L: 11592 - var37 = new ScriptEvent(); // L: 11593 - var37.widget = var9; // L: 11594 - var37.args = var9.onChatTransmit; // L: 11595 - Client.scriptEvents.addFirst(var37); // L: 11596 - } - - if (Client.field701 > var9.field3478 && var9.onFriendTransmit != null) { // L: 11598 - var37 = new ScriptEvent(); // L: 11599 - var37.widget = var9; // L: 11600 - var37.args = var9.onFriendTransmit; // L: 11601 - Client.scriptEvents.addFirst(var37); // L: 11602 - } - - if (Client.field702 > var9.field3478 && var9.onClanTransmit != null) { // L: 11604 - var37 = new ScriptEvent(); // L: 11605 - var37.widget = var9; // L: 11606 - var37.args = var9.onClanTransmit; // L: 11607 - Client.scriptEvents.addFirst(var37); // L: 11608 - } - - if (Client.field703 > var9.field3478 && var9.field3454 != null) { // L: 11610 - var37 = new ScriptEvent(); // L: 11611 - var37.widget = var9; // L: 11612 - var37.args = var9.field3454; // L: 11613 - Client.scriptEvents.addFirst(var37); // L: 11614 - } - - if (Client.field755 > var9.field3478 && var9.field3455 != null) { // L: 11616 - var37 = new ScriptEvent(); // L: 11617 - var37.widget = var9; // L: 11618 - var37.args = var9.field3455; // L: 11619 - Client.scriptEvents.addFirst(var37); // L: 11620 - } - - if (Client.field705 > var9.field3478 && var9.onStockTransmit != null) { // L: 11622 - var37 = new ScriptEvent(); // L: 11623 - var37.widget = var9; // L: 11624 - var37.args = var9.onStockTransmit; // L: 11625 - Client.scriptEvents.addFirst(var37); // L: 11626 - } - - if (Client.field706 > var9.field3478 && var9.field3432 != null) { // L: 11628 - var37 = new ScriptEvent(); // L: 11629 - var37.widget = var9; // L: 11630 - var37.args = var9.field3432; // L: 11631 - Client.scriptEvents.addFirst(var37); // L: 11632 - } - - if (Client.field707 > var9.field3478 && var9.onMiscTransmit != null) { // L: 11634 - var37 = new ScriptEvent(); // L: 11635 - var37.widget = var9; // L: 11636 - var37.args = var9.onMiscTransmit; // L: 11637 - Client.scriptEvents.addFirst(var37); // L: 11638 - } - - var9.field3478 = Client.cycleCntr; // L: 11640 - if (var9.onKey != null) { // L: 11641 - for (var40 = 0; var40 < Client.field731; ++var40) { // L: 11642 - ScriptEvent var38 = new ScriptEvent(); // L: 11643 - var38.widget = var9; // L: 11644 - var38.keyTyped = Client.field733[var40]; // L: 11645 - var38.keyPressed = Client.field732[var40]; // L: 11646 - var38.args = var9.onKey; // L: 11647 - Client.scriptEvents.addFirst(var38); // L: 11648 - } - } - - ScriptEvent var32; - if (var9.field3416 != null) { // L: 11651 - var22 = FontName.method7414(); // L: 11652 - - for (var29 = 0; var29 < var22.length; ++var29) { // L: 11653 - var32 = new ScriptEvent(); // L: 11654 - var32.widget = var9; // L: 11655 - var32.keyTyped = var22[var29]; // L: 11656 - var32.args = var9.field3416; // L: 11657 - Client.scriptEvents.addFirst(var32); // L: 11658 - } - } - - if (var9.field3451 != null) { // L: 11661 - var22 = class118.method2748(); // L: 11662 - - for (var29 = 0; var29 < var22.length; ++var29) { // L: 11663 - var32 = new ScriptEvent(); // L: 11664 - var32.widget = var9; // L: 11665 - var32.keyTyped = var22[var29]; // L: 11666 - var32.args = var9.field3451; // L: 11667 - Client.scriptEvents.addFirst(var32); // L: 11668 - } - } - } - } - - if (!var9.isIf3) { // L: 11673 - if (Client.clickedWidget != null || class142.dragInventoryWidget != null || Client.isMenuOpen) { // L: 11674 - 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: 11675 - if (var9.mouseOverRedirect >= 0) { // L: 11676 - DevicePcmPlayerProvider.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; - } else { - DevicePcmPlayerProvider.mousedOverWidgetIf1 = var9; // L: 11677 - } - } - - if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11679 - GrandExchangeOfferOwnWorldComparator.field486 = var9; // L: 11680 - } - - if (var9.scrollHeight > var9.height) { // L: 11682 - class129.method2861(var9, var26 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); - } - } - - if (var9.type == 0) { // L: 11684 - updateInterface(var0, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); // L: 11685 - if (var9.children != null) { // L: 11686 - updateInterface(var9.children, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); - } - - InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); // L: 11687 - if (var30 != null) { // L: 11688 - if (var30.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 11689 - for (ScriptEvent var31 = (ScriptEvent)Client.scriptEvents.last(); var31 != null; var31 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11690 - if (var31.isMouseInputEvent) { // L: 11691 - var31.remove(); // L: 11692 - var31.widget.containsMouse = false; // L: 11693 - } - } - - if (class124.widgetDragDuration == 0) { // L: 11696 - Client.clickedWidget = null; // L: 11697 - Client.clickedWidgetParent = null; // L: 11698 - } - - if (!Client.isMenuOpen) { // L: 11700 - ByteArrayPool.addCancelMenuEntry(); // L: 11701 - } - } - - Language.updateRootInterface(var30.group, var12, var13, var14, var15, var26, var11); // L: 11704 - } - } - } + throw new RuntimeException(); // L: 42 } } } + } - } // L: 11708 + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-1753178254" + ) + public static int method3273(int var0, int var1, int var2) { + var2 &= 3; // L: 9 + if (var2 == 0) { // L: 10 + return var1; + } else if (var2 == 1) { // L: 11 + return 7 - var0; + } else { + return var2 == 2 ? 7 - var1 : var0; // L: 12 + } + } } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index 94ea37af6a..73b2534a15 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -1,22 +1,26 @@ -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("kg") +@ObfuscatedName("kn") @Implements("Varps") public class Varps { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("Varps_masks") static int[] Varps_masks; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("Varps_temp") public static int[] Varps_temp; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("Varps_main") public static int[] Varps_main; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -995653473 + ) + public static int field3348; static { Varps_masks = new int[32]; // L: 6 @@ -31,48 +35,27 @@ public class Varps { Varps_main = new int[4000]; // L: 17 } - @ObfuscatedName("j") + @ObfuscatedName("kj") @ObfuscatedSignature( - descriptor = "(Lff;III)Lay;", - garbageValue = "-1753293698" + descriptor = "(I)V", + garbageValue = "-20299938" ) - public static final PcmPlayer method5523(TaskHandler var0, int var1, int var2) { - if (var1 >= 0 && var1 < 2) { // L: 53 - if (var2 < 256) { // L: 54 - var2 = 256; + static final void method5366() { + PacketBufferNode var0 = WallDecoration.getPacketBufferNode(ClientPacket.field3001, Client.packetWriter.isaacCipher); // L: 12197 + Client.packetWriter.addNode(var0); // L: 12198 + Interpreter.field833 = true; // L: 12199 + + for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 12200 + if (var1.type == 0 || var1.type == 3) { // L: 12201 + NetSocket.closeInterface(var1, true); } - - try { - PcmPlayer var3 = class384.pcmPlayerProvider.player(); // L: 56 - var3.samples = new int[(PcmPlayer.PcmPlayer_stereo ? 2 : 1) * 256]; // L: 57 - var3.field289 = 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 (PcmPlayer.field295 > 0 && class6.soundSystem == null) { // L: 63 - class6.soundSystem = new SoundSystem(); // L: 64 - WorldMapSection1.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 65 - WorldMapSection1.soundSystemExecutor.scheduleAtFixedRate(class6.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 66 - } - - if (class6.soundSystem != null) { // L: 68 - if (class6.soundSystem.players[var1] != null) { // L: 69 - throw new IllegalArgumentException(); - } - - class6.soundSystem.players[var1] = var3; // L: 70 - } - - return var3; // L: 72 - } catch (Throwable var4) { // L: 74 - return new PcmPlayer(); // L: 75 - } - } else { - throw new IllegalArgumentException(); } - } + + if (Client.meslayerContinueWidget != null) { // L: 12203 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(Client.meslayerContinueWidget); // L: 12204 + Client.meslayerContinueWidget = null; // L: 12205 + } + + Interpreter.field833 = false; // L: 12207 + } // L: 12208 } diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index fc50a138f2..27a34afab2 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -3,38 +3,35 @@ 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("hq") @Implements("VertexNormal") public class VertexNormal { - @ObfuscatedName("fr") + @ObfuscatedName("y") + @Export("musicTrackBoolean") + public static boolean musicTrackBoolean; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 648708493 - ) - static int field2816; - @ObfuscatedName("fk") - static int[] field2817; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -1023458973 + intValue = -1611890735 ) @Export("x") int x; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 476237239 + intValue = -1317140331 ) @Export("y") int y; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 443287667 + intValue = -1313814185 ) @Export("z") int z; - @ObfuscatedName("b") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1525628645 + intValue = -140777267 ) @Export("magnitude") int magnitude; @@ -43,7 +40,7 @@ public class VertexNormal { } // L: 9 @ObfuscatedSignature( - descriptor = "(Lil;)V" + descriptor = "(Lhq;)V" ) VertexNormal(VertexNormal var1) { this.x = var1.x; // L: 12 @@ -51,4 +48,106 @@ public class VertexNormal { this.z = var1.z; // L: 14 this.magnitude = var1.magnitude; // L: 15 } // L: 16 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "([BIILgm;[Lgh;I)V", + garbageValue = "1258473282" + ) + static final void method4376(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { + Buffer var5 = new Buffer(var0); // L: 251 + int var6 = -1; // L: 252 + + while (true) { + int var7 = var5.method7531(); // L: 254 + if (var7 == 0) { // L: 255 + return; // L: 279 + } + + var6 += var7; // L: 256 + int var8 = 0; // L: 257 + + while (true) { + int var9 = var5.readUShortSmart(); // L: 259 + if (var9 == 0) { // L: 260 + break; + } + + var8 += var9 - 1; // L: 261 + int var10 = var8 & 63; // L: 262 + int var11 = var8 >> 6 & 63; // L: 263 + int var12 = var8 >> 12; // L: 264 + int var13 = var5.readUnsignedByte(); // L: 265 + int var14 = var13 >> 2; // L: 266 + int var15 = var13 & 3; // L: 267 + int var16 = var11 + var1; // L: 268 + int var17 = var10 + var2; // L: 269 + if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { // L: 270 + int var18 = var12; // L: 271 + if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { // L: 272 + var18 = var12 - 1; + } + + CollisionMap var19 = null; // L: 273 + if (var18 >= 0) { // L: 274 + var19 = var4[var18]; + } + + class19.addObjects(var12, var16, var17, var6, var15, var14, var3, var19); // L: 275 + } + } + } + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(ILbb;ZB)I", + garbageValue = "85" + ) + static int method4377(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3744 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = ClanChannelMember.getWindowedMode(); // L: 3745 + return 1; // L: 3746 + } else { + int var3; + if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3748 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3749 + if (var3 == 1 || var3 == 2) { // L: 3750 + Widget.setWindowedMode(var3); + } + + return 1; // L: 3751 + } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3753 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class12.clientPreferences.method2274(); // L: 3754 + return 1; // L: 3755 + } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3757 + if (var0 == 5310) { // L: 3764 + --class12.Interpreter_intStackSize; // L: 3765 + return 1; // L: 3766 + } else if (var0 == 5311) { // L: 3768 + class12.Interpreter_intStackSize -= 2; // L: 3769 + return 1; // L: 3770 + } else if (var0 == 5312) { // L: 3772 + --class12.Interpreter_intStackSize; // L: 3773 + return 1; // L: 3774 + } else if (var0 == 5350) { // L: 3776 + class9.Interpreter_stringStackSize -= 2; // L: 3777 + --class12.Interpreter_intStackSize; // L: 3778 + return 1; // L: 3779 + } else if (var0 == 5351) { // L: 3781 + --class9.Interpreter_stringStackSize; // L: 3782 + return 1; // L: 3783 + } else { + return 2; // L: 3785 + } + } else { + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3758 + if (var3 == 1 || var3 == 2) { // L: 3759 + class12.clientPreferences.method2245(var3); // L: 3760 + } + + return 1; // L: 3762 + } + } + } } diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index d562dd9fda..a6e5daf503 100644 --- a/runescape-client/src/main/java/VerticalAlignment.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -3,104 +3,112 @@ 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("fg") +@ObfuscatedName("fk") @Implements("VerticalAlignment") public enum VerticalAlignment implements MouseWheel { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfk;" ) - field1935(2, 0), - @ObfuscatedName("c") + field2001(0, 0), + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfk;" ) @Export("VerticalAlignment_centered") VerticalAlignment_centered(1, 1), - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfk;" ) - field1932(0, 2); + field1994(2, 2); - @ObfuscatedName("dh") - @ObfuscatedSignature( - descriptor = "Lfx;" - ) - @Export("js5SocketTask") - static Task js5SocketTask; - @ObfuscatedName("gl") - @ObfuscatedSignature( - descriptor = "Lck;" - ) - @Export("urlRequester") - static UrlRequester urlRequester; - @ObfuscatedName("f") + @ObfuscatedName("t") + static int[][][] field1993; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 609598821 + intValue = -1914691403 ) @Export("value") public final int value; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -2060500087 + intValue = -156992359 ) @Export("id") final int id; VerticalAlignment(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("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 23 + return this.id; // L: 20 } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lbb;Lbb;IZIZI)I", - garbageValue = "-1569793930" + descriptor = "(I)V", + garbageValue = "-1009266230" ) - static int method3538(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { - int var6 = SpriteMask.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 = SpriteMask.compareWorlds(var0, var1, var4, var5); // L: 205 - return var5 ? -var7 : var7; // L: 206 - } - } + public static void method3446() { + ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 547 + } // L: 548 - @ObfuscatedName("ao") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lgj;I)Z", - garbageValue = "1046018492" + descriptor = "(ILbb;ZB)I", + garbageValue = "-27" ) - static boolean method3539(ObjectComposition var0) { - if (var0.transforms != null) { // L: 585 - int[] var1 = var0.transforms; // L: 587 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 588 - int var3 = var1[var2]; // L: 589 - ObjectComposition var4 = class146.getObjectDefinition(var3); // L: 591 - if (var4.mapIconId != -1) { // L: 592 - return true; // L: 593 - } + static int method3447(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1410 + var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1411 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.itemId; // L: 1412 + return 1; // L: 1413 + } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1415 + var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1416 + if (var3.itemId != -1) { // L: 1417 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1418 } - } else if (var0.mapIconId != -1) { // L: 599 - return true; // L: 600 - } - return false; // L: 602 + return 1; // L: 1419 + } else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1421 + int var5 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1422 + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); // L: 1423 + if (var4 != null) { // L: 1424 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1425 + } + + return 1; // L: 1426 + } else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1428 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1429 + return 1; // L: 1430 + } else if (var0 == 1707) { // L: 1432 + var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1433 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.method5498() ? 1 : 0; // L: 1434 + return 1; // L: 1435 + } else if (var0 == 1708) { // L: 1437 + var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1438 + return class293.method5430(var3); // L: 1439 + } else if (var0 == 1708) { // L: 1441 + var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1442 + return class20.method269(var3); // L: 1443 + } else { + return 2; // L: 1445 + } } } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index 1366e5daa7..6cc89545e2 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -3,68 +3,45 @@ 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("in") +@ObfuscatedName("hi") @Implements("ViewportMouse") public class ViewportMouse { - @ObfuscatedName("st") - @ObfuscatedSignature( - descriptor = "Lay;" - ) - @Export("pcmPlayer1") - static PcmPlayer pcmPlayer1; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("ViewportMouse_isInViewport") public static boolean ViewportMouse_isInViewport; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 1903287325 - ) - @Export("ViewportMouse_x") - public static int ViewportMouse_x; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 322199893 - ) - @Export("ViewportMouse_y") - public static int ViewportMouse_y; - @ObfuscatedName("f") - @Export("ViewportMouse_false0") - public static boolean ViewportMouse_false0; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -431054751 - ) - static int field2802; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1402550959 - ) - static int field2805; @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -276012747 + intValue = 1945056399 ) - static int field2804; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lqi;" - ) - @Export("rightTitleSprite") - static SpritePixels rightTitleSprite; - @ObfuscatedName("p") + @Export("ViewportMouse_x") + static int ViewportMouse_x; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1834346387 + intValue = -1225811149 ) - static int field2808; + @Export("ViewportMouse_y") + static int ViewportMouse_y; @ObfuscatedName("k") + @Export("ViewportMouse_false0") + static boolean ViewportMouse_false0; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 291985385 + intValue = 1930165541 + ) + static int field2635; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -783601851 + ) + static int field2630; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 608369071 ) @Export("ViewportMouse_entityCount") public static int ViewportMouse_entityCount; - @ObfuscatedName("d") + @ObfuscatedName("t") @Export("ViewportMouse_entityTags") public static long[] ViewportMouse_entityTags; @@ -79,158 +56,688 @@ public class ViewportMouse { @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "([BI)Lmd;", - garbageValue = "-2081497331" + descriptor = "(Llp;III)Lqd;", + garbageValue = "-1263011197" ) - static Font method5090(byte[] var0) { - if (var0 == null) { // L: 188 + static IndexedSprite method4372(AbstractArchive var0, int var1, int var2) { + if (!User.method6514(var0, var1, var2)) { // L: 45 return null; } else { - Font var1 = new Font(var0, class451.SpriteBuffer_xOffsets, class271.SpriteBuffer_yOffsets, class451.SpriteBuffer_spriteWidths, class451.SpriteBuffer_spriteHeights, NetFileRequest.SpriteBuffer_spritePalette, FriendLoginUpdate.SpriteBuffer_pixels); // L: 189 - ArchiveDiskActionHandler.method5813(); // L: 190 - return var1; // L: 191 + IndexedSprite var4 = new IndexedSprite(); // L: 48 + var4.width = class453.SpriteBuffer_spriteWidth; // L: 49 + var4.height = class453.SpriteBuffer_spriteHeight; // L: 50 + var4.xOffset = class453.SpriteBuffer_xOffsets[0]; // L: 51 + var4.yOffset = class453.SpriteBuffer_yOffsets[0]; // L: 52 + var4.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[0]; // L: 53 + var4.subHeight = class453.SpriteBuffer_spriteHeights[0]; // L: 54 + var4.palette = Decimator.SpriteBuffer_spritePalette; // L: 55 + var4.pixels = class127.SpriteBuffer_pixels[0]; // L: 56 + VarcInt.method3325(); // L: 57 + return var4; // L: 60 } } - @ObfuscatedName("h") + @ObfuscatedName("io") @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "-41" + descriptor = "([Lki;IIIIIIIII)V", + garbageValue = "497797747" ) - static int method5089(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 2124 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.cycle; // L: 2125 - return 1; // L: 2126 - } else { - int var3; - int var4; - if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 2128 - Interpreter.Interpreter_intStackSize -= 2; // L: 2129 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2130 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2131 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseRecorder.method2093(var3, var4); // L: 2132 - return 1; // L: 2133 - } else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 2135 - Interpreter.Interpreter_intStackSize -= 2; // L: 2136 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2137 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2138 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class385.ItemContainer_getCount(var3, var4); // L: 2139 - return 1; // L: 2140 - } else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 2142 - Interpreter.Interpreter_intStackSize -= 2; // L: 2143 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2144 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2145 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class67.method1910(var3, var4); // L: 2146 - return 1; // L: 2147 - } else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 2149 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2150 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Script.getInvDefinition(var3).size; // L: 2151 - return 1; // L: 2152 - } else if (var0 == ScriptOpcodes.STAT) { // L: 2154 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2155 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 2156 - return 1; // L: 2157 - } else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 2159 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2160 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 2161 - return 1; // L: 2162 - } else if (var0 == ScriptOpcodes.STAT_XP) { // L: 2164 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2165 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 2166 - return 1; // L: 2167 - } else { - int var5; - if (var0 == ScriptOpcodes.COORD) { // L: 2169 - var3 = class18.Client_plane; // L: 2170 - var4 = (GrandExchangeEvents.localPlayer.x >> 7) + GrandExchangeOfferOwnWorldComparator.baseX; // L: 2171 - var5 = (GrandExchangeEvents.localPlayer.y >> 7) + VarcInt.baseY; // L: 2172 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 2173 - return 1; // L: 2174 - } else if (var0 == ScriptOpcodes.COORDX) { // L: 2176 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2177 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 2178 - return 1; // L: 2179 - } else if (var0 == ScriptOpcodes.COORDZ) { // L: 2181 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2182 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 28; // L: 2183 - return 1; // L: 2184 - } else if (var0 == ScriptOpcodes.COORDY) { // L: 2186 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2187 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & 16383; // L: 2188 - return 1; // L: 2189 - } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 2191 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 2192 - return 1; // L: 2193 - } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 2195 - Interpreter.Interpreter_intStackSize -= 2; // L: 2196 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; // L: 2197 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2198 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseRecorder.method2093(var3, var4); // L: 2199 - return 1; // L: 2200 - } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 2202 - Interpreter.Interpreter_intStackSize -= 2; // L: 2203 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; // L: 2204 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2205 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class385.ItemContainer_getCount(var3, var4); // L: 2206 - return 1; // L: 2207 - } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 2209 - Interpreter.Interpreter_intStackSize -= 2; // L: 2210 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; // L: 2211 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2212 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class67.method1910(var3, var4); // L: 2213 - return 1; // L: 2214 - } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 2216 - if (Client.staffModLevel >= 2) { // L: 2217 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.staffModLevel; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2218 - } + @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: 10217 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 10218 - return 1; // L: 2219 - } else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 2221 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 2222 - return 1; // L: 2223 - } else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 2225 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldId; // L: 2226 - return 1; // L: 2227 - } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 2229 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 2230 - return 1; // L: 2231 - } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 2233 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.weight; // L: 2234 - return 1; // L: 2235 - } else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 2237 - if (Client.playerMod) { // L: 2238 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2239 - } - - return 1; // L: 2240 - } else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 2242 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 2243 - return 1; // L: 2244 - } else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 2246 - Interpreter.Interpreter_intStackSize -= 4; // L: 2247 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2248 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2249 - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2250 - int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 2251 - var3 += var4 << 14; // L: 2252 - var3 += var5 << 28; // L: 2253 - var3 += var6; // L: 2254 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 2255 - return 1; // L: 2256 - } else if (var0 == 3326) { // L: 2258 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.field508; // L: 2259 - return 1; // L: 2260 - } else if (var0 == 3327) { // L: 2262 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.field509; // L: 2263 - return 1; // L: 2264 + for (int var9 = 0; var9 < var0.length; ++var9) { // L: 10219 + Widget var10 = var0[var9]; // L: 10220 + if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 10221 10222 + int var11; + if (var8 == -1) { // L: 10224 + Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 10225 + Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 10226 + Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 10227 + Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 10228 + var11 = ++Client.rootWidgetCount - 1; // L: 10229 } else { - return 2; // L: 2266 + var11 = var8; // L: 10231 + } + + var10.rootIndex = var11; // L: 10232 + var10.cycle = Client.cycle; // L: 10233 + if (!var10.isIf3 || !class434.isComponentHidden(var10)) { // L: 10234 + if (var10.contentType > 0) { // L: 10235 + WorldMapDecorationType.method5575(var10); + } + + int var12 = var10.x + var6; // L: 10236 + int var13 = var7 + var10.y; // L: 10237 + int var14 = var10.transparencyTop; // L: 10238 + int var15; + int var16; + if (var10 == Client.clickedWidget) { // L: 10239 + if (var1 != -1412584499 && !var10.isScrollBar) { // L: 10240 + BuddyRankComparator.field1408 = var0; // L: 10241 + class151.field1729 = var6; // L: 10242 + class162.field1810 = var7; // L: 10243 + continue; // L: 10244 + } + + if (Client.isDraggingWidget && Client.field574) { // L: 10246 + var15 = MouseHandler.MouseHandler_x; // L: 10247 + var16 = MouseHandler.MouseHandler_y; // L: 10248 + var15 -= Client.widgetClickX; // L: 10249 + var16 -= Client.widgetClickY; // L: 10250 + if (var15 < Client.field747) { // L: 10251 + var15 = Client.field747; + } + + if (var15 + var10.width > Client.field747 + Client.clickedWidgetParent.width) { // L: 10252 + var15 = Client.field747 + Client.clickedWidgetParent.width - var10.width; + } + + if (var16 < Client.field674) { // L: 10253 + var16 = Client.field674; + } + + if (var16 + var10.height > Client.field674 + Client.clickedWidgetParent.height) { // L: 10254 + var16 = Client.field674 + Client.clickedWidgetParent.height - var10.height; + } + + var12 = var15; // L: 10255 + var13 = var16; // L: 10256 + } + + if (!var10.isScrollBar) { // L: 10258 + var14 = 128; + } + } + + int var17; + int var18; + int var19; + int var20; + int var21; + int var22; + if (var10.type == 2) { // L: 10264 + var15 = var2; // L: 10265 + var16 = var3; // L: 10266 + var17 = var4; // L: 10267 + var18 = var5; // L: 10268 + } else if (var10.type == 9) { // L: 10270 + var19 = var12; // L: 10271 + var20 = var13; // L: 10272 + var21 = var12 + var10.width; // L: 10273 + var22 = var13 + var10.height; // L: 10274 + if (var21 < var12) { // L: 10275 + var19 = var21; // L: 10277 + var21 = var12; // L: 10278 + } + + if (var22 < var13) { // L: 10280 + var20 = var22; // L: 10282 + var22 = var13; // L: 10283 + } + + ++var21; // L: 10285 + ++var22; // L: 10286 + var15 = var19 > var2 ? var19 : var2; // L: 10287 + var16 = var20 > var3 ? var20 : var3; // L: 10288 + var17 = var21 < var4 ? var21 : var4; // L: 10289 + var18 = var22 < var5 ? var22 : var5; // L: 10290 + } else { + var19 = var12 + var10.width; // L: 10293 + var20 = var13 + var10.height; // L: 10294 + var15 = var12 > var2 ? var12 : var2; // L: 10295 + var16 = var13 > var3 ? var13 : var3; // L: 10296 + var17 = var19 < var4 ? var19 : var4; // L: 10297 + var18 = var20 < var5 ? var20 : var5; // L: 10298 + } + + if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 10300 + if (var10.contentType != 0) { // L: 10301 + if (var10.contentType == 1336) { // L: 10302 + if (class12.clientPreferences.method2229()) { // L: 10303 + var13 += 15; // L: 10304 + class149.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 10305 + var13 += 15; // L: 10306 + Runtime var42 = Runtime.getRuntime(); // L: 10307 + var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 10308 + var21 = 16776960; // L: 10309 + if (var20 > 327680 && !Client.isLowDetail) { // L: 10310 + var21 = 16711680; + } + + class149.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 10311 + var13 += 15; // L: 10312 + } + continue; + } + + if (var10.contentType == 1337) { // L: 10316 + Client.viewportX = var12; // L: 10317 + Client.viewportY = var13; // L: 10318 + ArchiveLoader.drawEntities(var12, var13, var10.width, var10.height); // L: 10319 + Client.field652[var10.rootIndex] = true; // L: 10320 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10321 + continue; // L: 10322 + } + + if (var10.contentType == 1338) { // L: 10324 + class19.drawMinimap(var10, var12, var13, var11); // L: 10325 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10326 + continue; // L: 10327 + } + + if (var10.contentType == 1339) { // L: 10329 + class18.drawCompass(var10, var12, var13, var11); // L: 10330 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10331 + continue; // L: 10332 + } + + if (var10.contentType == 1400) { // L: 10334 + ServerPacket.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 10335 + } + + if (var10.contentType == 1401) { // L: 10337 + ServerPacket.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 10338 + } + + if (var10.contentType == 1402) { // L: 10340 + class193.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 10341 + } + } + + if (var10.type == 0) { // L: 10344 + if (!var10.isIf3 && class434.isComponentHidden(var10) && var10 != class144.mousedOverWidgetIf1) { // L: 10345 + continue; + } + + if (!var10.isIf3) { // L: 10346 + if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 10347 + var10.scrollY = var10.scrollHeight - var10.height; + } + + if (var10.scrollY < 0) { // L: 10348 + var10.scrollY = 0; + } + } + + drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 10350 + if (var10.children != null) { // L: 10351 + 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: 10352 + if (var30 != null) { // L: 10353 + class175.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 10354 + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10356 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 10357 + } else if (var10.type == 11) { // L: 10359 + if (class434.isComponentHidden(var10) && var10 != class144.mousedOverWidgetIf1) { // L: 10360 + continue; + } + + if (var10.children != null) { // L: 10361 + drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10362 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 10363 + } + + if (Client.isResizable || Client.field524[var11] || Client.gameDrawingMode > 1) { // L: 10365 + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 10366 10367 + JagexCache.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); + } + + if (var10.type != 1) { // L: 10369 + int var23; + int var24; + int var25; + int var26; + if (var10.type == 2) { // L: 10372 + var19 = 0; // L: 10373 + + for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 10374 + for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 10375 + var22 = var12 + var21 * (var10.paddingX + 32); // L: 10376 + var23 = var13 + var20 * (var10.paddingY + 32); // L: 10377 + if (var19 < 20) { // L: 10378 + var22 += var10.inventoryXOffsets[var19]; // L: 10379 + var23 += var10.inventoryYOffsets[var19]; // L: 10380 + } + + if (var10.itemIds[var19] <= 0) { // L: 10382 + if (var10.inventorySprites != null && var19 < 20) { // L: 10427 + SpritePixels var46 = var10.getInventorySprite(var19); // L: 10428 + if (var46 != null) { // L: 10429 + var46.drawTransBgAt(var22, var23); + } else if (Widget.field3407) { // L: 10430 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10); + } + } + } else { + boolean var37 = false; // L: 10383 + boolean var38 = false; // L: 10384 + var26 = var10.itemIds[var19] - 1; // L: 10385 + if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == Canvas.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 10386 + SpritePixels var35; + if (Client.isItemSelected == 1 && var19 == PcmPlayer.selectedItemSlot && var10.id == class20.selectedItemWidget) { // L: 10388 + var35 = PacketWriter.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); + } else { + var35 = PacketWriter.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 10389 + } + + if (var35 != null) { // L: 10390 + if (var10 == Canvas.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 10391 + var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 10392 + var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 10393 + if (var24 < 5 && var24 > -5) { // L: 10394 + var24 = 0; + } + + if (var25 < 5 && var25 > -5) { // L: 10395 + var25 = 0; + } + + if (Client.itemDragDuration < 5) { // L: 10396 + var24 = 0; // L: 10397 + var25 = 0; // L: 10398 + } + + var35.drawTransAt(var22 + var24, var25 + var23, 128); // L: 10400 + if (var1 != -1) { // L: 10401 + Widget var28 = var0[var1 & 65535]; // L: 10402 + int var29; + if (var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 10403 + var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field727 / 3; // L: 10404 + if (var29 > Client.field727 * 10) { // L: 10405 + var29 = Client.field727 * 10; + } + + if (var29 > var28.scrollY) { // L: 10406 + var29 = var28.scrollY; + } + + var28.scrollY -= var29; // L: 10407 + Client.draggedWidgetY += var29; // L: 10408 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var28); // L: 10409 + } + + if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 10411 + var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field727 / 3; // L: 10412 + if (var29 > Client.field727 * 10) { // L: 10413 + var29 = Client.field727 * 10; + } + + if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 10414 + var29 = var28.scrollHeight - var28.height - var28.scrollY; + } + + var28.scrollY += var29; // L: 10415 + Client.draggedWidgetY -= var29; // L: 10416 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var28); // L: 10417 + } + } + } else if (var10 == NPCComposition.field1991 && var19 == Client.field599) { // L: 10421 + var35.drawTransAt(var22, var23, 128); + } else { + var35.drawTransBgAt(var22, var23); // L: 10422 + } + } else { + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10); // L: 10424 + } + } + } + + ++var19; // L: 10432 + } + } + } else if (var10.type == 3) { // L: 10437 + if (class401.runCs1(var10)) { // L: 10439 + var19 = var10.color2; // L: 10440 + if (var10 == class144.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 10441 + var19 = var10.mouseOverColor2; + } + } else { + var19 = var10.color; // L: 10444 + if (var10 == class144.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 10445 + var19 = var10.mouseOverColor; + } + } + + if (var10.fill) { // L: 10447 + switch(var10.fillMode.field4756) { // L: 10448 + case 1: + Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 10457 + break; // L: 10458 + case 2: + Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 10450 + break; // L: 10451 + default: + if (var14 == 0) { // L: 10453 + 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: 10454 + } + } + } else if (var14 == 0) { // L: 10462 + 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: 10463 + } + } else { + Font var39; + if (var10.type == 4) { // L: 10467 + var39 = var10.getFont(); // L: 10468 + if (var39 == null) { // L: 10469 + if (Widget.field3407) { // L: 10470 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10); + } + } else { + String var44 = var10.text; // L: 10474 + if (class401.runCs1(var10)) { // L: 10475 + var20 = var10.color2; // L: 10476 + if (var10 == class144.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 10477 + var20 = var10.mouseOverColor2; + } + + if (var10.text2.length() > 0) { // L: 10478 + var44 = var10.text2; + } + } else { + var20 = var10.color; // L: 10481 + if (var10 == class144.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 10482 + var20 = var10.mouseOverColor; + } + } + + if (var10.isIf3 && var10.itemId != -1) { // L: 10484 + ItemComposition var45 = FileSystem.ItemDefinition_get(var10.itemId); // L: 10485 + var44 = var45.name; // L: 10486 + if (var44 == null) { // L: 10487 + var44 = "null"; + } + + if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 10488 + var44 = class166.colorStartTag(16748608) + var44 + "" + " " + 'x' + class427.formatItemStacks(var10.itemQuantity); + } + } + + if (var10 == Client.meslayerContinueWidget) { // L: 10490 + var44 = "Please wait..."; // L: 10491 + var20 = var10.color; // L: 10492 + } + + if (!var10.isIf3) { // L: 10494 + var44 = Clock.method3248(var44, var10); + } + + var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 10495 + } + } else if (var10.type == 5) { // L: 10498 + SpritePixels var40; + if (!var10.isIf3) { // L: 10499 + var40 = var10.getSprite(class401.runCs1(var10), UserComparator7.urlRequester); // L: 10500 + if (var40 != null) { // L: 10501 + var40.drawTransBgAt(var12, var13); + } else if (Widget.field3407) { // L: 10502 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10); + } + } else { + if (var10.itemId != -1) { // L: 10506 + var40 = PacketWriter.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); + } else { + var40 = var10.getSprite(false, UserComparator7.urlRequester); // L: 10507 + } + + if (var40 == null) { // L: 10508 + if (Widget.field3407) { // L: 10532 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10); + } + } else { + var20 = var40.width; // L: 10509 + var21 = var40.height; // L: 10510 + if (!var10.spriteTiling) { // L: 10511 + var22 = var10.width * 4096 / var20; // L: 10525 + if (var10.spriteAngle != 0) { // L: 10526 + var40.method7951(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); + } else if (var14 != 0) { // L: 10527 + var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); + } else if (var20 == var10.width && var21 == var10.height) { // L: 10528 + var40.drawTransBgAt(var12, var13); // L: 10529 + } else { + var40.drawScaledAt(var12, var13, var10.width, var10.height); + } + } else { + Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 10512 + var22 = (var20 - 1 + var10.width) / var20; // L: 10513 + var23 = (var21 - 1 + var10.height) / var21; // L: 10514 + + for (var24 = 0; var24 < var22; ++var24) { // L: 10515 + for (var25 = 0; var25 < var23; ++var25) { // L: 10516 + if (var10.spriteAngle != 0) { // L: 10517 + var40.method7951(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096); + } else if (var14 != 0) { // L: 10518 + var40.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255)); + } else { + var40.drawTransBgAt(var12 + var20 * var24, var13 + var25 * var21); // L: 10519 + } + } + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10522 + } + } + } + } else { + ItemComposition var33; + if (var10.type == 6) { // L: 10536 + boolean var36 = class401.runCs1(var10); // L: 10537 + if (var36) { // L: 10539 + var20 = var10.sequenceId2; + } else { + var20 = var10.sequenceId; // L: 10540 + } + + Model var41 = null; // L: 10541 + var22 = 0; // L: 10542 + if (var10.itemId != -1) { // L: 10543 + var33 = FileSystem.ItemDefinition_get(var10.itemId); // L: 10544 + if (var33 != null) { // L: 10545 + var33 = var33.getCountObj(var10.itemQuantity); // L: 10546 + var41 = var33.getModel(1); // L: 10547 + if (var41 != null) { // L: 10548 + var41.calculateBoundsCylinder(); // L: 10549 + var22 = var41.height / 2; // L: 10550 + } else { + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10); // L: 10552 + } + } + } else if (var10.modelType == 5) { // L: 10555 + if (var10.modelId == 0) { // L: 10556 + var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + } else { + var41 = ModelData0.localPlayer.getModel(); // L: 10557 + } + } else if (var20 == -1) { // L: 10559 + var41 = var10.getModel((SequenceDefinition)null, -1, var36, ModelData0.localPlayer.appearance); // L: 10560 + if (var41 == null && Widget.field3407) { // L: 10561 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10); + } + } else { + SequenceDefinition var47 = class114.SequenceDefinition_get(var20); // L: 10564 + var41 = var10.getModel(var47, var10.modelFrame, var36, ModelData0.localPlayer.appearance); // L: 10565 + if (var41 == null && Widget.field3407) { // L: 10566 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10); + } + } + + Rasterizer3D.method3939(var10.width / 2 + var12, var10.height / 2 + var13); // L: 10568 + var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 10569 + var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 10570 + if (var41 != null) { // L: 10571 + if (!var10.isIf3) { // L: 10572 + var41.method4272(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); + } else { + var41.calculateBoundsCylinder(); // L: 10574 + if (var10.modelOrthog) { // L: 10575 + var41.method4273(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + } else { + var41.method4272(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 10576 + } + } + } + + Rasterizer3D.Rasterizer3D_method3(); // L: 10579 + } else { + if (var10.type == 7) { // L: 10582 + var39 = var10.getFont(); // L: 10583 + if (var39 == null) { // L: 10584 + if (Widget.field3407) { // L: 10585 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10); + } + continue; + } + + var20 = 0; // L: 10588 + + for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 10589 + for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 10590 + if (var10.itemIds[var20] > 0) { // L: 10591 + var33 = FileSystem.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 10592 + String var34; + if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 10594 + var34 = class166.colorStartTag(16748608) + var33.name + ""; // L: 10595 + } else { + var34 = class166.colorStartTag(16748608) + var33.name + "" + " " + 'x' + class427.formatItemStacks(var10.itemQuantities[var20]); + } + + var25 = var12 + var22 * (var10.paddingX + 115); // L: 10596 + var26 = var13 + (var10.paddingY + 12) * var21; // L: 10597 + if (var10.textXAlignment == 0) { // L: 10598 + var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else if (var10.textXAlignment == 1) { // L: 10599 + 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: 10600 + } + } + + ++var20; // L: 10602 + } + } + } + + if (var10.type == 8 && var10 == class113.field1422 && Client.field645 == Client.field702) { // L: 10606 10607 + var19 = 0; // L: 10608 + var20 = 0; // L: 10609 + Font var31 = class149.fontPlain12; // L: 10610 + String var32 = var10.text; // L: 10611 + + String var43; + for (var32 = Clock.method3248(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 10613 10614 10626 + var24 = var32.indexOf("
"); // L: 10615 + if (var24 != -1) { // L: 10616 + var43 = var32.substring(0, var24); // L: 10617 + var32 = var32.substring(var24 + 4); // L: 10618 + } else { + var43 = var32; // L: 10621 + var32 = ""; // L: 10622 + } + + var25 = var31.stringWidth(var43); // L: 10624 + if (var25 > var19) { // L: 10625 + var19 = var25; + } + } + + var19 += 6; // L: 10628 + var20 += 7; // L: 10629 + var24 = var12 + var10.width - 5 - var19; // L: 10630 + var25 = var13 + var10.height + 5; // L: 10631 + if (var24 < var12 + 5) { // L: 10632 + var24 = var12 + 5; + } + + if (var19 + var24 > var4) { // L: 10633 + var24 = var4 - var19; + } + + if (var20 + var25 > var5) { // L: 10634 + var25 = var5 - var20; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 10635 + Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 10636 + var32 = var10.text; // L: 10637 + var26 = var25 + var31.ascent + 2; // L: 10638 + + for (var32 = Clock.method3248(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 10639 10640 10651 + int var27 = var32.indexOf("
"); // L: 10641 + if (var27 != -1) { // L: 10642 + var43 = var32.substring(0, var27); // L: 10643 + var32 = var32.substring(var27 + 4); // L: 10644 + } else { + var43 = var32; // L: 10647 + var32 = ""; // L: 10648 + } + + var31.draw(var43, var24 + 3, var26, 0, -1); // L: 10650 + } + } + + if (var10.type == 9) { // L: 10655 + if (var10.field3428) { // L: 10660 + var19 = var12; // L: 10661 + var20 = var13 + var10.height; // L: 10662 + var21 = var12 + var10.width; // L: 10663 + var22 = var13; // L: 10664 + } else { + var19 = var12; // L: 10667 + var20 = var13; // L: 10668 + var21 = var12 + var10.width; // L: 10669 + var22 = var13 + var10.height; // L: 10670 + } + + if (var10.lineWid == 1) { // L: 10672 + Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 10673 + } else { + class433.method7433(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 10676 + } + } + } + } + } + } + } + } } } } - } + + } // L: 10681 + + @ObfuscatedName("ln") + @ObfuscatedSignature( + descriptor = "(Lpx;II)V", + garbageValue = "-2073465048" + ) + static void method4374(Buffer var0, int var1) { + byte[] var2 = var0.array; // L: 12608 + if (Client.randomDatData == null) { // L: 12610 + Client.randomDatData = new byte[24]; + } + + class351.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); // L: 12611 + if (JagexCache.JagexCache_randomDat != null) { // L: 12614 + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 12616 + JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 12617 + } catch (Exception var4) { // L: 12619 + } + } + + } // L: 12622 } diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java index e141d14fc7..c8b83914fc 100644 --- a/runescape-client/src/main/java/VorbisCodebook.java +++ b/runescape-client/src/main/java/VorbisCodebook.java @@ -2,122 +2,122 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ax") +@ObfuscatedName("ay") @Implements("VorbisCodebook") public class VorbisCodebook { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("dimensions") int dimensions; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("entries") int entries; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("lengthMap") int[] lengthMap; - @ObfuscatedName("f") - int[] field353; - @ObfuscatedName("b") - float[][] field350; - @ObfuscatedName("n") + @ObfuscatedName("k") + int[] field359; + @ObfuscatedName("a") + float[][] field356; + @ObfuscatedName("m") @Export("keys") int[] keys; VorbisCodebook() { - VorbisSample.readBits(24); // L: 41 - this.dimensions = VorbisSample.readBits(16); // L: 42 - this.entries = VorbisSample.readBits(24); // L: 43 - this.lengthMap = new int[this.entries]; // L: 44 - boolean var1 = VorbisSample.readBit() != 0; // L: 45 + VorbisSample.readBits(24); // L: 22 + this.dimensions = VorbisSample.readBits(16); // L: 23 + this.entries = VorbisSample.readBits(24); // L: 24 + this.lengthMap = new int[this.entries]; // L: 25 + boolean var1 = VorbisSample.readBit() != 0; // L: 26 int var2; int var3; int var5; - if (var1) { // L: 46 - var2 = 0; // L: 47 + if (var1) { // L: 27 + var2 = 0; // L: 28 - for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { // L: 48 49 52 - int var4 = VorbisSample.readBits(class143.iLog(this.entries - var2)); // L: 50 + for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { // L: 29 30 33 + int var4 = VorbisSample.readBits(class143.iLog(this.entries - var2)); // L: 31 - for (var5 = 0; var5 < var4; ++var5) { // L: 51 + for (var5 = 0; var5 < var4; ++var5) { // L: 32 this.lengthMap[var2++] = var3; } } } else { - boolean var14 = VorbisSample.readBit() != 0; // L: 56 + boolean var14 = VorbisSample.readBit() != 0; // L: 37 - for (var3 = 0; var3 < this.entries; ++var3) { // L: 57 - if (var14 && VorbisSample.readBit() == 0) { // L: 58 + for (var3 = 0; var3 < this.entries; ++var3) { // L: 38 + if (var14 && VorbisSample.readBit() == 0) { // L: 39 this.lengthMap[var3] = 0; } else { - this.lengthMap[var3] = VorbisSample.readBits(5) + 1; // L: 59 + this.lengthMap[var3] = VorbisSample.readBits(5) + 1; // L: 40 } } } - this.method987(); // L: 62 - var2 = VorbisSample.readBits(4); // L: 63 - if (var2 > 0) { // L: 64 - float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 65 - float var16 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 66 - var5 = VorbisSample.readBits(4) + 1; // L: 67 - boolean var6 = VorbisSample.readBit() != 0; // L: 68 + this.method980(); // L: 43 + var2 = VorbisSample.readBits(4); // L: 44 + if (var2 > 0) { // L: 45 + float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 46 + float var16 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 47 + var5 = VorbisSample.readBits(4) + 1; // L: 48 + boolean var6 = VorbisSample.readBit() != 0; // L: 49 int var7; - if (var2 == 1) { // L: 70 + if (var2 == 1) { // L: 51 var7 = mapType1QuantValues(this.entries, this.dimensions); } else { - var7 = this.entries * this.dimensions; // L: 71 + var7 = this.entries * this.dimensions; // L: 52 } - this.field353 = new int[var7]; // L: 72 + this.field359 = new int[var7]; // L: 53 int var8; - for (var8 = 0; var8 < var7; ++var8) { // L: 73 - this.field353[var8] = VorbisSample.readBits(var5); + for (var8 = 0; var8 < var7; ++var8) { // L: 54 + this.field359[var8] = VorbisSample.readBits(var5); } - this.field350 = new float[this.entries][this.dimensions]; // L: 74 + this.field356 = new float[this.entries][this.dimensions]; // L: 55 float var9; int var10; int var11; - if (var2 == 1) { // L: 75 - for (var8 = 0; var8 < this.entries; ++var8) { // L: 76 - var9 = 0.0F; // L: 77 - var10 = 1; // L: 78 + if (var2 == 1) { // L: 56 + for (var8 = 0; var8 < this.entries; ++var8) { // L: 57 + var9 = 0.0F; // L: 58 + var10 = 1; // L: 59 - for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 79 - int var12 = var8 / var10 % var7; // L: 80 - float var13 = (float)this.field353[var12] * var16 + var15 + var9; // L: 81 - this.field350[var8][var11] = var13; // L: 82 - if (var6) { // L: 83 + for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 60 + int var12 = var8 / var10 % var7; // L: 61 + float var13 = (float)this.field359[var12] * var16 + var15 + var9; // L: 62 + this.field356[var8][var11] = var13; // L: 63 + if (var6) { // L: 64 var9 = var13; } - var10 *= var7; // L: 84 + var10 *= var7; // L: 65 } } } else { - for (var8 = 0; var8 < this.entries; ++var8) { // L: 89 - var9 = 0.0F; // L: 90 - var10 = var8 * this.dimensions; // L: 91 + for (var8 = 0; var8 < this.entries; ++var8) { // L: 70 + var9 = 0.0F; // L: 71 + var10 = var8 * this.dimensions; // L: 72 - for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 92 - float var17 = (float)this.field353[var10] * var16 + var15 + var9; // L: 93 - this.field350[var8][var11] = var17; // L: 94 - if (var6) { // L: 95 + for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 73 + float var17 = (float)this.field359[var10] * var16 + var15 + var9; // L: 74 + this.field356[var8][var11] = var17; // L: 75 + if (var6) { // L: 76 var9 = var17; } - ++var10; // L: 96 + ++var10; // L: 77 } } } } - } // L: 101 + } // L: 82 - @ObfuscatedName("c") - void method987() { - int[] var1 = new int[this.entries]; // L: 104 - int[] var2 = new int[33]; // L: 106 + @ObfuscatedName("q") + void method980() { + int[] var1 = new int[this.entries]; // L: 85 + int[] var2 = new int[33]; // L: 87 int var3; int var4; @@ -126,132 +126,109 @@ public class VorbisCodebook { int var7; int var8; int var10; - for (var3 = 0; var3 < this.entries; ++var3) { // L: 107 - var4 = this.lengthMap[var3]; // L: 108 - if (var4 != 0) { // L: 109 - var5 = 1 << 32 - var4; // L: 110 - var6 = var2[var4]; // L: 111 - var1[var3] = var6; // L: 112 + for (var3 = 0; var3 < this.entries; ++var3) { // L: 88 + var4 = this.lengthMap[var3]; // L: 89 + if (var4 != 0) { // L: 90 + var5 = 1 << 32 - var4; // L: 91 + var6 = var2[var4]; // L: 92 + var1[var3] = var6; // L: 93 int var12; - if ((var6 & var5) != 0) { // L: 114 - var7 = var2[var4 - 1]; // L: 115 + if ((var6 & var5) != 0) { // L: 95 + var7 = var2[var4 - 1]; // L: 96 } else { - var7 = var6 | var5; // L: 118 + var7 = var6 | var5; // L: 99 - for (var8 = var4 - 1; var8 >= 1; --var8) { // L: 119 - var12 = var2[var8]; // L: 120 - if (var12 != var6) { // L: 121 + for (var8 = var4 - 1; var8 >= 1; --var8) { // L: 100 + var12 = var2[var8]; // L: 101 + if (var12 != var6) { // L: 102 break; } - var10 = 1 << 32 - var8; // L: 122 - if ((var12 & var10) != 0) { // L: 123 - var2[var8] = var2[var8 - 1]; // L: 124 - break; // L: 125 + var10 = 1 << 32 - var8; // L: 103 + if ((var12 & var10) != 0) { // L: 104 + var2[var8] = var2[var8 - 1]; // L: 105 + break; // L: 106 } - var2[var8] = var12 | var10; // L: 128 + var2[var8] = var12 | var10; // L: 109 } } - var2[var4] = var7; // L: 134 + var2[var4] = var7; // L: 115 - for (var8 = var4 + 1; var8 <= 32; ++var8) { // L: 135 - var12 = var2[var8]; // L: 136 - if (var12 == var6) { // L: 137 + for (var8 = var4 + 1; var8 <= 32; ++var8) { // L: 116 + var12 = var2[var8]; // L: 117 + if (var12 == var6) { // L: 118 var2[var8] = var7; } } } } - this.keys = new int[8]; // L: 141 - int var11 = 0; // L: 142 + this.keys = new int[8]; // L: 122 + int var11 = 0; // L: 123 - for (var3 = 0; var3 < this.entries; ++var3) { // L: 143 - var4 = this.lengthMap[var3]; // L: 144 - if (var4 != 0) { // L: 145 - var5 = var1[var3]; // L: 146 - var6 = 0; // L: 147 + for (var3 = 0; var3 < this.entries; ++var3) { // L: 124 + var4 = this.lengthMap[var3]; // L: 125 + if (var4 != 0) { // L: 126 + var5 = var1[var3]; // L: 127 + var6 = 0; // L: 128 - for (var7 = 0; var7 < var4; ++var7) { // L: 148 - var8 = Integer.MIN_VALUE >>> var7; // L: 149 - if ((var5 & var8) != 0) { // L: 150 - if (this.keys[var6] == 0) { // L: 151 + for (var7 = 0; var7 < var4; ++var7) { // L: 129 + var8 = Integer.MIN_VALUE >>> var7; // L: 130 + if ((var5 & var8) != 0) { // L: 131 + if (this.keys[var6] == 0) { // L: 132 this.keys[var6] = var11; } - var6 = this.keys[var6]; // L: 152 + var6 = this.keys[var6]; // L: 133 } else { - ++var6; // L: 155 + ++var6; // L: 136 } - if (var6 >= this.keys.length) { // L: 157 - int[] var9 = new int[this.keys.length * 2]; // L: 158 + if (var6 >= this.keys.length) { // L: 138 + int[] var9 = new int[this.keys.length * 2]; // L: 139 - for (var10 = 0; var10 < this.keys.length; ++var10) { // L: 159 + for (var10 = 0; var10 < this.keys.length; ++var10) { // L: 140 var9[var10] = this.keys[var10]; } - this.keys = var9; // L: 160 + this.keys = var9; // L: 141 } - var8 >>>= 1; // L: 162 + var8 >>>= 1; // L: 143 } - this.keys[var6] = ~var3; // L: 164 - if (var6 >= var11) { // L: 165 + this.keys[var6] = ~var3; // L: 145 + if (var6 >= var11) { // L: 146 var11 = var6 + 1; } } } - } // L: 167 + } // L: 148 - @ObfuscatedName("i") - int method988() { + @ObfuscatedName("l") + int method981() { int var1; - for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { // L: 170 171 + for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { // L: 151 152 } - return ~this.keys[var1]; // L: 172 + return ~this.keys[var1]; // L: 153 } - @ObfuscatedName("f") - float[] method989() { - return this.field350[this.method988()]; // L: 176 + @ObfuscatedName("k") + float[] method982() { + return this.field356[this.method981()]; // L: 157 } - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { - int var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; // L: 16 - - while (true) { - int var4 = var2; // L: 19 - int var5 = var1; // L: 20 - - int var6; - for (var6 = 1; var5 > 1; var5 >>= 1) { // L: 22 23 26 - if ((var5 & 1) != 0) { // L: 24 - var6 *= var4; - } - - var4 *= var4; // L: 25 - } - - int var3; - if (var5 == 1) { // L: 28 - var3 = var6 * var4; // L: 29 - } else { - var3 = var6; // L: 32 - } - - if (var3 <= var0) { // L: 34 - return var2; // L: 37 - } - - --var2; // L: 35 + int var2; + for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; AttackOption.method2401(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 233e208b44..e495acc337 100644 --- a/runescape-client/src/main/java/VorbisFloor.java +++ b/runescape-client/src/main/java/VorbisFloor.java @@ -2,43 +2,43 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("an") +@ObfuscatedName("af") @Implements("VorbisFloor") public class VorbisFloor { - @ObfuscatedName("v") - static final int[] field263; - @ObfuscatedName("c") + @ObfuscatedName("o") + static final int[] field271; + @ObfuscatedName("q") @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; - @ObfuscatedName("o") - static int[] field256; - @ObfuscatedName("r") - static int[] field266; - @ObfuscatedName("p") - static boolean[] field265; - @ObfuscatedName("i") - int[] field258; - @ObfuscatedName("f") + @ObfuscatedName("v") + static int[] field276; + @ObfuscatedName("y") + static int[] field269; + @ObfuscatedName("c") + static boolean[] field278; + @ObfuscatedName("l") + int[] field273; + @ObfuscatedName("k") @Export("multiplier") int multiplier; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("partitionClassList") int[] partitionClassList; - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("classDimensions") int[] classDimensions; - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("classSubClasses") int[] classSubClasses; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("classMasterbooks") int[] classMasterbooks; - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("subclassBooks") int[][] subclassBooks; static { - field263 = new int[]{256, 128, 86, 64}; // L: 8 + field271 = 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 } @@ -92,30 +92,30 @@ public class VorbisFloor { var5 += this.classDimensions[this.partitionClassList[var6]]; } - this.field258 = new int[var5]; // L: 137 - this.field258[0] = 0; // L: 138 - this.field258[1] = 1 << var4; // L: 139 + this.field273 = new int[var5]; // L: 137 + this.field273[0] = 0; // L: 138 + this.field273[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.field258[var5++] = VorbisSample.readBits(var4); + this.field273[var5++] = VorbisSample.readBits(var4); } } - if (field256 == null || field256.length < var5) { // L: 145 - field256 = new int[var5]; // L: 146 - field266 = new int[var5]; // L: 147 - field265 = new boolean[var5]; // L: 148 + if (field276 == null || field276.length < var5) { // L: 145 + field276 = new int[var5]; // L: 146 + field269 = new int[var5]; // L: 147 + field278 = new boolean[var5]; // L: 148 } } } // L: 150 - @ObfuscatedName("i") - int method666(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("l") + int method664(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 @@ -124,8 +124,8 @@ public class VorbisFloor { return var6 < 0 ? var2 - var10 : var10 + var2; // L: 55 } - @ObfuscatedName("f") - void method672(int var1, int var2, int var3, int var4, float[] var5, int var6) { + @ObfuscatedName("k") + void method665(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 @@ -153,54 +153,54 @@ public class VorbisFloor { } // L: 80 - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { if (var1 < var2) { // L: 83 int var3 = var1; // L: 84 - int var4 = field256[var1]; // L: 85 - int var5 = field266[var1]; // L: 86 - boolean var6 = field265[var1]; // L: 87 + int var4 = field276[var1]; // L: 85 + int var5 = field269[var1]; // L: 86 + boolean var6 = field278[var1]; // L: 87 for (int var7 = var1 + 1; var7 <= var2; ++var7) { // L: 88 - int var8 = field256[var7]; // L: 89 + int var8 = field276[var7]; // L: 89 if (var8 < var4) { // L: 90 - field256[var3] = var8; // L: 91 - field266[var3] = field266[var7]; // L: 92 - field265[var3] = field265[var7]; // L: 93 + field276[var3] = var8; // L: 91 + field269[var3] = field269[var7]; // L: 92 + field278[var3] = field278[var7]; // L: 93 ++var3; // L: 94 - field256[var7] = field256[var3]; // L: 95 - field266[var7] = field266[var3]; // L: 96 - field265[var7] = field265[var3]; // L: 97 + field276[var7] = field276[var3]; // L: 95 + field269[var7] = field269[var3]; // L: 96 + field278[var7] = field278[var3]; // L: 97 } } - field256[var3] = var4; // L: 100 - field266[var3] = var5; // L: 101 - field265[var3] = var6; // L: 102 + field276[var3] = var4; // L: 100 + field269[var3] = var5; // L: 101 + field278[var3] = var6; // L: 102 this.VarbisFloor_sort(var1, var3 - 1); // L: 103 this.VarbisFloor_sort(var3 + 1, var2); // L: 104 } } // L: 105 - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("readSubmapFloor") boolean readSubmapFloor() { boolean var1 = VorbisSample.readBit() != 0; // L: 153 if (!var1) { // L: 154 return false; } else { - int var2 = this.field258.length; // L: 155 + int var2 = this.field273.length; // L: 155 int var3; for (var3 = 0; var3 < var2; ++var3) { // L: 156 - field256[var3] = this.field258[var3]; + field276[var3] = this.field273[var3]; } - var3 = field263[this.multiplier - 1]; // L: 157 + var3 = field271[this.multiplier - 1]; // L: 157 int var4 = class143.iLog(var3 - 1); // L: 158 - field266[0] = VorbisSample.readBits(var4); // L: 159 - field266[1] = VorbisSample.readBits(var4); // L: 160 + field269[0] = VorbisSample.readBits(var4); // L: 159 + field269[1] = VorbisSample.readBits(var4); // L: 160 int var5 = 2; // L: 161 for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { // L: 162 @@ -210,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]].method988(); + var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method981(); } for (int var12 = 0; var12 < var8; ++var12) { // L: 169 int var13 = this.subclassBooks[var7][var11 & var10]; // L: 170 var11 >>>= var9; // L: 171 - field266[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method988() : 0; // L: 172 + field269[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method981() : 0; // L: 172 } } @@ -224,12 +224,12 @@ public class VorbisFloor { } } - @ObfuscatedName("s") - void method665(float[] var1, int var2) { - int var3 = this.field258.length; // L: 179 - int var4 = field263[this.multiplier - 1]; // L: 180 - boolean[] var5 = field265; // L: 181 - field265[1] = true; // L: 182 + @ObfuscatedName("p") + void method668(float[] var1, int var2) { + int var3 = this.field273.length; // L: 179 + int var4 = field271[this.multiplier - 1]; // L: 180 + boolean[] var5 = field278; // L: 181 + field278[1] = true; // L: 182 var5[0] = true; // L: 183 int var6; @@ -238,37 +238,37 @@ public class VorbisFloor { int var9; int var10; for (var6 = 2; var6 < var3; ++var6) { // L: 184 - var7 = method673(field256, var6); // L: 185 - var8 = method664(field256, var6); // L: 186 - var9 = this.method666(field256[var7], field266[var7], field256[var8], field266[var8], field256[var6]); // L: 187 - var10 = field266[var6]; // L: 188 + var7 = method689(field276, var6); // L: 185 + var8 = method662(field276, var6); // L: 186 + var9 = this.method664(field276[var7], field269[var7], field276[var8], field269[var8], field276[var6]); // L: 187 + var10 = field269[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 = field265; // L: 193 - field265[var8] = true; // L: 195 + boolean[] var14 = field278; // L: 193 + field278[var8] = true; // L: 195 var14[var7] = true; // L: 196 - field265[var6] = true; // L: 197 + field278[var6] = true; // L: 197 if (var10 >= var13) { // L: 198 - field266[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199 + field269[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199 } else { - field266[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202 + field269[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202 } } else { - field265[var6] = false; // L: 206 - field266[var6] = var9; // L: 207 + field278[var6] = false; // L: 206 + field269[var6] = var9; // L: 207 } } this.VarbisFloor_sort(0, var3 - 1); // L: 210 var6 = 0; // L: 211 - var7 = field266[0] * this.multiplier; // L: 212 + var7 = field269[0] * this.multiplier; // L: 212 for (var8 = 1; var8 < var3; ++var8) { // L: 213 - if (field265[var8]) { // L: 214 - var9 = field256[var8]; // L: 215 - var10 = field266[var8] * this.multiplier; // L: 216 - this.method672(var6, var7, var9, var10, var1, var2); // L: 217 + if (field278[var8]) { // L: 214 + var9 = field276[var8]; // L: 215 + var10 = field269[var8] * this.multiplier; // L: 216 + this.method665(var6, var7, var9, var10, var1, var2); // L: 217 if (var9 >= var2) { // L: 218 return; } @@ -286,8 +286,8 @@ public class VorbisFloor { } // L: 225 - @ObfuscatedName("v") - static int method673(int[] var0, int var1) { + @ObfuscatedName("o") + static int method689(int[] var0, int var1) { int var2 = var0[var1]; // L: 22 int var3 = -1; // L: 23 int var4 = Integer.MIN_VALUE; // L: 24 @@ -303,8 +303,8 @@ public class VorbisFloor { return var3; // L: 32 } - @ObfuscatedName("c") - static int method664(int[] var0, int var1) { + @ObfuscatedName("q") + static int method662(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 a3431a638a..65b0a969e5 100644 --- a/runescape-client/src/main/java/VorbisMapping.java +++ b/runescape-client/src/main/java/VorbisMapping.java @@ -2,19 +2,19 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ad") +@ObfuscatedName("av") @Implements("VorbisMapping") public class VorbisMapping { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("submaps") int submaps; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("mappingMux") int mappingMux; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("submapFloor") int[] submapFloor; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("submapResidue") int[] submapResidue; diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java index d80dba7a2e..8df121206a 100644 --- a/runescape-client/src/main/java/VorbisResidue.java +++ b/runescape-client/src/main/java/VorbisResidue.java @@ -2,28 +2,28 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ab") +@ObfuscatedName("aw") @Implements("VorbisResidue") public class VorbisResidue { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("residueType") int residueType; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("begin") int begin; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("end") int end; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("partitionSize") int partitionSize; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("classifications") int classifications; - @ObfuscatedName("n") + @ObfuscatedName("m") @Export("classbook") int classbook; - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("cascade") int[] cascade; @@ -56,8 +56,8 @@ public class VorbisResidue { } // L: 31 - @ObfuscatedName("v") - void method784(float[] var1, int var2, boolean var3) { + @ObfuscatedName("o") + void method793(float[] var1, int var2, boolean var3) { int var4; for (var4 = 0; var4 < var2; ++var4) { // L: 34 var1[var4] = 0.0F; @@ -76,7 +76,7 @@ public class VorbisResidue { int var10; int var11; if (var8 == 0) { // L: 43 - var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method988(); // L: 45 + var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method981(); // L: 45 for (var11 = var4 - 1; var11 >= 0; --var11) { // L: 46 if (var9 + var11 < var6) { // L: 47 @@ -98,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.method989(); // L: 62 + float[] var20 = var14.method982(); // L: 62 for (int var18 = 0; var18 < var14.dimensions; ++var18) { // L: 63 var1[var13 + var19 + var18 * var15] += var20[var18]; @@ -108,7 +108,7 @@ public class VorbisResidue { var15 = 0; // L: 67 while (var15 < this.partitionSize) { // L: 68 - float[] var16 = var14.method989(); // L: 69 + float[] var16 = var14.method982(); // 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 ab19bd72cc..58fc6c6244 100644 --- a/runescape-client/src/main/java/VorbisSample.java +++ b/runescape-client/src/main/java/VorbisSample.java @@ -3,115 +3,115 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ar") +@ObfuscatedName("aa") @Implements("VorbisSample") public class VorbisSample extends Node { - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("VorbisSample_bytes") static byte[] VorbisSample_bytes; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("VorbisSample_byteOffset") static int VorbisSample_byteOffset; - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("VorbisSample_bitOffset") static int VorbisSample_bitOffset; - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("VorbisSample_blockSize0") static int VorbisSample_blockSize0; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("VorbisSample_blockSize1") static int VorbisSample_blockSize1; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lax;" + descriptor = "[Lay;" ) @Export("VorbisSample_codebooks") static VorbisCodebook[] VorbisSample_codebooks; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lan;" + descriptor = "[Laf;" ) @Export("VorbisSample_floors") static VorbisFloor[] VorbisSample_floors; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "[Lab;" + descriptor = "[Law;" ) @Export("VorbisSample_residues") static VorbisResidue[] VorbisSample_residues; - @ObfuscatedName("d") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "[Lad;" + descriptor = "[Lav;" ) @Export("VorbisSample_mappings") static VorbisMapping[] VorbisSample_mappings; - @ObfuscatedName("m") + @ObfuscatedName("g") @Export("VorbisSample_blockFlags") static boolean[] VorbisSample_blockFlags; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("VorbisSample_mapping") static int[] VorbisSample_mapping; - @ObfuscatedName("t") - static boolean field369; + @ObfuscatedName("n") + static boolean field373; @ObfuscatedName("j") - static float[] field378; - @ObfuscatedName("e") - static float[] field379; - @ObfuscatedName("z") - static float[] field356; - @ObfuscatedName("h") - static float[] field381; - @ObfuscatedName("ae") - static float[] field382; - @ObfuscatedName("aq") static float[] field383; - @ObfuscatedName("aw") + @ObfuscatedName("z") static float[] field384; + @ObfuscatedName("i") + static float[] field378; + @ObfuscatedName("u") + static float[] field386; + @ObfuscatedName("ag") + static float[] field387; + @ObfuscatedName("ar") + static float[] field388; @ObfuscatedName("am") - static int[] field385; - @ObfuscatedName("ak") - static int[] field386; - @ObfuscatedName("v") - byte[][] field374; - @ObfuscatedName("c") + static float[] field389; + @ObfuscatedName("ac") + static int[] field369; + @ObfuscatedName("ab") + static int[] field391; + @ObfuscatedName("o") + byte[][] field368; + @ObfuscatedName("q") @Export("sampleRate") int sampleRate; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("sampleCount") int sampleCount; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("start") int start; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("end") int end; - @ObfuscatedName("n") - boolean field373; - @ObfuscatedName("g") - float[] field377; - @ObfuscatedName("x") - int field375; - @ObfuscatedName("a") - int field376; - @ObfuscatedName("y") - boolean field389; - @ObfuscatedName("ao") + @ObfuscatedName("m") + boolean field365; + @ObfuscatedName("e") + float[] field379; + @ObfuscatedName("h") + int field380; + @ObfuscatedName("f") + int field377; + @ObfuscatedName("d") + boolean field382; + @ObfuscatedName("aj") @Export("samples") byte[] samples; - @ObfuscatedName("aj") - int field388; - @ObfuscatedName("al") - int field364; + @ObfuscatedName("ae") + int field393; + @ObfuscatedName("az") + int field394; static { - field369 = false; // L: 28 + field373 = false; // L: 28 } VorbisSample(byte[] var1) { this.read(var1); // L: 417 } // L: 418 - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("read") void read(byte[] var1) { Buffer var2 = new Buffer(var1); // L: 89 @@ -121,11 +121,11 @@ public class VorbisSample extends Node { this.end = var2.readInt(); // L: 93 if (this.end < 0) { // L: 94 this.end = ~this.end; // L: 95 - this.field373 = true; // L: 96 + this.field365 = true; // L: 96 } int var3 = var2.readInt(); // L: 98 - this.field374 = new byte[var3][]; // L: 99 + this.field368 = new byte[var3][]; // L: 99 for (int var4 = 0; var4 < var3; ++var4) { // L: 100 int var5 = 0; // L: 101 @@ -138,14 +138,14 @@ public class VorbisSample extends Node { byte[] var7 = new byte[var5]; // L: 107 var2.readBytes(var7, 0, var5); // L: 108 - this.field374[var4] = var7; // L: 109 + this.field368[var4] = var7; // L: 109 } } // L: 111 - @ObfuscatedName("s") - float[] method1000(int var1) { - VorbisSample_setData(this.field374[var1], 0); // L: 198 + @ObfuscatedName("p") + float[] method999(int var1) { + VorbisSample_setData(this.field368[var1], 0); // L: 198 readBit(); // L: 199 int var2 = readBits(class143.iLog(VorbisSample_mapping.length - 1)); // L: 200 boolean var3 = VorbisSample_blockFlags[var2]; // L: 201 @@ -192,27 +192,27 @@ public class VorbisSample extends Node { for (var17 = 0; var17 < var14.submaps; ++var17) { // L: 244 VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; // L: 245 - float[] var44 = field378; // L: 246 - var42.method784(var44, var4 >> 1, var45); // L: 247 + float[] var44 = field383; // L: 246 + var42.method793(var44, var4 >> 1, var45); // L: 247 } int var18; if (!var15) { // L: 250 var17 = var14.mappingMux; // L: 251 var18 = var14.submapFloor[var17]; // L: 252 - VorbisSample_floors[var18].method665(field378, var4 >> 1); // L: 253 + VorbisSample_floors[var18].method668(field383, var4 >> 1); // L: 253 } int var19; if (var15) { // L: 256 for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 257 - field378[var17] = 0.0F; + field383[var17] = 0.0F; } } else { var17 = var4 >> 1; // L: 260 var18 = var4 >> 2; // L: 261 var19 = var4 >> 3; // L: 262 - float[] var20 = field378; // L: 263 + float[] var20 = field383; // L: 263 int var21; for (var21 = 0; var21 < var17; ++var21) { // L: 264 @@ -223,10 +223,10 @@ public class VorbisSample extends Node { var20[var21] = -var20[var4 - var21 - 1]; } - float[] var40 = var3 ? field382 : field379; // L: 266 - float[] var22 = var3 ? field383 : field356; // L: 267 - float[] var23 = var3 ? field384 : field381; // L: 268 - int[] var24 = var3 ? field386 : field385; // L: 269 + float[] var40 = var3 ? field387 : field384; // L: 266 + float[] var22 = var3 ? field388 : field378; // L: 267 + float[] var23 = var3 ? field389 : field386; // L: 268 + int[] var24 = var3 ? field391 : field369; // L: 269 int var25; float var26; @@ -357,49 +357,49 @@ public class VorbisSample extends Node { float[] var10000; 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 = field378; // L: 363 + var10000 = field383; // L: 363 var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } 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 = field378; // L: 367 + var10000 = field383; // L: 367 var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } } float[] var41 = null; // L: 370 - if (this.field375 > 0) { // L: 371 - var18 = var4 + this.field375 >> 2; // L: 372 + if (this.field380 > 0) { // L: 371 + var18 = var4 + this.field380 >> 2; // L: 372 var41 = new float[var18]; // L: 373 int var43; - if (!this.field389) { // L: 374 - for (var19 = 0; var19 < this.field376; ++var19) { // L: 375 - var43 = var19 + (this.field375 >> 1); // L: 376 - var41[var19] += this.field377[var43]; // L: 377 + if (!this.field382) { // L: 374 + for (var19 = 0; var19 < this.field377; ++var19) { // L: 375 + var43 = var19 + (this.field380 >> 1); // L: 376 + var41[var19] += this.field379[var43]; // L: 377 } } if (!var15) { // L: 380 for (var19 = var8; var19 < var4 >> 1; ++var19) { // L: 381 var43 = var41.length - (var4 >> 1) + var19; // L: 382 - var41[var43] += field378[var19]; // L: 383 + var41[var43] += field383[var19]; // L: 383 } } } - float[] var54 = this.field377; // L: 387 - this.field377 = field378; // L: 388 - field378 = var54; // L: 389 - this.field375 = var4; // L: 390 - this.field376 = var12 - (var4 >> 1); // L: 391 - this.field389 = var15; // L: 392 + float[] var54 = this.field379; // L: 387 + this.field379 = field383; // L: 388 + field383 = var54; // L: 389 + this.field380 = var4; // L: 390 + this.field377 = var12 - (var4 >> 1); // L: 391 + this.field382 = var15; // L: 392 return var41; // L: 393 } - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "([I)Lat;" + descriptor = "([I)Lak;" ) @Export("toRawSound") RawSound toRawSound(int[] var1) { @@ -407,21 +407,21 @@ public class VorbisSample extends Node { return null; } else { if (this.samples == null) { // L: 422 - this.field375 = 0; // L: 423 - this.field377 = new float[VorbisSample_blockSize1]; // L: 424 + this.field380 = 0; // L: 423 + this.field379 = new float[VorbisSample_blockSize1]; // L: 424 this.samples = new byte[this.sampleCount]; // L: 425 - this.field388 = 0; // L: 426 - this.field364 = 0; // L: 427 + this.field393 = 0; // L: 426 + this.field394 = 0; // L: 427 } - for (; this.field364 < this.field374.length; ++this.field364) { // L: 429 444 + for (; this.field394 < this.field368.length; ++this.field394) { // L: 429 444 if (var1 != null && var1[0] <= 0) { // L: 430 return null; } - float[] var2 = this.method1000(this.field364); // L: 431 + float[] var2 = this.method999(this.field394); // L: 431 if (var2 != null) { // L: 432 - int var3 = this.field388; // L: 433 + int var3 = this.field393; // L: 433 int var4 = var2.length; // L: 434 if (var4 > this.sampleCount - var3) { // L: 435 var4 = this.sampleCount - var3; @@ -437,21 +437,21 @@ public class VorbisSample extends Node { } if (var1 != null) { // L: 441 - var1[0] -= var3 - this.field388; + var1[0] -= var3 - this.field393; } - this.field388 = var3; // L: 442 + this.field393 = var3; // L: 442 } } - this.field377 = null; // L: 446 + this.field379 = 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.field373); // L: 449 + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field365); // L: 449 } } - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("float32Unpack") static float float32Unpack(int var0) { int var1 = var0 & 2097151; // L: 47 @@ -464,7 +464,7 @@ public class VorbisSample extends Node { return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); // L: 51 } - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("VorbisSample_setData") static void VorbisSample_setData(byte[] var0, int var1) { VorbisSample_bytes = var0; // L: 55 @@ -472,7 +472,7 @@ public class VorbisSample extends Node { VorbisSample_bitOffset = 0; // L: 57 } // L: 58 - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("readBit") static int readBit() { int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; // L: 61 @@ -482,7 +482,7 @@ public class VorbisSample extends Node { return var0; // L: 65 } - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("readBits") static int readBits(int var0) { int var1 = 0; // L: 69 @@ -507,12 +507,12 @@ public class VorbisSample extends Node { return var1; // L: 85 } - @ObfuscatedName("n") - static void method999(byte[] var0) { + @ObfuscatedName("m") + static void method998(byte[] var0) { VorbisSample_setData(var0, 0); // L: 114 VorbisSample_blockSize0 = 1 << readBits(4); // L: 115 VorbisSample_blockSize1 = 1 << readBits(4); // L: 116 - field378 = new float[VorbisSample_blockSize1]; // L: 117 + field383 = new float[VorbisSample_blockSize1]; // L: 117 int var1; int var2; @@ -562,15 +562,15 @@ public class VorbisSample extends Node { } if (var1 != 0) { // L: 157 - field382 = var18; // L: 158 - field383 = var19; // L: 159 - field384 = var20; // L: 160 - field386 = var21; // L: 161 + field387 = var18; // L: 158 + field388 = var19; // L: 159 + field389 = var20; // L: 160 + field391 = var21; // L: 161 } else { - field379 = var18; // L: 164 - field356 = var19; // L: 165 - field381 = var20; // L: 166 - field385 = var21; // L: 167 + field384 = var18; // L: 164 + field378 = var19; // L: 165 + field386 = var20; // L: 166 + field369 = var21; // L: 167 } } @@ -621,31 +621,31 @@ public class VorbisSample extends Node { } // L: 195 - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lln;)Z" + descriptor = "(Llp;)Z" ) - static boolean method1021(AbstractArchive var0) { - if (!field369) { // L: 397 + static boolean method1000(AbstractArchive var0) { + if (!field373) { // L: 397 byte[] var1 = var0.takeFile(0, 0); // L: 398 if (var1 == null) { // L: 399 return false; } - method999(var1); // L: 400 - field369 = true; // L: 401 + method998(var1); // L: 400 + field373 = true; // L: 401 } return true; // L: 403 } - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lln;II)Lar;" + descriptor = "(Llp;II)Laa;" ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { - if (!method1021(var0)) { // L: 407 + if (!method1000(var0)) { // L: 407 var0.tryLoadFile(var1, var2); // L: 408 return null; // L: 409 } else { diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index 9038eccddd..2f30542bb5 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -4,78 +4,81 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("io") +@ObfuscatedName("hf") @Implements("WallDecoration") public final class WallDecoration { - @ObfuscatedName("iq") + @ObfuscatedName("c") + @Export("Tiles_lightness") + static int[] Tiles_lightness; + @ObfuscatedName("ia") @ObfuscatedSignature( - descriptor = "[Lqi;" + descriptor = "[Lqr;" ) - @Export("headIconPrayerSprites") - static SpritePixels[] headIconPrayerSprites; - @ObfuscatedName("v") + @Export("mapDotSprites") + static SpritePixels[] mapDotSprites; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1273290179 + intValue = 1133434607 ) @Export("z") int z; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1499164855 + intValue = -468638571 ) @Export("x") int x; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 2128198353 + intValue = -1248756677 ) @Export("y") int y; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1183896313 + intValue = 1886236557 ) @Export("orientation") int orientation; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 632137083 + intValue = -665264033 ) @Export("orientation2") int orientation2; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -35989305 + intValue = -884502203 ) @Export("xOffset") int xOffset; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 322472367 + intValue = -553687171 ) @Export("yOffset") int yOffset; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Lgx;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Lgx;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - longValue = 2319004435936735131L + longValue = -451444878306106685L ) @Export("tag") public long tag; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1666426439 + intValue = 1120239 ) @Export("flags") int flags; @@ -84,4 +87,64 @@ public final class WallDecoration { this.tag = 0L; // L: 13 this.flags = 0; // L: 14 } // L: 16 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Ljj;Lqh;B)Ljm;", + garbageValue = "-72" + ) + @Export("getPacketBufferNode") + public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { + PacketBufferNode var2 = FloorOverlayDefinition.method3700(); // 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("t") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-811937066" + ) + static final int method4391() { + return ViewportMouse.ViewportMouse_y; // L: 106 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;II)V", + garbageValue = "1555036135" + ) + static final void method4392(String var0, int var1) { + PacketBufferNode var2 = getPacketBufferNode(ClientPacket.field3026, Client.packetWriter.isaacCipher); // L: 236 + var2.packetBuffer.writeByte(class392.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 237 + var2.packetBuffer.method7542(var1); // L: 238 + var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 239 + Client.packetWriter.addNode(var2); // L: 240 + } // L: 241 + + @ObfuscatedName("jv") + @ObfuscatedSignature( + descriptor = "(S)Z", + garbageValue = "20695" + ) + @Export("getTapToDrop") + static boolean getTapToDrop() { + return Client.tapToDrop; // L: 11200 + } } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 2fd9cef8a7..a81b37936a 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -1,5 +1,3 @@ -import java.io.DataInputStream; -import java.net.URL; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -9,719 +7,707 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ky") +@ObfuscatedName("ki") @Implements("Widget") public class Widget extends Node { - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "[[Lky;" - ) - @Export("Widget_interfaceComponents") - public static Widget[][] Widget_interfaceComponents; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - @Export("Widget_archive") - public static AbstractArchive Widget_archive; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("Widget_cachedSprites") public static EvictingDualNodeHashTable Widget_cachedSprites; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("Widget_cachedModels") public static EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("aq") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("Widget_cachedFonts") public static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("aw") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("Widget_cachedSpriteMasks") public static EvictingDualNodeHashTable Widget_cachedSpriteMasks; - @ObfuscatedName("am") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Lmh;" ) - static class361 field3389; - @ObfuscatedName("ak") + static class362 field3390; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Lmh;" ) - static class361 field3332; - @ObfuscatedName("ao") - public static boolean field3411; + static class362 field3378; @ObfuscatedName("aj") + public static boolean field3407; + @ObfuscatedName("ae") @Export("isIf3") public boolean isIf3; - @ObfuscatedName("al") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 785571949 + intValue = 1115174973 ) @Export("id") public int id; - @ObfuscatedName("av") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -1317080121 + intValue = -776270713 ) @Export("childIndex") public int childIndex; - @ObfuscatedName("at") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 370654815 + intValue = -1972844397 ) @Export("type") public int type; - @ObfuscatedName("an") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 1674852349 + intValue = 235823181 ) @Export("buttonType") public int buttonType; - @ObfuscatedName("ay") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 707687703 + intValue = -388100275 ) @Export("contentType") public int contentType; - @ObfuscatedName("ag") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 56148415 + intValue = -396062445 ) @Export("xAlignment") public int xAlignment; - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 817696093 + intValue = 678418613 ) @Export("yAlignment") public int yAlignment; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 513405589 + intValue = 1351515849 ) @Export("widthAlignment") public int widthAlignment; - @ObfuscatedName("ab") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 2040346085 + intValue = 1340623801 ) @Export("heightAlignment") public int heightAlignment; - @ObfuscatedName("au") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -26114281 + intValue = 1043867923 ) @Export("rawX") public int rawX; - @ObfuscatedName("af") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 387503687 + intValue = -2102072707 ) @Export("rawY") public int rawY; - @ObfuscatedName("ad") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -2011247383 + intValue = -1127967955 ) @Export("rawWidth") public int rawWidth; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 1435796997 + intValue = 232379525 ) @Export("rawHeight") public int rawHeight; - @ObfuscatedName("ax") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -1718696181 + intValue = 1835485941 ) @Export("x") public int x; - @ObfuscatedName("ar") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -566234841 + intValue = -2009390011 ) @Export("y") public int y; - @ObfuscatedName("ap") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1237179477 + intValue = -1172311447 ) @Export("width") public int width; - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -686825733 + intValue = -459533989 ) @Export("height") public int height; - @ObfuscatedName("as") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 324512829 + intValue = -2136321081 ) - public int field3352; - @ObfuscatedName("aa") + public int field3411; + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -98155543 + intValue = 1059357481 ) - public int field3353; - @ObfuscatedName("bj") + public int field3494; + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = -937388189 + intValue = -906080451 ) @Export("parentId") public int parentId; - @ObfuscatedName("bm") + @ObfuscatedName("ba") @Export("isHidden") public boolean isHidden; - @ObfuscatedName("br") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 1914558753 + intValue = 577252931 ) @Export("scrollX") public int scrollX; - @ObfuscatedName("bo") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -647232793 + intValue = -1581918007 ) @Export("scrollY") public int scrollY; - @ObfuscatedName("bl") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = -188983191 + intValue = 1123320165 ) @Export("scrollWidth") public int scrollWidth; - @ObfuscatedName("be") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -1426770415 + intValue = -578131215 ) @Export("scrollHeight") public int scrollHeight; - @ObfuscatedName("bh") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 532413421 + intValue = -979741419 ) @Export("color") public int color; - @ObfuscatedName("bf") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 103132295 + intValue = -792649141 ) @Export("color2") public int color2; - @ObfuscatedName("bb") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = -154297075 + intValue = 387100237 ) @Export("mouseOverColor") public int mouseOverColor; - @ObfuscatedName("bw") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -811313521 + intValue = -554834039 ) @Export("mouseOverColor2") public int mouseOverColor2; - @ObfuscatedName("bx") + @ObfuscatedName("bj") @Export("fill") public boolean fill; - @ObfuscatedName("bg") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "Lqe;" + descriptor = "Lqw;" ) @Export("fillMode") public FillMode fillMode; - @ObfuscatedName("bn") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -470805339 + intValue = -193710345 ) @Export("transparencyTop") public int transparencyTop; - @ObfuscatedName("bq") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -112532293 + intValue = 992811287 ) @Export("transparencyBot") public int transparencyBot; - @ObfuscatedName("ba") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = -1537981101 + intValue = 184656457 ) @Export("lineWid") public int lineWid; - @ObfuscatedName("bk") - public boolean field3369; - @ObfuscatedName("bs") + @ObfuscatedName("bt") + public boolean field3428; + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = 43628099 + intValue = -2014760189 ) @Export("spriteId2") public int spriteId2; - @ObfuscatedName("by") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = 781497615 + intValue = 286536551 ) @Export("spriteId") public int spriteId; - @ObfuscatedName("bt") - public String field3487; - @ObfuscatedName("bd") + @ObfuscatedName("bh") + public String field3431; + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = 2105991617 + intValue = 1597579983 ) @Export("spriteAngle") public int spriteAngle; - @ObfuscatedName("bc") + @ObfuscatedName("bm") @Export("spriteTiling") public boolean spriteTiling; - @ObfuscatedName("bp") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = 454838749 + intValue = 346905275 ) @Export("outline") public int outline; - @ObfuscatedName("bi") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 517366521 + intValue = -460120439 ) @Export("spriteShadow") public int spriteShadow; - @ObfuscatedName("bu") + @ObfuscatedName("bg") @Export("spriteFlipV") public boolean spriteFlipV; - @ObfuscatedName("bz") + @ObfuscatedName("bp") @Export("spriteFlipH") public boolean spriteFlipH; - @ObfuscatedName("bv") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = 1227370175 + intValue = 2112595825 ) @Export("modelType") public int modelType; - @ObfuscatedName("cm") + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = 945684985 + intValue = 288041705 ) @Export("modelId") public int modelId; - @ObfuscatedName("cc") + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = 445983049 + intValue = -1783833135 ) @Export("modelType2") int modelType2; - @ObfuscatedName("ch") + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = 1687897513 + intValue = 1672879833 ) @Export("modelId2") int modelId2; - @ObfuscatedName("cf") + @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = 1946938751 + intValue = 1814404803 ) @Export("sequenceId") public int sequenceId; - @ObfuscatedName("cv") + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = 450134807 + intValue = 2098504379 ) @Export("sequenceId2") public int sequenceId2; - @ObfuscatedName("cs") + @ObfuscatedName("cm") @ObfuscatedGetter( - intValue = -219810473 + intValue = 509392171 ) @Export("modelOffsetX") public int modelOffsetX; - @ObfuscatedName("cz") + @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = 2011213921 + intValue = -164846883 ) @Export("modelOffsetY") public int modelOffsetY; - @ObfuscatedName("ct") + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = -1199644179 + intValue = 1338987037 ) @Export("modelAngleX") public int modelAngleX; - @ObfuscatedName("cb") + @ObfuscatedName("cx") @ObfuscatedGetter( - intValue = -870869659 + intValue = -245886579 ) @Export("modelAngleY") public int modelAngleY; - @ObfuscatedName("cp") + @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = 1027382321 + intValue = 1535139247 ) @Export("modelAngleZ") public int modelAngleZ; - @ObfuscatedName("co") + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = -19522443 + intValue = 1846491567 ) @Export("modelZoom") public int modelZoom; - @ObfuscatedName("ca") - @ObfuscatedGetter( - intValue = -701988609 - ) - public int field3467; - @ObfuscatedName("ci") - @ObfuscatedGetter( - intValue = -781066785 - ) - public int field3392; @ObfuscatedName("cy") + @ObfuscatedGetter( + intValue = 399903033 + ) + public int field3406; + @ObfuscatedName("ct") + @ObfuscatedGetter( + intValue = -891150003 + ) + public int field3451; + @ObfuscatedName("cd") @Export("modelOrthog") public boolean modelOrthog; - @ObfuscatedName("cr") + @ObfuscatedName("cw") @Export("modelTransparency") public boolean modelTransparency; - @ObfuscatedName("cq") + @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = -1801031319 + intValue = 2138903919 ) @Export("itemQuantityMode") public int itemQuantityMode; - @ObfuscatedName("cn") + @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = -1408415309 + intValue = -1797182937 ) @Export("fontId") public int fontId; - @ObfuscatedName("cu") + @ObfuscatedName("cg") @Export("text") public String text; - @ObfuscatedName("cg") + @ObfuscatedName("cl") @Export("text2") public String text2; - @ObfuscatedName("cj") + @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = 1122513061 + intValue = 1967727263 ) @Export("textLineHeight") public int textLineHeight; - @ObfuscatedName("ce") + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = -694565497 + intValue = 1185644193 ) @Export("textXAlignment") public int textXAlignment; - @ObfuscatedName("cl") + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = 182093077 + intValue = -1879071397 ) @Export("textYAlignment") public int textYAlignment; - @ObfuscatedName("ck") + @ObfuscatedName("ce") @Export("textShadowed") public boolean textShadowed; - @ObfuscatedName("cd") + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = -1633261963 + intValue = 1427227403 ) @Export("paddingX") public int paddingX; - @ObfuscatedName("cw") + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = 1192225759 + intValue = -91862955 ) @Export("paddingY") public int paddingY; - @ObfuscatedName("cx") + @ObfuscatedName("cp") @Export("inventoryXOffsets") public int[] inventoryXOffsets; - @ObfuscatedName("dr") + @ObfuscatedName("dc") @Export("inventoryYOffsets") public int[] inventoryYOffsets; - @ObfuscatedName("dj") + @ObfuscatedName("dp") @Export("inventorySprites") public int[] inventorySprites; - @ObfuscatedName("dd") + @ObfuscatedName("dg") @Export("itemActions") public String[] itemActions; - @ObfuscatedName("dg") + @ObfuscatedName("dy") @ObfuscatedSignature( - descriptor = "Lev;" + descriptor = "Leq;" ) - class155 field3409; - @ObfuscatedName("de") + class155 field3408; + @ObfuscatedName("dh") @ObfuscatedGetter( - intValue = 1539311711 + intValue = -1702458807 ) - int field3410; - @ObfuscatedName("dp") - HashMap field3354; + int field3391; + @ObfuscatedName("dj") + HashMap field3470; @ObfuscatedName("dx") - HashMap field3412; - @ObfuscatedName("dc") + HashMap field3471; + @ObfuscatedName("do") @ObfuscatedGetter( - intValue = 1690080249 + intValue = 1159870601 ) @Export("flags") public int flags; - @ObfuscatedName("dm") - public boolean field3414; - @ObfuscatedName("dv") - public byte[][] field3415; - @ObfuscatedName("da") - public byte[][] field3485; @ObfuscatedName("di") - public int[] field3417; - @ObfuscatedName("dt") - public int[] field3418; - @ObfuscatedName("do") + public boolean field3473; + @ObfuscatedName("de") + public byte[][] field3474; + @ObfuscatedName("db") + public byte[][] field3419; + @ObfuscatedName("dn") + public int[] field3476; + @ObfuscatedName("dz") + public int[] field3481; + @ObfuscatedName("ds") @Export("dataText") public String dataText; - @ObfuscatedName("dw") + @ObfuscatedName("dt") @Export("actions") public String[] actions; - @ObfuscatedName("dl") + @ObfuscatedName("df") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Lki;" ) @Export("parent") public Widget parent; - @ObfuscatedName("dn") + @ObfuscatedName("dm") @ObfuscatedGetter( - intValue = -255992791 + intValue = -899991807 ) @Export("dragZoneSize") public int dragZoneSize; - @ObfuscatedName("db") + @ObfuscatedName("dq") @ObfuscatedGetter( - intValue = -228708447 + intValue = 799594581 ) @Export("dragThreshold") public int dragThreshold; - @ObfuscatedName("dh") + @ObfuscatedName("dw") @Export("isScrollBar") public boolean isScrollBar; - @ObfuscatedName("dq") + @ObfuscatedName("dk") @Export("spellActionName") public String spellActionName; - @ObfuscatedName("dy") + @ObfuscatedName("du") @Export("hasListener") public boolean hasListener; - @ObfuscatedName("ec") + @ObfuscatedName("em") @Export("onLoad") public Object[] onLoad; - @ObfuscatedName("es") + @ObfuscatedName("eh") @Export("onClick") public Object[] onClick; - @ObfuscatedName("el") + @ObfuscatedName("ej") @Export("onClickRepeat") public Object[] onClickRepeat; - @ObfuscatedName("ej") + @ObfuscatedName("en") @Export("onRelease") public Object[] onRelease; - @ObfuscatedName("em") + @ObfuscatedName("eb") @Export("onHold") public Object[] onHold; - @ObfuscatedName("ei") + @ObfuscatedName("ea") @Export("onMouseOver") public Object[] onMouseOver; - @ObfuscatedName("ep") + @ObfuscatedName("er") @Export("onMouseRepeat") public Object[] onMouseRepeat; - @ObfuscatedName("ef") + @ObfuscatedName("eo") @Export("onMouseLeave") public Object[] onMouseLeave; - @ObfuscatedName("eo") + @ObfuscatedName("ec") @Export("onDrag") public Object[] onDrag; - @ObfuscatedName("ex") + @ObfuscatedName("ek") @Export("onDragComplete") public Object[] onDragComplete; - @ObfuscatedName("eq") + @ObfuscatedName("ed") @Export("onTargetEnter") public Object[] onTargetEnter; - @ObfuscatedName("ed") + @ObfuscatedName("ew") @Export("onTargetLeave") public Object[] onTargetLeave; - @ObfuscatedName("ek") + @ObfuscatedName("ev") @Export("onVarTransmit") public Object[] onVarTransmit; - @ObfuscatedName("eb") + @ObfuscatedName("el") @Export("varTransmitTriggers") public int[] varTransmitTriggers; - @ObfuscatedName("ew") + @ObfuscatedName("ef") @Export("onInvTransmit") public Object[] onInvTransmit; - @ObfuscatedName("er") + @ObfuscatedName("ee") @Export("invTransmitTriggers") public int[] invTransmitTriggers; - @ObfuscatedName("et") + @ObfuscatedName("es") @Export("onStatTransmit") public Object[] onStatTransmit; - @ObfuscatedName("ee") + @ObfuscatedName("eg") @Export("statTransmitTriggers") public int[] statTransmitTriggers; - @ObfuscatedName("ea") + @ObfuscatedName("et") @Export("onTimer") public Object[] onTimer; - @ObfuscatedName("eu") + @ObfuscatedName("ex") @Export("onOp") public Object[] onOp; - @ObfuscatedName("eg") + @ObfuscatedName("ei") @Export("onScroll") public Object[] onScroll; - @ObfuscatedName("en") + @ObfuscatedName("ey") @Export("onChatTransmit") public Object[] onChatTransmit; - @ObfuscatedName("ez") + @ObfuscatedName("ep") @Export("onKey") public Object[] onKey; - @ObfuscatedName("ey") - public Object[] field3416; - @ObfuscatedName("eh") - public Object[] field3451; - @ObfuscatedName("ev") + @ObfuscatedName("eu") + public Object[] field3443; + @ObfuscatedName("ez") + public Object[] field3510; + @ObfuscatedName("eq") @Export("onFriendTransmit") public Object[] onFriendTransmit; - @ObfuscatedName("ff") + @ObfuscatedName("fs") @Export("onClanTransmit") public Object[] onClanTransmit; @ObfuscatedName("fp") - public Object[] field3454; - @ObfuscatedName("fo") - public Object[] field3455; - @ObfuscatedName("fm") + public Object[] field3513; + @ObfuscatedName("fy") + public Object[] field3456; + @ObfuscatedName("fg") @Export("onMiscTransmit") public Object[] onMiscTransmit; - @ObfuscatedName("fu") + @ObfuscatedName("fd") @Export("onDialogAbort") public Object[] onDialogAbort; - @ObfuscatedName("fd") + @ObfuscatedName("fh") @Export("onSubChange") public Object[] onSubChange; - @ObfuscatedName("fi") + @ObfuscatedName("fv") @Export("onResize") public Object[] onResize; - @ObfuscatedName("fa") + @ObfuscatedName("ff") @Export("onStockTransmit") public Object[] onStockTransmit; - @ObfuscatedName("fn") - public Object[] field3432; - @ObfuscatedName("fx") - public Object[] field3462; - @ObfuscatedName("fy") + @ObfuscatedName("fz") + public Object[] field3520; + @ObfuscatedName("fl") + public Object[] field3460; + @ObfuscatedName("fq") @Export("cs1Instructions") public int[][] cs1Instructions; - @ObfuscatedName("fr") + @ObfuscatedName("fo") @Export("cs1Comparisons") public int[] cs1Comparisons; - @ObfuscatedName("fj") + @ObfuscatedName("fn") @Export("cs1ComparisonValues") public int[] cs1ComparisonValues; - @ObfuscatedName("fl") + @ObfuscatedName("ft") @ObfuscatedGetter( - intValue = 1863918323 + intValue = -1959307231 ) @Export("mouseOverRedirect") public int mouseOverRedirect; - @ObfuscatedName("fb") + @ObfuscatedName("fi") @Export("spellName") public String spellName; - @ObfuscatedName("fe") + @ObfuscatedName("fx") @Export("buttonText") public String buttonText; - @ObfuscatedName("fc") + @ObfuscatedName("fe") @Export("itemIds") public int[] itemIds; - @ObfuscatedName("fq") + @ObfuscatedName("fb") @Export("itemQuantities") public int[] itemQuantities; - @ObfuscatedName("fv") + @ObfuscatedName("fr") @ObfuscatedGetter( - intValue = -806667787 + intValue = -756375481 ) @Export("itemId") public int itemId; - @ObfuscatedName("fz") + @ObfuscatedName("fu") @ObfuscatedGetter( - intValue = -603366955 + intValue = -572001819 ) @Export("itemQuantity") public int itemQuantity; - @ObfuscatedName("fs") + @ObfuscatedName("fc") @ObfuscatedGetter( - intValue = 726749667 + intValue = 564625883 ) @Export("modelFrame") public int modelFrame; - @ObfuscatedName("fw") + @ObfuscatedName("fj") @ObfuscatedGetter( - intValue = 1426555603 + intValue = 1825821707 ) @Export("modelFrameCycle") public int modelFrameCycle; - @ObfuscatedName("ft") + @ObfuscatedName("fm") @ObfuscatedSignature( - descriptor = "[Lky;" + descriptor = "[Lki;" ) @Export("children") public Widget[] children; - @ObfuscatedName("fg") + @ObfuscatedName("fk") @Export("containsMouse") public boolean containsMouse; - @ObfuscatedName("fh") + @ObfuscatedName("fw") @Export("isClicked") public boolean isClicked; - @ObfuscatedName("fk") + @ObfuscatedName("fa") @ObfuscatedGetter( - intValue = -235731823 + intValue = -773430937 ) - public int field3478; - @ObfuscatedName("gb") + public int field3524; + @ObfuscatedName("gj") @ObfuscatedGetter( - intValue = 590193357 + intValue = 1877978217 ) - public int field3479; - @ObfuscatedName("gi") + public int field3538; + @ObfuscatedName("ge") @ObfuscatedGetter( - intValue = -438997263 + intValue = -486342891 ) - public int field3480; - @ObfuscatedName("gn") + public int field3539; + @ObfuscatedName("gv") @ObfuscatedGetter( - intValue = 1088082053 + intValue = -1612828663 ) - public int field3433; - @ObfuscatedName("gh") + public int field3540; + @ObfuscatedName("gp") @ObfuscatedGetter( - intValue = -1419320507 + intValue = -1878678007 ) @Export("rootIndex") public int rootIndex; - @ObfuscatedName("gs") + @ObfuscatedName("gk") @ObfuscatedGetter( - intValue = 396807883 + intValue = -2036768027 ) @Export("cycle") public int cycle; - @ObfuscatedName("gj") - public int[] field3484; - @ObfuscatedName("gf") + @ObfuscatedName("gy") + public int[] field3527; + @ObfuscatedName("gl") @Export("noClickThrough") public boolean noClickThrough; - @ObfuscatedName("gc") + @ObfuscatedName("gi") @Export("noScrollThrough") public boolean noScrollThrough; - @ObfuscatedName("gw") + @ObfuscatedName("gq") @Export("prioritizeMenuEntry") public boolean prioritizeMenuEntry; @@ -730,9 +716,9 @@ public class Widget extends Node { Widget_cachedModels = new EvictingDualNodeHashTable(50); // L: 53 Widget_cachedFonts = new EvictingDualNodeHashTable(20); // L: 54 Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); // L: 55 - field3389 = new class361(10, class359.field4204); // L: 56 - field3332 = new class361(10, class359.field4204); // L: 57 - field3411 = false; // L: 58 + field3390 = new class362(10, class360.field4274); // L: 56 + field3378 = new class362(10, class360.field4274); // L: 57 + field3407 = false; // L: 58 } public Widget() { @@ -753,8 +739,8 @@ public class Widget extends Node { this.y = 0; // L: 74 this.width = 0; // L: 75 this.height = 0; // L: 76 - this.field3352 = 1; // L: 77 - this.field3353 = 1; // L: 78 + this.field3411 = 1; // L: 77 + this.field3494 = 1; // L: 78 this.parentId = -1; // L: 79 this.isHidden = false; // L: 80 this.scrollX = 0; // L: 81 @@ -770,7 +756,7 @@ public class Widget extends Node { this.transparencyTop = 0; // L: 91 this.transparencyBot = 0; // L: 92 this.lineWid = 1; // L: 93 - this.field3369 = false; // L: 94 + this.field3428 = false; // L: 94 this.spriteId2 = -1; // L: 95 this.spriteId = -1; // L: 96 this.spriteAngle = 0; // L: 98 @@ -789,8 +775,8 @@ public class Widget extends Node { this.modelAngleY = 0; // L: 113 this.modelAngleZ = 0; // L: 114 this.modelZoom = 100; // L: 115 - this.field3467 = 0; // L: 116 - this.field3392 = 0; // L: 117 + this.field3406 = 0; // L: 116 + this.field3451 = 0; // L: 117 this.modelOrthog = false; // L: 118 this.modelTransparency = false; // L: 119 this.itemQuantityMode = 2; // L: 120 @@ -803,9 +789,9 @@ public class Widget extends Node { this.textShadowed = false; // L: 127 this.paddingX = 0; // L: 128 this.paddingY = 0; // L: 129 - this.field3410 = -1; // L: 135 + this.field3391 = -1; // L: 135 this.flags = 0; // L: 139 - this.field3414 = false; // L: 140 + this.field3473 = false; // L: 140 this.dataText = ""; // L: 149 this.parent = null; // L: 151 this.dragZoneSize = 0; // L: 152 @@ -822,54 +808,54 @@ public class Widget extends Node { this.modelFrameCycle = 0; // L: 204 this.containsMouse = false; // L: 206 this.isClicked = false; // L: 207 - this.field3478 = -1; // L: 208 - this.field3479 = 0; // L: 209 - this.field3480 = 0; // L: 210 - this.field3433 = 0; // L: 211 + this.field3524 = -1; // L: 208 + this.field3538 = 0; // L: 209 + this.field3539 = 0; // L: 210 + this.field3540 = 0; // L: 211 this.rootIndex = -1; // L: 212 this.cycle = -1; // L: 213 this.noClickThrough = false; // L: 215 this.noScrollThrough = false; // L: 216 this.prioritizeMenuEntry = false; // L: 217 - } // L: 936 + } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-39" + descriptor = "(Lpx;I)V", + garbageValue = "-1773202641" ) @Export("decodeLegacy") void decodeLegacy(Buffer var1) { - this.isIf3 = false; - this.type = var1.readUnsignedByte(); - this.buttonType = var1.readUnsignedByte(); + this.isIf3 = false; // L: 270 + this.type = var1.readUnsignedByte(); // L: 271 + this.buttonType = var1.readUnsignedByte(); // L: 272 this.contentType = var1.readUnsignedShort(); // L: 273 - this.rawX = var1.readShort(); - this.rawY = var1.readShort(); - this.rawWidth = var1.readUnsignedShort(); - this.rawHeight = var1.readUnsignedShort(); - this.transparencyTop = var1.readUnsignedByte(); - this.parentId = var1.readUnsignedShort(); - if (this.parentId == 65535) { + this.rawX = var1.readShort(); // L: 274 + this.rawY = var1.readShort(); // L: 275 + this.rawWidth = var1.readUnsignedShort(); // L: 276 + this.rawHeight = var1.readUnsignedShort(); // L: 277 + this.transparencyTop = var1.readUnsignedByte(); // L: 278 + this.parentId = var1.readUnsignedShort(); // L: 279 + if (this.parentId == 65535) { // L: 280 this.parentId = -1; } else { - this.parentId += this.id & -65536; + this.parentId += this.id & -65536; // L: 281 } - this.mouseOverRedirect = var1.readUnsignedShort(); - if (this.mouseOverRedirect == 65535) { + this.mouseOverRedirect = var1.readUnsignedShort(); // L: 282 + if (this.mouseOverRedirect == 65535) { // L: 283 this.mouseOverRedirect = -1; } - int var2 = var1.readUnsignedByte(); + int var2 = var1.readUnsignedByte(); // L: 284 int var3; - if (var2 > 0) { - this.cs1Comparisons = new int[var2]; - this.cs1ComparisonValues = new int[var2]; + if (var2 > 0) { // L: 285 + this.cs1Comparisons = new int[var2]; // L: 286 + this.cs1ComparisonValues = new int[var2]; // L: 287 - for (var3 = 0; var3 < var2; ++var3) { - this.cs1Comparisons[var3] = var1.readUnsignedByte(); - this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); + for (var3 = 0; var3 < var2; ++var3) { // L: 288 + this.cs1Comparisons[var3] = var1.readUnsignedByte(); // L: 289 + this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); // L: 290 } } @@ -877,7 +863,7 @@ public class Widget extends Node { int var4; int var5; int var6; - if (var3 > 0) { + if (var3 > 0) { // L: 294 this.cs1Instructions = new int[var3][]; // L: 295 for (var4 = 0; var4 < var3; ++var4) { // L: 296 @@ -904,7 +890,7 @@ public class Widget extends Node { } if (this.type == 2) { // L: 313 - this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 314 + this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 314 this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 315 var4 = var1.readUnsignedByte(); // L: 316 if (var4 == 1) { // L: 317 @@ -1020,7 +1006,7 @@ public class Widget extends Node { } if (this.type == 7) { // L: 387 - this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 388 + this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 388 this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 389 this.textXAlignment = var1.readUnsignedByte(); // L: 390 this.fontId = var1.readUnsignedShort(); // L: 391 @@ -1033,8 +1019,8 @@ public class Widget extends Node { this.paddingX = var1.readShort(); // L: 395 this.paddingY = var1.readShort(); // L: 396 var4 = var1.readUnsignedByte(); // L: 397 - if (var4 == 1) { - this.flags |= 1073741824; // L: 398 + if (var4 == 1) { // L: 398 + this.flags |= 1073741824; } this.itemActions = new String[5]; // L: 399 @@ -1090,10 +1076,10 @@ public class Widget extends Node { } // L: 432 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-107310721" + descriptor = "(Lpx;I)V", + garbageValue = "-659209979" ) @Export("decode") void decode(Buffer var1) { @@ -1160,7 +1146,7 @@ public class Widget extends Node { this.modelOrthog = var1.readUnsignedByte() == 1; // L: 479 var1.readUnsignedShort(); // L: 480 if (this.widthAlignment != 0) { // L: 481 - this.field3467 = var1.readUnsignedShort(); + this.field3406 = var1.readUnsignedShort(); } if (this.heightAlignment != 0) { // L: 482 @@ -1191,7 +1177,7 @@ public class Widget extends Node { if (this.type == 9) { // L: 501 this.lineWid = var1.readUnsignedByte(); // L: 502 this.color = var1.readInt(); // L: 503 - this.field3369 = var1.readUnsignedByte() == 1; // L: 504 + this.field3428 = var1.readUnsignedByte() == 1; // L: 504 } this.flags = var1.readMedium(); // L: 506 @@ -1232,10 +1218,10 @@ public class Widget extends Node { this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 537 } // L: 538 - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lpi;B)[Ljava/lang/Object;", - garbageValue = "117" + descriptor = "(Lpx;I)[Ljava/lang/Object;", + garbageValue = "1297123633" ) @Export("readListener") Object[] readListener(Buffer var1) { @@ -1259,10 +1245,10 @@ public class Widget extends Node { } } - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpi;B)[I", - garbageValue = "-1" + descriptor = "(Lpx;S)[I", + garbageValue = "-14146" ) @Export("readListenerTriggers") int[] readListenerTriggers(Buffer var1) { @@ -1280,10 +1266,10 @@ public class Widget extends Node { } } - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "2" + descriptor = "(III)V", + garbageValue = "986584305" ) @Export("swapItems") public void swapItems(int var1, int var2) { @@ -1295,16 +1281,16 @@ public class Widget extends Node { this.itemQuantities[var1] = var3; // L: 569 } // L: 570 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ZLck;B)Lqi;", - garbageValue = "-6" + descriptor = "(ZLce;I)Lqr;", + garbageValue = "1939454695" ) @Export("getSprite") public SpritePixels getSprite(boolean var1, UrlRequester var2) { - field3411 = false; // L: 573 - if (this.field3487 != null) { // L: 574 - SpritePixels var3 = this.method5646(var2); // L: 575 + field3407 = false; // L: 573 + if (this.field3431 != null) { // L: 574 + SpritePixels var3 = this.method5546(var2); // L: 575 if (var3 != null) { // L: 576 return var3; // L: 577 } @@ -1320,17 +1306,17 @@ public class Widget extends Node { if (var7 == -1) { // L: 583 return null; } else { - long var4 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.outline << 36) + (long)var7 + ((this.spriteFlipV ? 1L : 0L) << 38); // L: 584 + long var4 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + (long)var7 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38); // L: 584 SpritePixels var6 = (SpritePixels)Widget_cachedSprites.get(var4); // L: 585 if (var6 != null) { // L: 586 return var6; } else { - var6 = class6.SpriteBuffer_getSprite(SoundCache.Widget_spritesArchive, var7, 0); // L: 587 + var6 = StructComposition.SpriteBuffer_getSprite(WorldMapCacheName.Widget_spritesArchive, var7, 0); // L: 587 if (var6 == null) { // L: 588 - field3411 = true; // L: 589 + field3407 = true; // L: 589 return null; // L: 590 } else { - this.method5611(var6); // L: 592 + this.method5442(var6); // L: 592 Widget_cachedSprites.put(var6, var4); // L: 593 return var6; // L: 594 } @@ -1338,23 +1324,23 @@ public class Widget extends Node { } } - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lck;B)Lqi;", - garbageValue = "48" + descriptor = "(Lce;I)Lqr;", + garbageValue = "-503493635" ) - SpritePixels method5646(UrlRequester var1) { - if (!this.method5610()) { // L: 598 - return this.method5609(var1); // L: 599 + SpritePixels method5546(UrlRequester var1) { + if (!this.method5499()) { // L: 598 + return this.method5519(var1); // L: 599 } else { - String var2 = this.field3487 + (this.spriteFlipV ? 1 : 0) + (this.spriteFlipH ? 1 : 0) + this.outline + this.spriteShadow; // L: 601 - SpritePixels var3 = (SpritePixels)field3332.method6601(var2); // L: 602 + String var2 = this.field3431 + (this.spriteFlipV ? 1 : 0) + (this.spriteFlipH ? 1 : 0) + this.outline + this.spriteShadow; // L: 601 + SpritePixels var3 = (SpritePixels)field3378.method6413(var2); // L: 602 if (var3 == null) { // L: 603 - SpritePixels var4 = this.method5609(var1); // L: 604 + SpritePixels var4 = this.method5519(var1); // L: 604 if (var4 != null) { // L: 605 - var3 = var4.method8147(); // L: 606 - this.method5611(var3); // L: 607 - field3332.method6596(var2, var3); // L: 608 + var3 = var4.method8001(); // L: 606 + this.method5442(var3); // L: 607 + field3378.method6402(var2, var3); // L: 608 } } @@ -1362,20 +1348,20 @@ public class Widget extends Node { } } - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lck;B)Lqi;", - garbageValue = "1" + descriptor = "(Lce;I)Lqr;", + garbageValue = "1002412597" ) - SpritePixels method5609(UrlRequester var1) { - if (this.field3487 != null && var1 != null) { // L: 615 - class291 var2 = (class291)field3389.method6601(this.field3487); // L: 616 + SpritePixels method5519(UrlRequester var1) { + if (this.field3431 != null && var1 != null) { // L: 615 + class291 var2 = (class291)field3390.method6413(this.field3431); // L: 616 if (var2 == null) { // L: 617 - var2 = new class291(this.field3487, var1); // L: 618 - field3389.method6596(this.field3487, var2); // L: 619 + var2 = new class291(this.field3431, var1); // L: 618 + field3390.method6402(this.field3431, var2); // L: 619 } - return var2.method5563(); // L: 621 + return var2.method5391(); // L: 621 } else { return null; // L: 623 } @@ -1384,18 +1370,18 @@ public class Widget extends Node { @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1666597852" + garbageValue = "205888634" ) - boolean method5610() { + boolean method5499() { return this.spriteFlipV || this.spriteFlipH || this.outline != 0 || this.spriteShadow != 0; // L: 627 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lqi;I)V", - garbageValue = "576149889" + descriptor = "(Lqr;B)V", + garbageValue = "-110" ) - void method5611(SpritePixels var1) { + void method5442(SpritePixels var1) { if (this.spriteFlipV) { // L: 631 var1.flipVertically(); } @@ -1412,8 +1398,8 @@ public class Widget extends Node { var1.outline(1); } - if (this.outline >= 2) { // L: 635 - var1.outline(16777215); + if (this.outline >= 2) { + var1.outline(16777215); // L: 635 } if (this.spriteShadow != 0) { // L: 636 @@ -1422,14 +1408,14 @@ public class Widget extends Node { } // L: 637 - @ObfuscatedName("d") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)Lmd;", - garbageValue = "-1386663176" + descriptor = "(I)Lmx;", + garbageValue = "797268567" ) @Export("getFont") public Font getFont() { - field3411 = false; // L: 640 + field3407 = false; // L: 640 if (this.fontId == -1) { // L: 641 return null; } else { @@ -1437,11 +1423,11 @@ public class Widget extends Node { if (var1 != null) { // L: 643 return var1; } else { - var1 = class163.method3322(SoundCache.Widget_spritesArchive, class17.Widget_fontsArchive, this.fontId, 0); // L: 644 + var1 = class387.method6781(WorldMapCacheName.Widget_spritesArchive, class93.Widget_fontsArchive, this.fontId, 0); // L: 644 if (var1 != null) { Widget_cachedFonts.put(var1, (long)this.fontId); // L: 645 } else { - field3411 = true; // L: 646 + field3407 = true; // L: 646 } return var1; // L: 647 @@ -1449,14 +1435,14 @@ public class Widget extends Node { } } - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IB)Lqi;", - garbageValue = "7" + descriptor = "(II)Lqr;", + garbageValue = "122047479" ) @Export("getInventorySprite") public SpritePixels getInventorySprite(int var1) { - field3411 = false; // L: 651 + field3407 = false; // L: 651 if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 652 int var2 = this.inventorySprites[var1]; // L: 653 if (var2 == -1) { // L: 654 @@ -1466,11 +1452,11 @@ public class Widget extends Node { if (var3 != null) { // L: 656 return var3; } else { - var3 = class6.SpriteBuffer_getSprite(SoundCache.Widget_spritesArchive, var2, 0); // L: 657 + var3 = StructComposition.SpriteBuffer_getSprite(WorldMapCacheName.Widget_spritesArchive, var2, 0); // L: 657 if (var3 != null) { // L: 658 Widget_cachedSprites.put(var3, (long)var2); } else { - field3411 = true; // L: 659 + field3407 = true; // L: 659 } return var3; // L: 660 @@ -1481,14 +1467,14 @@ public class Widget extends Node { } } - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lgw;IZLkp;I)Liq;", - garbageValue = "-1321759215" + descriptor = "(Lgq;IZLkp;I)Lhv;", + garbageValue = "-1604059191" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerComposition var4) { - field3411 = false; // L: 664 + field3407 = false; // L: 664 int var5; int var6; if (var3) { // L: 667 @@ -1510,7 +1496,7 @@ public class Widget extends Node { if (var5 == 1) { // L: 680 var8 = ModelData.ModelData_get(class162.Widget_modelsArchive, var6, 0); // L: 681 if (var8 == null) { // L: 682 - field3411 = true; // L: 683 + field3407 = true; // L: 683 return null; // L: 684 } @@ -1518,9 +1504,9 @@ public class Widget extends Node { } if (var5 == 2) { // L: 688 - var8 = KeyHandler.getNpcDefinition(var6).getModelData(); // L: 689 + var8 = WorldMapSectionType.getNpcDefinition(var6).getModelData(); // L: 689 if (var8 == null) { // L: 690 - field3411 = true; // L: 691 + field3407 = true; // L: 691 return null; // L: 692 } @@ -1534,7 +1520,7 @@ public class Widget extends Node { var8 = var4.getModelData(); // L: 698 if (var8 == null) { // L: 699 - field3411 = true; // L: 700 + field3407 = true; // L: 700 return null; // L: 701 } @@ -1542,10 +1528,10 @@ public class Widget extends Node { } if (var5 == 4) { // L: 705 - ItemComposition var9 = class19.ItemDefinition_get(var6); // L: 706 + ItemComposition var9 = FileSystem.ItemDefinition_get(var6); // L: 706 var8 = var9.getModelData(10); // L: 707 if (var8 == null) { // L: 708 - field3411 = true; // L: 709 + field3407 = true; // L: 709 return null; // L: 710 } @@ -1563,10 +1549,10 @@ public class Widget extends Node { } } - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ZB)Lki;", - garbageValue = "2" + descriptor = "(ZI)Lka;", + garbageValue = "1947856981" ) @Export("getSpriteMask") public SpriteMask getSpriteMask(boolean var1) { @@ -1574,11 +1560,11 @@ public class Widget extends Node { var1 = false; } - int var2 = var1 ? this.spriteId * -1883530769 * 781497615 : this.spriteId2 * 1275315819 * 43628099; // L: 724 + int var2 = var1 ? this.spriteId * 286536551 * 2004629591 : this.spriteId2 * -1501605973 * -2014760189; // L: 724 if (var2 == -1) { // L: 725 return null; } else { - long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38); // L: 726 + long var3 = ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.spriteShadow << 40); // L: 726 SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); // L: 727 if (var5 != null) { // L: 728 return var5; @@ -1622,10 +1608,10 @@ public class Widget extends Node { } } - @ObfuscatedName("g") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;B)V", - garbageValue = "-60" + garbageValue = "-39" ) @Export("setAction") public void setAction(int var1, String var2) { @@ -1643,328 +1629,287 @@ public class Widget extends Node { this.actions[var1] = var2; // L: 765 } // L: 766 - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-398525420" + garbageValue = "-1684340581" ) - public boolean method5617() { + public boolean method5448() { return !this.isIf3 || this.type == 0 || this.type == 11 || this.hasListener || this.contentType == 1338; // L: 769 } - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lck;J)V" + descriptor = "(Ljava/lang/String;Lce;J)V" ) - public void method5618(String var1, UrlRequester var2, long var3) { - if (this.type == 11 && var3 != -1L) { // L: 773 - var1.replaceAll("%userid%", Long.toString(var3)); // L: 774 - this.field3409 = new class155(); // L: 775 - if (!this.field3409.method3201(var1, var2)) { // L: 776 - this.field3409 = null; // L: 777 + public void method5449(String var1, UrlRequester var2, long var3) { + if (this.type == 11 && -1L != var3) { // L: 773 + var1 = var1.replaceAll("%userid%", Long.toString(var3)); // L: 774 + this.field3408 = new class155(); // L: 775 + if (!this.field3408.method3085(var1, var2)) { // L: 776 + this.field3408 = null; // L: 777 } else { - this.field3354 = new HashMap(); // L: 780 - this.field3412 = new HashMap(); // L: 781 + if (this.field3470 == null || this.field3471 == null) { // L: 780 + this.method5450(); // L: 781 + } + } } - } // L: 778 782 + } // L: 778 783 - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-459125487" + descriptor = "(I)V", + garbageValue = "1904926209" ) - public void method5722(int var1, int var2) { - if (this.type == 11 && this.field3354 != null) { // L: 785 - this.field3354.put(var1, var2); // L: 786 - } - } // L: 787 + void method5450() { + this.field3470 = new HashMap(); // L: 786 + this.field3471 = new HashMap(); // L: 787 + } // L: 788 @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)V", - garbageValue = "1957119277" + descriptor = "(III)V", + garbageValue = "-118212999" ) - public void method5672(String var1, int var2) { - if (this.type == 11 && this.field3412 != null) { // L: 790 - this.field3412.put(var1, var2); // L: 791 - } - } // L: 792 + public void method5451(int var1, int var2) { + if (this.type == 11) { // L: 791 + if (this.field3470 == null) { // L: 792 + this.method5450(); + } - @ObfuscatedName("e") + this.field3470.put(var1, var2); // L: 793 + } + } // L: 794 + + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-22" + descriptor = "(Ljava/lang/String;II)V", + garbageValue = "-2090155850" ) - public boolean method5721(int var1, int var2) { - if (this.type == 11 && this.field3409 != null && this.method5690()) { // L: 795 - int var3 = (int)(this.field3409.method3190()[0] * (float)this.width); // L: 796 - int var4 = (int)(this.field3409.method3190()[1] * (float)this.height); // L: 797 - int var5 = var3 + (int)(this.field3409.method3190()[2] * (float)this.width); // L: 798 - int var6 = var4 + (int)(this.field3409.method3190()[3] * (float)this.height); // L: 799 - return var1 >= var3 && var2 >= var4 && var1 < var5 && var2 < var6; // L: 800 + public void method5468(String var1, int var2) { + if (this.type == 11) { // L: 797 + if (this.field3471 == null) { // L: 798 + this.method5450(); + } + + this.field3471.put(var1, var2); // L: 799 + } + } // L: 800 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(IIIII)Z", + garbageValue = "-1974836941" + ) + public boolean method5474(int var1, int var2, int var3, int var4) { + if (this.type == 11 && this.field3408 != null && this.method5498()) { // L: 803 + var1 -= var3; // L: 804 + var2 -= var4; // L: 805 + int var5 = (int)(this.field3408.method3071()[0] * (float)this.width); // L: 806 + int var6 = (int)(this.field3408.method3071()[1] * (float)this.height); // L: 807 + int var7 = var5 + (int)(this.field3408.method3071()[2] * (float)this.width); // L: 808 + int var8 = var6 + (int)(this.field3408.method3071()[3] * (float)this.height); // L: 809 + return var1 >= var5 && var2 >= var6 && var1 < var7 && var2 < var8; // L: 810 } else { return false; } } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "98" + descriptor = "(I)Z", + garbageValue = "-1289380657" ) - public boolean method5690() { - return this.field3410 == 2; // L: 804 + public boolean method5498() { + return this.field3391 == 2; // L: 814 } - @ObfuscatedName("h") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)I", - garbageValue = "9" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-2103754718" ) - public int method5623(String var1) { - return this.type == 11 && this.field3409 != null && this.method5690() ? this.field3409.method3189(var1) : -1; // L: 808 809 811 + public int method5455(String var1) { + return this.type == 11 && this.field3408 != null && this.method5498() ? this.field3408.method3066(var1) : -1; // L: 818 819 821 } - @ObfuscatedName("ae") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "787247673" + garbageValue = "-386169422" ) - public String method5624(String var1) { - return this.type == 11 && this.field3409 != null && this.method5690() ? this.field3409.method3223(var1) : null; // L: 815 816 + public String method5523(String var1) { + return this.type == 11 && this.field3408 != null && this.method5498() ? this.field3408.method3097(var1) : null; // L: 825 826 } - @ObfuscatedName("aq") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1923228408" + garbageValue = "1984681933" ) - public int method5625() { - return this.field3412 != null && this.field3412.size() > 0 ? 1 : 0; // L: 820 + public int method5457() { + return this.field3471 != null && this.field3471.size() > 0 ? 1 : 0; // L: 830 } - @ObfuscatedName("aw") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-9" + garbageValue = "126" ) - public int method5647() { - if (this.type == 11 && this.field3409 != null && this.field3412 != null && !this.field3412.isEmpty()) { // L: 824 - String var1 = this.field3409.method3188(); // L: 825 - return var1 != null && this.field3412.containsKey(this.field3409.method3188()) ? (Integer)this.field3412.get(var1) : -1; // L: 826 827 829 + public int method5458() { + if (this.type == 11 && this.field3408 != null && this.field3471 != null && !this.field3471.isEmpty()) { // L: 834 + String var1 = this.field3408.method3075(); // L: 835 + return var1 != null && this.field3471.containsKey(this.field3408.method3075()) ? (Integer)this.field3471.get(var1) : -1; // L: 836 837 839 } else { return -1; } } - @ObfuscatedName("am") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(B)Ljava/lang/String;", - garbageValue = "-41" + garbageValue = "-24" ) - public String method5627() { - if (this.type == 11 && this.field3409 != null) { // L: 833 - String var1 = this.field3409.method3188(); // L: 834 - Iterator var2 = this.field3409.method3191().iterator(); // L: 835 + public String method5480() { + if (this.type == 11 && this.field3408 != null) { // L: 843 + String var1 = this.field3408.method3075(); // L: 844 + Iterator var2 = this.field3408.method3072().iterator(); // L: 845 while (var2.hasNext()) { - class166 var3 = (class166)var2.next(); // L: 836 - String var4 = String.format("%%%S%%", var3.method3336()); // L: 838 - if (var3.vmethod3341() == 0) { // L: 839 - var1.replaceAll(var4, Integer.toString(var3.vmethod3334())); // L: 840 + class166 var3 = (class166)var2.next(); // L: 846 + String var4 = String.format("%%%S%%", var3.method3226()); // L: 848 + if (var3.vmethod3227() == 0) { // L: 849 + var1.replaceAll(var4, Integer.toString(var3.vmethod3228())); // L: 850 } else { - var1.replaceAll(var4, var3.vmethod3333()); // L: 843 + var1.replaceAll(var4, var3.vmethod3238()); // L: 853 } } - return var1; // L: 847 + return var1; // L: 857 } else { - return null; // L: 846 + return null; // L: 856 } } - @ObfuscatedName("ak") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(I)[I", - garbageValue = "998374015" + garbageValue = "-216583671" ) - public int[] method5628() { - if (this.type == 11 && this.field3409 != null) { // L: 851 - int[] var1 = new int[3]; // L: 852 - int var2 = 0; // L: 853 - Iterator var3 = this.field3409.method3191().iterator(); // L: 854 + public int[] method5460() { + if (this.type == 11 && this.field3408 != null) { // L: 861 + int[] var1 = new int[3]; // L: 862 + int var2 = 0; // L: 863 + Iterator var3 = this.field3408.method3072().iterator(); // L: 864 while (var3.hasNext()) { - class166 var4 = (class166)var3.next(); // L: 855 - if (!var4.method3336().equals("user_id")) { // L: 857 - if (var4.vmethod3341() != 0) { // L: 858 - return null; // L: 865 + class166 var4 = (class166)var3.next(); // L: 865 + if (!var4.method3226().equals("user_id")) { // L: 867 + if (var4.vmethod3227() != 0) { // L: 868 + return null; // L: 875 } - var1[var2++] = var4.vmethod3334(); // L: 859 - if (var2 > 3) { // L: 860 - return null; // L: 861 + var1[var2++] = var4.vmethod3228(); // L: 869 + if (var2 > 3) { // L: 870 + return null; // L: 871 } } } - return var1; // L: 870 + return var1; // L: 880 } else { return null; } } - @ObfuscatedName("ao") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lck;I)Z", - garbageValue = "-1463897993" + descriptor = "(Lce;I)Z", + garbageValue = "1243855497" ) - public boolean method5629(UrlRequester var1) { - if (this.type == 11 && this.field3409 != null) { // L: 874 - this.field3409.method3184(var1); // L: 875 - if (this.field3409.method3230() != this.field3410) { // L: 876 - this.field3410 = this.field3409.method3230(); // L: 877 - if (this.field3410 >= 100) { // L: 878 - return false; // L: 879 + public boolean method5517(UrlRequester var1) { + if (this.type == 11 && this.field3408 != null) { // L: 884 + this.field3408.method3064(var1); // L: 885 + if (this.field3408.method3067() != this.field3391) { // L: 886 + this.field3391 = this.field3408.method3067(); // L: 887 + if (this.field3391 >= 100) { // L: 888 + return true; // L: 889 } - if (this.field3410 == 2) { // L: 881 - this.method5701(); // L: 882 - return true; // L: 883 + if (this.field3391 == 2) { // L: 891 + this.method5462(); // L: 892 + return true; // L: 893 } } - return false; // L: 886 + return false; // L: 896 } else { return false; } } - @ObfuscatedName("al") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1471555316" + descriptor = "(B)V", + garbageValue = "7" ) - void method5701() { - this.noClickThrough = true; // L: 907 - ArrayList var1 = this.field3409.method3187(); // L: 908 - ArrayList var2 = this.field3409.method3229(); // L: 909 - int var3 = var1.size() + var2.size(); // L: 910 - this.children = new Widget[var3]; // L: 911 - int var4 = 0; // L: 912 + void method5462() { + this.noClickThrough = true; // L: 917 + ArrayList var1 = this.field3408.method3110(); // L: 918 + ArrayList var2 = this.field3408.method3069(); // L: 919 + int var3 = var1.size() + var2.size(); // L: 920 + this.children = new Widget[var3]; // L: 921 + int var4 = 0; // L: 922 Iterator var5; Widget var7; - for (var5 = var1.iterator(); var5.hasNext(); this.children[var4++] = var7) { // L: 913 920 - class160 var6 = (class160)var5.next(); // L: 914 - var7 = class83.method2111(5, this, var4, 0, 0, 0, 0, var6.field1735); // L: 916 - var7.field3487 = var6.field1737.method2554(); // L: 917 - class291 var8 = new class291(var6.field1737); // L: 918 - field3389.method6596(var7.field3487, var8); // L: 919 + for (var5 = var1.iterator(); var5.hasNext(); this.children[var4++] = var7) { // L: 923 930 + class160 var6 = (class160)var5.next(); // L: 924 + var7 = class273.method5077(5, this, var4, 0, 0, 0, 0, var6.field1782); // L: 926 + var7.field3431 = var6.field1783.method2556(); // L: 927 + class291 var8 = new class291(var6.field1783); // L: 928 + field3390.method6402(var7.field3431, var8); // L: 929 } - for (var5 = var2.iterator(); var5.hasNext(); this.children[var4++] = var7) { // L: 923 931 - class162 var9 = (class162)var5.next(); // L: 924 - var7 = class83.method2111(4, this, var4, 0, 0, 0, 0, var9.field1754); // L: 926 - var7.text = var9.field1758; // L: 927 - var7.fontId = (Integer)this.field3354.get(var9.field1752); // L: 928 - var7.textXAlignment = var9.field1755; // L: 929 - var7.textYAlignment = var9.field1756; // L: 930 + for (var5 = var2.iterator(); var5.hasNext(); this.children[var4++] = var7) { // L: 933 941 + class162 var9 = (class162)var5.next(); // L: 934 + var7 = class273.method5077(4, this, var4, 0, 0, 0, 0, var9.field1804); // L: 936 + var7.text = var9.field1803; // L: 937 + var7.fontId = (Integer)this.field3470.get(var9.field1807); // L: 938 + var7.textXAlignment = var9.field1811; // L: 939 + var7.textYAlignment = var9.field1806; // L: 940 } - } // L: 934 + } // L: 944 - @ObfuscatedName("v") + @ObfuscatedName("gz") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", - garbageValue = "-2380539" + descriptor = "(II)V", + garbageValue = "543446302" ) - @Export("RunException_sendStackTrace") - public static void RunException_sendStackTrace(String var0, Throwable var1) { - if (var1 != null) { - var1.printStackTrace(); + @Export("setWindowedMode") + static void setWindowedMode(int var0) { + Client.field711 = 0L; // L: 4345 + if (var0 >= 2) { // L: 4346 + Client.isResizable = true; } else { - try { - String var2 = ""; // L: 33 - if (var1 != null) { // L: 34 - var2 = class128.method2853(var1); - } - - if (var0 != null) { // L: 35 - if (var1 != null) { // L: 36 - var2 = var2 + " | "; - } - - var2 = var2 + var0; // L: 37 - } - - 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=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + WorldMapRegion.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 - } - + Client.isResizable = false; // L: 4347 } - } // L: 51 - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "([BIILhv;[Lgv;I)V", - garbageValue = "-2111400483" - ) - static final void method5681(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { - Buffer var5 = new Buffer(var0); // L: 266 - int var6 = -1; // L: 267 - - while (true) { - int var7 = var5.method7743(); // L: 269 - if (var7 == 0) { // L: 270 - return; // L: 294 - } - - var6 += var7; // L: 271 - int var8 = 0; // L: 272 - - while (true) { - int var9 = var5.readUShortSmart(); // L: 274 - if (var9 == 0) { // L: 275 - break; - } - - var8 += var9 - 1; // L: 276 - int var10 = var8 & 63; // L: 277 - int var11 = var8 >> 6 & 63; // L: 278 - int var12 = var8 >> 12; // L: 279 - int var13 = var5.readUnsignedByte(); // L: 280 - int var14 = var13 >> 2; // L: 281 - int var15 = var13 & 3; // L: 282 - int var16 = var11 + var1; // L: 283 - int var17 = var10 + var2; // L: 284 - if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { // L: 285 - int var18 = var12; // L: 286 - if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { // L: 287 - var18 = var12 - 1; - } - - CollisionMap var19 = null; // L: 288 - if (var18 >= 0) { // L: 289 - var19 = var4[var18]; - } - - WorldMapElement.addObjects(var12, var16, var17, var6, var15, var14, var3, var19); // L: 290 - } - } + if (ClanChannelMember.getWindowedMode() == 1) { // L: 4348 + class82.client.setMaxCanvasSize(765, 503); // L: 4349 + } else { + class82.client.setMaxCanvasSize(7680, 2160); // L: 4352 } - } + + if (Client.gameState >= 25) { // L: 4354 + PacketBufferNode var1 = WallDecoration.getPacketBufferNode(ClientPacket.field3054, Client.packetWriter.isaacCipher); // L: 4356 + var1.packetBuffer.writeByte(ClanChannelMember.getWindowedMode()); // L: 4357 + var1.packetBuffer.writeShort(GraphicsObject.canvasWidth); // L: 4358 + var1.packetBuffer.writeShort(class433.canvasHeight); // L: 4359 + Client.packetWriter.addNode(var1); // L: 4360 + } + + } // L: 4362 } diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index 22d0fcd76f..6ca477c7f1 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -1,67 +1,78 @@ -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLConnection; +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("bb") +@ObfuscatedName("bx") @Implements("World") public class World { - @ObfuscatedName("n") + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Llp;" + ) + @Export("HealthBarDefinition_archive") + public static AbstractArchive HealthBarDefinition_archive; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "[Lbx;" + ) + @Export("World_worlds") + static World[] World_worlds; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -99479259 + intValue = -49642273 ) @Export("World_count") static int World_count; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 666094335 + intValue = 1914794519 ) @Export("World_listCount") static int World_listCount; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("World_sortOption2") static int[] World_sortOption2; - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("World_sortOption1") static int[] World_sortOption1; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 2132870801 + intValue = -2104390663 ) @Export("id") int id; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1264114231 + intValue = -1147317399 ) @Export("properties") int properties; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1643368369 + intValue = -1040415463 ) @Export("population") int population; - @ObfuscatedName("k") + @ObfuscatedName("b") @Export("host") String host; - @ObfuscatedName("d") + @ObfuscatedName("t") @Export("activity") String activity; - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 786542067 + intValue = 1070673927 ) @Export("location") int location; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -154567813 + intValue = 1367786099 ) @Export("index") int index; @@ -76,137 +87,179 @@ public class World { World() { } // L: 27 - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" - ) - @Export("isMembersOnly") - boolean isMembersOnly() { - return (1 & this.properties) != 0; // L: 247 - } - @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1237619504" + garbageValue = "1167895037" ) - boolean method1637() { - return (2 & this.properties) != 0; // L: 251 - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1559605214" - ) - @Export("isPvp") - boolean isPvp() { - return (4 & this.properties) != 0; // L: 255 - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-3" - ) - boolean method1639() { - return (8 & this.properties) != 0; // L: 259 - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1091774244" - ) - @Export("isDeadman") - boolean isDeadman() { - return (536870912 & this.properties) != 0; // L: 263 - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-980357381" - ) - @Export("isBeta") - boolean isBeta() { - return (33554432 & this.properties) != 0; // L: 267 - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-67" - ) - boolean method1642() { - return (1073741824 & this.properties) != 0; // L: 271 + @Export("isMembersOnly") + boolean isMembersOnly() { + return (1 & this.properties) != 0; // L: 257 } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "248587859" + descriptor = "(I)Z", + garbageValue = "-1033703792" ) - static long method1678() { - try { - URL var0 = new URL(ArchiveLoader.method2063("services", false) + "m=accountappeal/login.ws"); // L: 36 - URLConnection var1 = var0.openConnection(); - var1.setRequestProperty("connection", "close"); - var1.setDoInput(true); - 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 + boolean method1615() { + return (2 & this.properties) != 0; // L: 261 + } - do { - int var5 = var3.read(var4.array, var4.offset, 1000 - var4.offset); // L: 48 - if (var5 == -1) { - var4.offset = 0; // L: 55 - long var7 = var4.readLong(); // L: 56 - return var7; // L: 57 - } - - var4.offset += var5; // L: 50 - } while(var4.offset < 1000); - - return 0L; // L: 52 - } catch (Exception var9) { - return 0L; // L: 60 - } + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(S)Z", + garbageValue = "20770" + ) + @Export("isPvp") + boolean isPvp() { + return (4 & this.properties) != 0; // L: 265 } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-88" + descriptor = "(B)Z", + garbageValue = "87" ) - public static int method1673(int var0) { - long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; // L: 49 - int var1 = (int)(var2 >>> 0 & 127L); // L: 51 - return var1; // L: 53 + boolean method1644() { + return (8 & this.properties) != 0; } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "2080667319" + descriptor = "(I)Z", + garbageValue = "78921463" ) - public static int method1679(int var0, int var1, int var2) { - int var3 = class54.method1078(var2 - var1 + 1); // L: 37 - var3 <<= var1; // L: 38 - return var0 & ~var3; // L: 39 + @Export("isDeadman") + boolean isDeadman() { + return (536870912 & this.properties) != 0; // L: 273 } - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1622392704" + descriptor = "(I)Z", + garbageValue = "-1500446551" ) - public static int method1677() { - return ++MouseHandler.MouseHandler_idleCycles - 1; // L: 59 + @Export("isBeta") + boolean isBeta() { + return (33554432 & this.properties) != 0; // L: 277 } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-97" + ) + boolean method1619() { + return (1073741824 & this.properties) != 0; // L: 281 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Llp;I)V", + garbageValue = "-1000029725" + ) + public static void method1662(AbstractArchive var0) { + StructComposition.StructDefinition_archive = var0; // L: 19 + } // L: 20 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZLjava/lang/String;ZB)V", + garbageValue = "59" + ) + static void method1663(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 + } + } + + if (class29.field168.startsWith("win") && !var3) { // L: 39 40 + Skills.method5578(var0, 0, "openjs"); // L: 42 + return; // L: 44 + } + + if (class29.field168.startsWith("mac")) { // L: 47 + Skills.method5578(var0, 1, var2); // L: 48 + return; // L: 49 + } + + Skills.method5578(var0, 2, "openjs"); // L: 52 + } else { + Skills.method5578(var0, 3, "openjs"); // L: 57 + } + + } // L: 60 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(IIIB)V", + garbageValue = "-105" + ) + static final void method1661(int var0, int var1, int var2) { + int var3; + for (var3 = 0; var3 < 8; ++var3) { // L: 153 + for (int var4 = 0; var4 < 8; ++var4) { // L: 154 + Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; + } + } + + if (var1 > 0) { // L: 156 + for (var3 = 1; var3 < 8; ++var3) { // L: 157 + Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; + } + } + + if (var2 > 0) { // L: 159 + for (var3 = 1; var3 < 8; ++var3) { // L: 160 + 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: 162 + 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: 163 + 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: 164 + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; + } + + } // L: 165 + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(Lao;B)V", + garbageValue = "1" + ) + @Export("PcmStream_disable") + static final void PcmStream_disable(PcmStream var0) { + var0.active = false; // L: 266 + if (var0.sound != null) { // L: 267 + var0.sound.position = 0; + } + + for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { + PcmStream_disable(var1); // L: 268 + } + + } // L: 269 + + @ObfuscatedName("kk") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "64" + ) + static final void method1664(int var0) { + var0 = Math.max(Math.min(var0, 100), 0); // L: 12037 + var0 = 100 - var0; // L: 12038 + float var1 = (float)var0 / 200.0F + 0.5F; // L: 12039 + Rasterizer3D.Rasterizer3D_setBrightness((double)var1); // L: 12041 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness((double)var1); // L: 12042 + VerticalAlignment.method3446(); // L: 12043 + class12.clientPreferences.method2232((double)var1); // L: 12044 + } // L: 12046 } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 9bb83cf66a..b497d610b9 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -10,280 +10,280 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ov") +@ObfuscatedName("op") @Implements("WorldMap") public class WorldMap { - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpi;" ) @Export("fontNameVerdana11") static final FontName fontNameVerdana11; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpi;" ) @Export("fontNameVerdana13") static final FontName fontNameVerdana13; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpi;" ) @Export("fontNameVerdana15") static final FontName fontNameVerdana15; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("WorldMap_archive") AbstractArchive WorldMap_archive; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lmx;" ) @Export("font") Font font; - @ObfuscatedName("k") + @ObfuscatedName("b") @Export("fonts") HashMap fonts; - @ObfuscatedName("d") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "[Lqq;" + descriptor = "[Lqd;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("m") + @ObfuscatedName("g") @Export("details") HashMap details; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lhm;" ) @Export("mainMapArea") WorldMapArea mainMapArea; - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lhm;" ) @Export("currentMapArea") WorldMapArea currentMapArea; - @ObfuscatedName("g") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lhm;" ) - WorldMapArea field4470; - @ObfuscatedName("x") + WorldMapArea field4570; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lgq;" + descriptor = "Lhp;" ) @Export("worldMapManager") WorldMapManager worldMapManager; - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Loo;" + descriptor = "Loy;" ) @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -204052953 + intValue = -1559878287 ) @Export("centerTileX") int centerTileX; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 219914903 + intValue = -666870475 ) @Export("centerTileY") int centerTileY; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1572186899 + intValue = -1443106973 ) @Export("worldMapTargetX") int worldMapTargetX; - @ObfuscatedName("z") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1716305029 + intValue = 868076553 ) @Export("worldMapTargetY") int worldMapTargetY; - @ObfuscatedName("h") + @ObfuscatedName("u") @Export("zoom") float zoom; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("zoomTarget") float zoomTarget; - @ObfuscatedName("aq") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -170913605 + intValue = 995814995 ) @Export("worldMapDisplayWidth") int worldMapDisplayWidth; - @ObfuscatedName("aw") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 1495575421 + intValue = 38560009 ) @Export("worldMapDisplayHeight") int worldMapDisplayHeight; - @ObfuscatedName("am") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1912893677 + intValue = -156430915 ) @Export("worldMapDisplayX") int worldMapDisplayX; - @ObfuscatedName("ak") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 1000081531 + intValue = 851387081 ) @Export("worldMapDisplayY") int worldMapDisplayY; - @ObfuscatedName("ao") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -247126339 + intValue = 1687396607 ) @Export("maxFlashCount") int maxFlashCount; - @ObfuscatedName("aj") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 372546071 + intValue = 1963218407 ) @Export("cyclesPerFlash") int cyclesPerFlash; - @ObfuscatedName("al") + @ObfuscatedName("az") @Export("perpetualFlash") boolean perpetualFlash; - @ObfuscatedName("av") + @ObfuscatedName("ap") @Export("flashingElements") HashSet flashingElements; - @ObfuscatedName("at") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 793373045 + intValue = -603667465 ) @Export("flashCount") int flashCount; - @ObfuscatedName("an") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 129908321 + intValue = -127369607 ) @Export("flashCycle") int flashCycle; - @ObfuscatedName("ay") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -56119659 + intValue = -2064512495 ) - int field4478; - @ObfuscatedName("ag") - @ObfuscatedGetter( - intValue = 1571569859 - ) - int field4490; - @ObfuscatedName("ah") - @ObfuscatedGetter( - intValue = -1208790781 - ) - int field4476; - @ObfuscatedName("ac") - @ObfuscatedGetter( - intValue = -1439661763 - ) - int field4492; - @ObfuscatedName("ab") - @ObfuscatedGetter( - longValue = -4966636021843214621L - ) - long field4493; - @ObfuscatedName("au") - @ObfuscatedGetter( - intValue = 188135575 - ) - int field4494; + int field4541; @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -1117440409 + intValue = 2057640455 ) - int field4487; + int field4551; + @ObfuscatedName("al") + @ObfuscatedGetter( + intValue = -2141365015 + ) + int field4529; + @ObfuscatedName("aq") + @ObfuscatedGetter( + intValue = -958570419 + ) + int field4553; @ObfuscatedName("ad") - boolean field4496; - @ObfuscatedName("ar") + @ObfuscatedGetter( + longValue = -5163791974859805081L + ) + long field4554; + @ObfuscatedName("an") + @ObfuscatedGetter( + intValue = 1120511121 + ) + int field4555; + @ObfuscatedName("aw") + @ObfuscatedGetter( + intValue = -3362241 + ) + int field4549; + @ObfuscatedName("ah") + boolean field4557; + @ObfuscatedName("ai") @Export("enabledElements") HashSet enabledElements; - @ObfuscatedName("ap") + @ObfuscatedName("ay") @Export("enabledCategories") HashSet enabledCategories; - @ObfuscatedName("az") + @ObfuscatedName("aa") @Export("enabledElementIds") HashSet enabledElementIds; - @ObfuscatedName("as") - HashSet field4500; - @ObfuscatedName("aa") + @ObfuscatedName("ax") + HashSet field4534; + @ObfuscatedName("at") @Export("elementsDisabled") boolean elementsDisabled; - @ObfuscatedName("bj") - @ObfuscatedGetter( - intValue = 671682067 - ) - int field4502; @ObfuscatedName("br") + @ObfuscatedGetter( + intValue = 1230820063 + ) + int field4564; + @ObfuscatedName("bk") @Export("menuOpcodes") final int[] menuOpcodes; - @ObfuscatedName("bo") - List field4468; - @ObfuscatedName("bl") + @ObfuscatedName("bi") + List field4566; + @ObfuscatedName("bc") @Export("iconIterator") Iterator iconIterator; - @ObfuscatedName("be") - HashSet field4506; - @ObfuscatedName("bh") + @ObfuscatedName("bo") + HashSet field4522; + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "Lks;" + descriptor = "Lkd;" ) @Export("mouseCoord") Coord mouseCoord; - @ObfuscatedName("bf") + @ObfuscatedName("bs") @Export("showCoord") public boolean showCoord; - @ObfuscatedName("bb") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "Lqi;" + descriptor = "Lqr;" ) @Export("sprite") SpritePixels sprite; - @ObfuscatedName("bw") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = 1339558425 + intValue = -1650255965 ) @Export("cachedPixelsPerTile") int cachedPixelsPerTile; - @ObfuscatedName("bx") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 470203205 + intValue = -52298735 ) @Export("minCachedTileX") int minCachedTileX; - @ObfuscatedName("bg") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = 925038883 + intValue = -708034989 ) @Export("minCachedTileY") int minCachedTileY; - @ObfuscatedName("bn") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -1007232389 + intValue = 2043409555 ) - int field4513; + int field4575; static { fontNameVerdana11 = FontName.FontName_verdana11; // L: 46 @@ -304,30 +304,30 @@ public class WorldMap { this.flashingElements = null; // L: 71 this.flashCount = -1; // L: 72 this.flashCycle = -1; // L: 73 - this.field4478 = -1; // L: 74 - this.field4490 = -1; // L: 75 - this.field4476 = -1; // L: 76 - this.field4492 = -1; // L: 77 - this.field4496 = true; // L: 81 + this.field4541 = -1; // L: 74 + this.field4551 = -1; // L: 75 + this.field4529 = -1; // L: 76 + this.field4553 = -1; // L: 77 + this.field4557 = true; // L: 81 this.enabledElements = new HashSet(); // L: 84 this.enabledCategories = new HashSet(); // L: 85 this.enabledElementIds = new HashSet(); // L: 86 - this.field4500 = new HashSet(); // L: 87 + this.field4534 = new HashSet(); // L: 87 this.elementsDisabled = false; // L: 88 - this.field4502 = 0; // L: 89 + this.field4564 = 0; // L: 89 this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; // L: 91 - this.field4506 = new HashSet(); // L: 94 + this.field4522 = 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.field4513 = -1; // L: 101 + this.field4575 = -1; // L: 101 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lln;Lln;Lln;Lmd;Ljava/util/HashMap;[Lqq;B)V", - garbageValue = "-57" + descriptor = "(Llp;Llp;Llp;Lmx;Ljava/util/HashMap;[Lqd;I)V", + garbageValue = "-1151544367" ) @Export("init") public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) { @@ -341,7 +341,7 @@ public class WorldMap { this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); // 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.field2413.name); // L: 115 + int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2910.name); // L: 115 int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); // L: 116 this.details = new HashMap(var8.length); // L: 117 @@ -356,1084 +356,1107 @@ public class WorldMap { } this.setCurrentMapArea(this.mainMapArea); // L: 127 - this.field4470 = null; // L: 128 + this.field4570 = null; // L: 128 } // L: 129 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-36" + descriptor = "(I)V", + garbageValue = "1737616762" ) - public void method7215() { - WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); // L: 133 - } // L: 135 + public void method7023() { + class175.method3380(); // L: 132 + } // L: 133 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIZIIIIB)V", - garbageValue = "0" + descriptor = "(IIZIIIII)V", + garbageValue = "794881818" ) @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 - this.scrollToTarget(); // L: 142 - 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.method4186(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 + if (this.cacheLoader.isLoaded()) { // L: 136 + this.smoothZoom(); // L: 139 + this.scrollToTarget(); // L: 140 + if (var3) { // L: 141 + int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); // L: 144 + int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); // L: 145 + List var10 = this.worldMapManager.method4645(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: 146 + HashSet var11 = new HashSet(); // L: 147 Iterator var12; AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for (var12 = var10.iterator(); var12.hasNext(); ClanSettings.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.field4506.contains(var13)) { // L: 157 - var14.setType(17); // L: 158 + for (var12 = var10.iterator(); var12.hasNext(); class144.runScriptEvent(var14)) { // L: 148 161 + var13 = (AbstractWorldMapIcon)var12.next(); // L: 149 + var11.add(var13); // L: 151 + var14 = new ScriptEvent(); // L: 152 + var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 153 + var14.setArgs(new Object[]{var15, var1, var2}); // L: 154 + if (this.field4522.contains(var13)) { // L: 155 + var14.setType(17); // L: 156 } else { - var14.setType(15); // L: 161 + var14.setType(15); // L: 159 } } - var12 = this.field4506.iterator(); // L: 166 + var12 = this.field4522.iterator(); // L: 164 while (var12.hasNext()) { - var13 = (AbstractWorldMapIcon)var12.next(); // L: 167 - if (!var11.contains(var13)) { // L: 169 - var14 = new ScriptEvent(); // L: 170 - 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 - ClanSettings.runScriptEvent(var14); // L: 174 + var13 = (AbstractWorldMapIcon)var12.next(); // L: 165 + if (!var11.contains(var13)) { // L: 167 + var14 = new ScriptEvent(); // L: 168 + var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 169 + var14.setArgs(new Object[]{var15, var1, var2}); // L: 170 + var14.setType(16); // L: 171 + class144.runScriptEvent(var14); // L: 172 } } - this.field4506 = var11; // L: 178 + this.field4522 = var11; // L: 176 } } - } // L: 139 144 179 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IIZZB)V", - garbageValue = "-38" - ) - public void method7217(int var1, int var2, boolean var3, boolean var4) { - long var5 = class136.method2931(); // L: 182 - this.method7218(var1, var2, var4, var5); // L: 183 - if (this.hasTarget() || !var4 && !var3) { // L: 184 - this.method7222(); // L: 198 - } else { - if (var4) { // L: 185 - this.field4476 = var1; // L: 186 - this.field4492 = var2; // L: 187 - this.field4478 = this.centerTileX; // L: 188 - this.field4490 = this.centerTileY; // L: 189 - } - - if (this.field4478 != -1) { // L: 191 - int var7 = var1 - this.field4476; // L: 192 - int var8 = var2 - this.field4492; // L: 193 - this.setWorldMapPosition(this.field4478 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4490, false); // L: 194 - } - } - - if (var4) { // L: 200 - this.field4493 = var5; // L: 201 - this.field4494 = var1; // L: 202 - this.field4487 = var2; // L: 203 - } - - } // L: 205 - - @ObfuscatedName("b") - void method7218(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 (class113.method2651() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 213 - StructComposition.method3619(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); // L: 214 - } else { - boolean var8 = true; // L: 217 - if (this.field4496) { // L: 218 - int var9 = var1 - this.field4494; // L: 219 - int var10 = var2 - this.field4487; // L: 220 - if (var4 - this.field4493 > 500L || var9 < -25 || var9 > 25 || var10 < -25 || var10 > 25) { // L: 221 - var8 = false; // L: 222 - } - } - - if (var8) { // L: 225 - PacketBufferNode var11 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2948, Client.packetWriter.isaacCipher); // L: 226 - var11.packetBuffer.writeInt(this.mouseCoord.packed()); // L: 227 - Client.packetWriter.addNode(var11); // L: 228 - this.field4493 = 0L; // L: 229 - } - } - } - } else { - this.mouseCoord = null; // L: 234 - } - - } // L: 235 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-521549937" - ) - @Export("smoothZoom") - void smoothZoom() { - if (VarcInt.field1841 != 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 + this.zoom / 30.0F); // L: 243 - } - - if (this.zoom > this.zoomTarget) { // L: 245 - this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); // L: 246 - } - - } - } // L: 240 248 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "54677905" - ) - @Export("scrollToTarget") - void scrollToTarget() { - if (this.hasTarget()) { // L: 251 - int var1 = this.worldMapTargetX - this.centerTileX; // L: 254 - int var2 = this.worldMapTargetY - this.centerTileY; // L: 255 - if (var1 != 0) { // L: 256 - var1 /= Math.min(8, Math.abs(var1)); // L: 257 - } - - if (var2 != 0) { // L: 259 - var2 /= Math.min(8, Math.abs(var2)); // L: 260 - } - - this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 262 - if (this.centerTileX == this.worldMapTargetX && this.centerTileY == this.worldMapTargetY) { // L: 263 - this.worldMapTargetX = -1; // L: 264 - this.worldMapTargetY = -1; // L: 265 - } - - } - } // L: 252 267 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "1721152529" - ) - @Export("setWorldMapPosition") - final void setWorldMapPosition(int var1, int var2, boolean var3) { - this.centerTileX = var1; // L: 270 - this.centerTileY = var2; // L: 271 - class136.method2931(); // L: 272 - if (var3) { - this.method7222(); // L: 273 - } - - } // L: 274 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" - ) - final void method7222() { - this.field4492 = -1; // L: 277 - this.field4476 = -1; // L: 278 - this.field4490 = -1; // L: 279 - this.field4478 = -1; // L: 280 - } // L: 281 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "2003911116" - ) - @Export("hasTarget") - boolean hasTarget() { - return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 284 - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(IIII)Lgu;", - garbageValue = "837342952" - ) - @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()) { - return null; // L: 296 - } - - var5 = (WorldMapArea)var4.next(); // L: 289 - } while(!var5.containsCoord(var1, var2, var3)); // L: 291 - - return var5; // L: 292 - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(IIIZB)V", - garbageValue = "9" - ) - public void method7327(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 - return; // L: 305 - } - - var5 = this.mainMapArea; // L: 303 - } - - boolean var6 = false; // L: 307 - if (var5 != this.field4470 || var4) { // L: 308 - this.field4470 = var5; // L: 309 - this.setCurrentMapArea(var5); // L: 310 - var6 = true; // L: 311 - } - - if (var6 || var4) { // L: 313 - this.jump(var1, var2, var3); // L: 314 - } - - } // L: 316 - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "6" - ) - @Export("setCurrentMapAreaId") - public void setCurrentMapAreaId(int var1) { - WorldMapArea var2 = this.getMapArea(var1); // L: 319 - if (var2 != null) { // L: 320 - this.setCurrentMapArea(var2); // L: 321 - } - - } // L: 323 + } // L: 137 142 177 @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "673781183" + descriptor = "(IIZZI)V", + garbageValue = "1498569206" ) - @Export("currentMapAreaId") - public int currentMapAreaId() { - return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 326 327 329 - } + public void method7025(int var1, int var2, boolean var3, boolean var4) { + long var5 = class113.method2624(); // L: 180 + this.method7026(var1, var2, var4, var5); // L: 181 + if (this.hasTarget() || !var4 && !var3) { // L: 182 + this.method7030(); // L: 196 + } else { + if (var4) { // L: 183 + this.field4529 = var1; // L: 184 + this.field4553 = var2; // L: 185 + this.field4541 = this.centerTileX; // L: 186 + this.field4551 = this.centerTileY; // L: 187 + } - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)Lgu;", - garbageValue = "-1495787888" - ) - @Export("getCurrentMapArea") - public WorldMapArea getCurrentMapArea() { - return this.currentMapArea; // L: 333 - } + if (this.field4541 != -1) { // L: 189 + int var7 = var1 - this.field4529; // L: 190 + int var8 = var2 - this.field4553; // L: 191 + this.setWorldMapPosition(this.field4541 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4551, false); // L: 192 + } + } + + if (var4) { // L: 198 + this.field4554 = var5; // L: 199 + this.field4555 = var1; // L: 200 + this.field4549 = var2; // L: 201 + } + + } // L: 203 + + @ObfuscatedName("a") + void method7026(int var1, int var2, boolean var3, long var4) { + if (this.currentMapArea != null) { // L: 206 + int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); // L: 207 + int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); // L: 208 + this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); // L: 209 + if (this.mouseCoord != null && var3) { // L: 210 + boolean var8 = Client.staffModLevel >= 2; // L: 213 + if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 215 + class123.method2781(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); // L: 216 + } else { + boolean var9 = true; // L: 219 + if (this.field4557) { // L: 220 + int var10 = var1 - this.field4555; // L: 221 + int var11 = var2 - this.field4549; // L: 222 + if (var4 - this.field4554 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { // L: 223 + var9 = false; // L: 224 + } + } + + if (var9) { // L: 227 + PacketBufferNode var12 = WallDecoration.getPacketBufferNode(ClientPacket.field2974, Client.packetWriter.isaacCipher); // L: 228 + var12.packetBuffer.writeIntME(this.mouseCoord.packed()); // L: 229 + Client.packetWriter.addNode(var12); // L: 230 + this.field4554 = 0L; // L: 231 + } + } + } + } else { + this.mouseCoord = null; // L: 236 + } + + } // L: 237 @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lgu;B)V", - garbageValue = "-27" + descriptor = "(B)V", + garbageValue = "19" ) - @Export("setCurrentMapArea") - void setCurrentMapArea(WorldMapArea var1) { - if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 337 - this.initializeWorldMapManager(var1); // L: 340 - this.jump(-1, -1, -1); // L: 341 - } - } // L: 338 342 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Lgu;I)V", - garbageValue = "1382384596" - ) - @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("t") - @ObfuscatedSignature( - descriptor = "(Lgu;Lks;Lks;ZI)V", - garbageValue = "-1940143695" - ) - public void method7231(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 - } - - if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { // L: 357 - this.jump(var2.plane, var2.x, var2.y); // L: 361 - } else { - this.jump(var3.plane, var3.x, var3.y); // L: 358 - } - - } - } // L: 352 363 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-537383689" - ) - @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 - if (var4 == null) { // L: 370 - var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); // L: 371 - } - - this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); // L: 373 - this.worldMapTargetX = -1; // L: 374 - this.worldMapTargetY = -1; // L: 375 - this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 376 - this.zoomTarget = this.zoom; // L: 377 - this.field4468 = null; // L: 378 - this.iconIterator = null; // L: 379 - this.worldMapManager.clearIcons(); // L: 380 - } - } // L: 367 381 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(IIIIIB)V", - garbageValue = "4" - ) - @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 - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); // L: 386 - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 387 - int var7 = this.cacheLoader.getPercentLoaded(); // L: 388 - if (var7 < 100) { // L: 389 - this.drawLoading(var1, var2, var3, var4, var7); // L: 390 + @Export("smoothZoom") + void smoothZoom() { + if (class127.field1570 != null) { // L: 240 + this.zoom = this.zoomTarget; // L: 241 } else { - if (!this.worldMapManager.isLoaded()) { // L: 393 - this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 394 - if (!this.worldMapManager.isLoaded()) { // L: 395 - return; // L: 396 - } + if (this.zoom < this.zoomTarget) { // L: 244 + this.zoom = Math.min(this.zoomTarget, this.zoom + this.zoom / 30.0F); // L: 245 } - if (this.flashingElements != null) { // L: 399 - ++this.flashCycle; // L: 400 - if (this.flashCycle % this.cyclesPerFlash == 0) { // L: 401 - this.flashCycle = 0; // L: 402 - ++this.flashCount; // L: 403 - } - - if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { // L: 405 - this.flashingElements = null; // L: 406 - } + if (this.zoom > this.zoomTarget) { // L: 247 + this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); // L: 248 } - int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 409 - int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 410 - 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.field4502 > 100) { // L: 414 - this.field4502 = 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.field4500, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 418 - } - - this.method7297(var1, var2, var3, var4, var8, var9); // L: 420 - if (class113.method2651() && this.showCoord && this.mouseCoord != null) { // L: 421 - this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); - } - - this.worldMapDisplayWidth = var8; // L: 422 - this.worldMapDisplayHeight = var9; // L: 423 - this.worldMapDisplayX = var1; // L: 424 - this.worldMapDisplayY = var2; // L: 425 - Rasterizer2D.Rasterizer2D_setClipArray(var6); // L: 426 } - } // L: 391 427 + } // L: 242 250 - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IIIIIII)Z", - garbageValue = "1064030571" + descriptor = "(B)V", + garbageValue = "32" ) - boolean method7234(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.field4513 != Client.field779) { // L: 433 - return true; - } else if (var3 <= 0 && var4 <= 0) { // L: 434 - return var3 + var1 < var5 || var2 + var4 < var6; // L: 435 - } else { - return true; // L: 436 + @Export("scrollToTarget") + void scrollToTarget() { + if (this.hasTarget()) { // L: 253 + int var1 = this.worldMapTargetX - this.centerTileX; // L: 256 + int var2 = this.worldMapTargetY - this.centerTileY; // L: 257 + if (var1 != 0) { // L: 258 + var1 /= Math.min(8, Math.abs(var1)); // L: 259 } - } else { - return true; + + if (var2 != 0) { // L: 261 + var2 /= Math.min(8, Math.abs(var2)); // L: 262 + } + + this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 264 + if (this.worldMapTargetX == this.centerTileX && this.centerTileY == this.worldMapTargetY) { // L: 265 + this.worldMapTargetX = -1; // L: 266 + this.worldMapTargetY = -1; // L: 267 + } + } + } // L: 254 269 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IIZI)V", + garbageValue = "-590255884" + ) + @Export("setWorldMapPosition") + final void setWorldMapPosition(int var1, int var2, boolean var3) { + this.centerTileX = var1; // L: 272 + this.centerTileY = var2; // L: 273 + class113.method2624(); // L: 274 + if (var3) { + this.method7030(); // L: 275 + } + + } // L: 276 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "-25932" + ) + final void method7030() { + this.field4553 = -1; // L: 279 + this.field4529 = -1; // L: 280 + this.field4551 = -1; // L: 281 + this.field4541 = -1; // L: 282 + } // L: 283 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1296861681" + ) + @Export("hasTarget") + boolean hasTarget() { + return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 286 } @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "-248173982" + descriptor = "(IIIB)Lhm;", + garbageValue = "0" ) - void method7297(int var1, int var2, int var3, int var4, int var5, int var6) { - if (VarcInt.field1841 != null) { // L: 440 - int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 441 - int var8 = var3 + 512; // L: 442 - int var9 = var4 + 512; // L: 443 - float var10 = 1.0F; // L: 444 - var8 = (int)((float)var8 / var10); // L: 445 - var9 = (int)((float)var9 / var10); // L: 446 - int var11 = this.getDisplayX() - var5 / 2 - var7; // L: 447 - int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 448 - int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 449 - int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 450 - if (this.method7234(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 { - this.sprite = new SpritePixels(var8, var9); // L: 453 - } + @Export("mapAreaAtCoord") + public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { + Iterator var4 = this.details.values().iterator(); // L: 290 - 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 - VarcInt.field1841.method6045(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 459 - this.field4513 = Client.field779; // L: 460 - var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 461 - var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 462 + WorldMapArea var5; + do { + if (!var4.hasNext()) { + return null; // L: 298 } - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 464 - if (1.0F == var10) { // L: 465 - this.sprite.method8097(var13, var14, 192); // L: 466 - } else { - this.sprite.method8100(var13, var14, (int)(var10 * (float)var8), (int)(var10 * (float)var9), 192); // L: 469 - } - } + var5 = (WorldMapArea)var4.next(); // L: 291 + } while(!var5.containsCoord(var1, var2, var3)); // L: 293 - } // L: 472 + return var5; // L: 294 + } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1493873382" + descriptor = "(IIIZI)V", + garbageValue = "-844627629" ) - @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 - this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 479 - if (!this.worldMapManager.isLoaded()) { // L: 480 - return; // L: 481 - } + public void method7033(int var1, int var2, int var3, boolean var4) { + WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); // L: 302 + if (var5 == null) { // L: 303 + if (!var4) { // L: 304 + return; // L: 307 } - this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); // L: 484 + var5 = this.mainMapArea; // L: 305 } - } // L: 476 485 + + boolean var6 = false; // L: 309 + if (var5 != this.field4570 || var4) { // L: 310 + this.field4570 = var5; // L: 311 + this.setCurrentMapArea(var5); // L: 312 + var6 = true; // L: 313 + } + + if (var6 || var4) { // L: 315 + this.jump(var1, var2, var3); // L: 316 + } + + } // L: 318 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1202100696" + ) + @Export("setCurrentMapAreaId") + public void setCurrentMapAreaId(int var1) { + WorldMapArea var2 = this.getMapArea(var1); // L: 321 + if (var2 != null) { // L: 322 + this.setCurrentMapArea(var2); // L: 323 + } + + } // L: 325 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "4" + ) + @Export("currentMapAreaId") + public int currentMapAreaId() { + return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 328 329 331 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(B)Lhm;", + garbageValue = "-1" + ) + @Export("getCurrentMapArea") + public WorldMapArea getCurrentMapArea() { + return this.currentMapArea; // L: 335 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Lhm;I)V", + garbageValue = "-1586709252" + ) + @Export("setCurrentMapArea") + void setCurrentMapArea(WorldMapArea var1) { + if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 339 + this.initializeWorldMapManager(var1); // L: 342 + this.jump(-1, -1, -1); // L: 343 + } + } // L: 340 344 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Lhm;I)V", + garbageValue = "-2105521397" + ) + @Export("initializeWorldMapManager") + void initializeWorldMapManager(WorldMapArea var1) { + this.currentMapArea = var1; // L: 347 + this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); // L: 348 + this.cacheLoader.reset(this.currentMapArea.getInternalName()); // L: 349 + } // L: 350 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lhm;Lkd;Lkd;ZS)V", + garbageValue = "1536" + ) + public void method7039(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { + if (var1 != null) { // L: 353 + if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 356 + this.initializeWorldMapManager(var1); // L: 357 + } + + if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { // L: 359 + this.jump(var2.plane, var2.x, var2.y); // L: 363 + } else { + this.jump(var3.plane, var3.x, var3.y); // L: 360 + } + + } + } // L: 354 365 @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-248546686" + descriptor = "(IIII)V", + garbageValue = "-1915895673" ) - @Export("setZoomPercentage") - public void setZoomPercentage(int var1) { - this.zoomTarget = this.getZoomFromPercentage(var1); // L: 488 - } // L: 489 + @Export("jump") + void jump(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 368 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 371 + if (var4 == null) { // L: 372 + var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); // L: 373 + } - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "-1103182749" - ) - @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 - int var8 = var4 / 2 + var2 - 18 - var6; // L: 494 - 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, var6 + var8, -1, -1); // L: 498 - } // L: 499 + this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); // L: 375 + this.worldMapTargetX = -1; // L: 376 + this.worldMapTargetY = -1; // L: 377 + this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 378 + this.zoomTarget = this.zoom; // L: 379 + this.field4566 = null; // L: 380 + this.iconIterator = null; // L: 381 + this.worldMapManager.clearIcons(); // L: 382 + } + } // L: 369 383 @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(II)F", - garbageValue = "302307911" + descriptor = "(IIIIII)V", + garbageValue = "1672527404" + ) + @Export("draw") + public void draw(int var1, int var2, int var3, int var4, int var5) { + int[] var6 = new int[4]; // L: 386 + Rasterizer2D.Rasterizer2D_getClipArray(var6); // L: 387 + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); // L: 388 + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 389 + int var7 = this.cacheLoader.getPercentLoaded(); // L: 390 + if (var7 < 100) { // L: 391 + this.drawLoading(var1, var2, var3, var4, var7); // L: 392 + } else { + if (!this.worldMapManager.isLoaded()) { // L: 395 + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 396 + if (!this.worldMapManager.isLoaded()) { // L: 397 + return; // L: 398 + } + } + + if (this.flashingElements != null) { // L: 401 + ++this.flashCycle; // L: 402 + if (this.flashCycle % this.cyclesPerFlash == 0) { // L: 403 + this.flashCycle = 0; // L: 404 + ++this.flashCount; // L: 405 + } + + if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { // L: 407 + this.flashingElements = null; // L: 408 + } + } + + int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 411 + int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 412 + 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: 413 + boolean var10; + if (!this.elementsDisabled) { // L: 414 + var10 = false; // L: 415 + if (var5 - this.field4564 > 100) { // L: 416 + this.field4564 = var5; // L: 417 + var10 = true; // 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.field4534, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 420 + } + + this.method7043(var1, var2, var3, var4, var8, var9); // L: 422 + var10 = Client.staffModLevel >= 2; // L: 425 + if (var10 && this.showCoord && this.mouseCoord != null) { // L: 427 + this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); + } + + this.worldMapDisplayWidth = var8; // L: 428 + this.worldMapDisplayHeight = var9; // L: 429 + this.worldMapDisplayX = var1; // L: 430 + this.worldMapDisplayY = var2; // L: 431 + Rasterizer2D.Rasterizer2D_setClipArray(var6); // L: 432 + } + } // L: 393 433 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(IIIIIII)Z", + garbageValue = "65408" + ) + boolean method7128(int var1, int var2, int var3, int var4, int var5, int var6) { + if (this.sprite == null) { // L: 436 + return true; + } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 437 + if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { + return true; + } else if (this.field4575 != Client.field767) { + return true; + } else if (var3 <= 0 && var4 <= 0) { + return var3 + var1 < var5 || var2 + var4 < var6; + } else { + return true; + } + } else { + return true; + } + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(IIIIIII)V", + garbageValue = "-1887694051" + ) + void method7043(int var1, int var2, int var3, int var4, int var5, int var6) { + if (class127.field1570 != null) { // L: 446 + int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 447 + int var8 = var3 + 512; // L: 448 + int var9 = var4 + 512; // L: 449 + float var10 = 1.0F; // L: 450 + var8 = (int)((float)var8 / var10); // L: 451 + var9 = (int)((float)var9 / var10); // L: 452 + int var11 = this.getDisplayX() - var5 / 2 - var7; // L: 453 + int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 454 + int var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 455 + int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 456 + if (this.method7128(var8, var9, var13, var14, var3, var4)) { // L: 457 + if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 458 + Arrays.fill(this.sprite.pixels, 0); // L: 461 + } else { + this.sprite = new SpritePixels(var8, var9); // L: 459 + } + + this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 462 + this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 463 + this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 464 + class127.field1570.method5852(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 465 + this.field4575 = Client.field767; // L: 466 + var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 467 + var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 468 + } + + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 470 + if (var10 == 1.0F) { // L: 471 + this.sprite.method7970(var13, var14, 192); // L: 472 + } else { + this.sprite.method8030(var13, var14, (int)((float)var8 * var10), (int)((float)var9 * var10), 192); // L: 475 + } + } + + } // L: 478 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IIIIB)V", + garbageValue = "0" + ) + @Export("drawOverview") + public void drawOverview(int var1, int var2, int var3, int var4) { + if (this.cacheLoader.isLoaded()) { // L: 481 + if (!this.worldMapManager.isLoaded()) { // L: 484 + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 485 + if (!this.worldMapManager.isLoaded()) { // L: 486 + return; // L: 487 + } + } + + this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); // L: 490 + } + } // L: 482 491 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-35" + ) + @Export("setZoomPercentage") + public void setZoomPercentage(int var1) { + this.zoomTarget = this.getZoomFromPercentage(var1); // L: 494 + } // L: 495 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "-1894387769" + ) + @Export("drawLoading") + void drawLoading(int var1, int var2, int var3, int var4, int var5) { + byte var6 = 20; // L: 498 + int var7 = var3 / 2 + var1; // L: 499 + int var8 = var4 / 2 + var2 - 18 - var6; // L: 500 + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 501 + Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); // L: 502 + Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); // L: 503 + this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); // L: 504 + } // L: 505 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(IB)F", + garbageValue = "0" ) @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { - if (var1 == 25) { // L: 502 + if (var1 == 25) { // L: 508 return 1.0F; - } else if (var1 == 37) { // L: 503 + } else if (var1 == 37) { // L: 509 return 1.5F; - } else if (var1 == 50) { // L: 504 + } else if (var1 == 50) { // L: 510 return 2.0F; - } else if (var1 == 75) { // L: 505 + } else if (var1 == 75) { // L: 511 return 3.0F; } else { - return var1 == 100 ? 4.0F : 8.0F; // L: 506 507 + return var1 == 100 ? 4.0F : 8.0F; // L: 512 513 } } - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1321436394" - ) - @Export("getZoomLevel") - public int getZoomLevel() { - if (1.0D == (double)this.zoomTarget) { // L: 511 - return 25; - } else if ((double)this.zoomTarget == 1.5D) { // L: 512 - return 37; - } else if (2.0D == (double)this.zoomTarget) { // L: 513 - return 50; - } else if (3.0D == (double)this.zoomTarget) { // L: 514 - return 75; - } else { - return (double)this.zoomTarget == 4.0D ? 100 : 200; // L: 515 516 - } - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-901314878" - ) - @Export("loadCache") - public void loadCache() { - this.cacheLoader.load(); // L: 520 - } // L: 521 - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-34" - ) - @Export("isCacheLoaded") - public boolean isCacheLoaded() { - return this.cacheLoader.isLoaded(); // L: 524 - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(IB)Lgu;", - garbageValue = "49" - ) - @Export("getMapArea") - public WorldMapArea getMapArea(int var1) { - Iterator var2 = this.details.values().iterator(); // L: 528 - - WorldMapArea var3; - do { - if (!var2.hasNext()) { - return null; // L: 536 - } - - var3 = (WorldMapArea)var2.next(); // L: 529 - } while(var3.getId() != var1); // L: 531 - - return var3; // L: 532 - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "67863709" - ) - @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 - this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; // L: 544 - } - } // L: 541 545 - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-264358279" - ) - @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 - this.worldMapTargetX = -1; // L: 552 - this.worldMapTargetY = -1; // L: 553 - } - } // L: 549 554 - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "110" - ) - @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 - if (var4 != null) { // L: 561 - this.setWorldMapPositionTarget(var4[0], var4[1]); // L: 562 - } - - } - } // L: 558 564 - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "49" - ) - @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 - if (var4 != null) { // L: 571 - this.setWorldMapPositionTargetInstant(var4[0], var4[1]); // L: 572 - } - - } - } // L: 568 574 - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "658592896" - ) - @Export("getDisplayX") - public int getDisplayX() { - return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 577 578 580 - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "31" - ) - @Export("getDisplayY") - public int getDisplayY() { - return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 584 585 587 - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(S)Lks;", - garbageValue = "-9331" - ) - @Export("getDisplayCoord") - public Coord getDisplayCoord() { - return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 591 592 594 - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "117" - ) - @Export("getDisplayWith") - public int getDisplayWith() { - return this.worldMapDisplayWidth; // L: 598 - } - @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1319666044" + garbageValue = "1554124121" ) - @Export("getDisplayHeight") - public int getDisplayHeight() { - return this.worldMapDisplayHeight; // L: 602 + @Export("getZoomLevel") + public int getZoomLevel() { + if (1.0D == (double)this.zoomTarget) { // L: 517 + return 25; + } else if ((double)this.zoomTarget == 1.5D) { // L: 518 + return 37; + } else if ((double)this.zoomTarget == 2.0D) { // L: 519 + return 50; + } else if (3.0D == (double)this.zoomTarget) { // L: 520 + return 75; + } else { + return (double)this.zoomTarget == 4.0D ? 100 : 200; // L: 521 522 + } } - @ObfuscatedName("ah") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2054976977" + descriptor = "(I)V", + garbageValue = "-685965798" ) - @Export("setMaxFlashCount") - public void setMaxFlashCount(int var1) { - if (var1 >= 1) { // L: 606 - this.maxFlashCount = var1; // L: 607 - } + @Export("loadCache") + public void loadCache() { + this.cacheLoader.load(); // L: 526 + } // L: 527 - } // L: 609 + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "103" + ) + @Export("isCacheLoaded") + public boolean isCacheLoaded() { + return this.cacheLoader.isLoaded(); // L: 530 + } @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-11" + descriptor = "(II)Lhm;", + garbageValue = "-1055675937" ) - @Export("resetMaxFlashCount") - public void resetMaxFlashCount() { - this.maxFlashCount = 3; // L: 612 - } // L: 613 + @Export("getMapArea") + public WorldMapArea getMapArea(int var1) { + Iterator var2 = this.details.values().iterator(); // L: 534 + + WorldMapArea var3; + do { + if (!var2.hasNext()) { + return null; // L: 542 + } + + var3 = (WorldMapArea)var2.next(); // L: 535 + } while(var3.getId() != var1); // L: 537 + + return var3; // L: 538 + } @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2006252469" + descriptor = "(III)V", + garbageValue = "140352993" ) - @Export("setCyclesPerFlash") - public void setCyclesPerFlash(int var1) { - if (var1 >= 1) { // L: 616 - this.cyclesPerFlash = var1; // L: 617 + @Export("setWorldMapPositionTarget") + public void setWorldMapPositionTarget(int var1, int var2) { + if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { // L: 546 + this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; // L: 549 + this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; // L: 550 } + } // L: 547 551 - } // L: 619 + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-2137393480" + ) + @Export("setWorldMapPositionTargetInstant") + public void setWorldMapPositionTargetInstant(int var1, int var2) { + if (this.currentMapArea != null) { // L: 554 + this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); // L: 557 + this.worldMapTargetX = -1; // L: 558 + this.worldMapTargetY = -1; // L: 559 + } + } // L: 555 560 + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-1942446245" + ) + @Export("jumpToSourceCoord") + public void jumpToSourceCoord(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 563 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 566 + if (var4 != null) { // L: 567 + this.setWorldMapPositionTarget(var4[0], var4[1]); // L: 568 + } + + } + } // L: 564 570 + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(IIIB)V", + garbageValue = "-124" + ) + @Export("jumpToSourceCoordInstant") + public void jumpToSourceCoordInstant(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 573 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 576 + if (var4 != null) { // L: 577 + this.setWorldMapPositionTargetInstant(var4[0], var4[1]); // L: 578 + } + + } + } // L: 574 580 + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1016539998" + ) + @Export("getDisplayX") + public int getDisplayX() { + return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 583 584 586 + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1846299210" + ) + @Export("getDisplayY") + public int getDisplayY() { + return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 590 591 593 + } @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "102" + descriptor = "(B)Lkd;", + garbageValue = "82" ) - @Export("resetCyclesPerFlash") - public void resetCyclesPerFlash() { - this.cyclesPerFlash = 50; // L: 622 - } // L: 623 + @Export("getDisplayCoord") + public Coord getDisplayCoord() { + return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 597 598 600 + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "227293520" + ) + @Export("getDisplayWith") + public int getDisplayWith() { + return this.worldMapDisplayWidth; // L: 604 + } @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-565959186" + descriptor = "(I)I", + garbageValue = "751565182" ) - @Export("setPerpetualFlash") - public void setPerpetualFlash(boolean var1) { - this.perpetualFlash = var1; // L: 626 - } // L: 627 + @Export("getDisplayHeight") + public int getDisplayHeight() { + return this.worldMapDisplayHeight; // L: 608 + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "0" + ) + @Export("setMaxFlashCount") + public void setMaxFlashCount(int var1) { + if (var1 >= 1) { // L: 612 + this.maxFlashCount = var1; // L: 613 + } + + } // L: 615 + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-78" + ) + @Export("resetMaxFlashCount") + public void resetMaxFlashCount() { + this.maxFlashCount = 3; // L: 618 + } // L: 619 @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1042147237" + garbageValue = "-986945169" + ) + @Export("setCyclesPerFlash") + public void setCyclesPerFlash(int var1) { + if (var1 >= 1) { // L: 622 + this.cyclesPerFlash = var1; // L: 623 + } + + } // L: 625 + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1484398671" + ) + @Export("resetCyclesPerFlash") + public void resetCyclesPerFlash() { + this.cyclesPerFlash = 50; // L: 628 + } // L: 629 + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-124" + ) + @Export("setPerpetualFlash") + public void setPerpetualFlash(boolean var1) { + this.perpetualFlash = var1; // L: 632 + } // L: 633 + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1858255498" ) @Export("flashElement") public void flashElement(int var1) { - this.flashingElements = new HashSet(); // L: 630 - this.flashingElements.add(var1); // L: 631 - this.flashCount = 0; // L: 632 - this.flashCycle = 0; // L: 633 - } // L: 634 + this.flashingElements = new HashSet(); // L: 636 + this.flashingElements.add(var1); // L: 637 + this.flashCount = 0; // L: 638 + this.flashCycle = 0; // L: 639 + } // L: 640 - @ObfuscatedName("ai") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-121" + descriptor = "(II)V", + garbageValue = "337507514" ) @Export("flashCategory") public void flashCategory(int var1) { - this.flashingElements = new HashSet(); // L: 637 - this.flashCount = 0; // L: 638 - this.flashCycle = 0; // L: 639 + this.flashingElements = new HashSet(); // L: 643 + this.flashCount = 0; // L: 644 + this.flashCycle = 0; // L: 645 - for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { // L: 640 - if (UserComparator7.WorldMapElement_get(var2) != null && UserComparator7.WorldMapElement_get(var2).category == var1) { // L: 641 644 - this.flashingElements.add(UserComparator7.WorldMapElement_get(var2).objectId); // L: 645 + for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { // L: 646 + if (class120.WorldMapElement_get(var2) != null && class120.WorldMapElement_get(var2).category == var1) { // L: 647 650 + this.flashingElements.add(class120.WorldMapElement_get(var2).objectId); // L: 651 } } - } // L: 648 + } // L: 654 - @ObfuscatedName("ax") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-353719726" + descriptor = "(B)V", + garbageValue = "1" ) @Export("stopCurrentFlashes") public void stopCurrentFlashes() { - this.flashingElements = null; // L: 651 - } // L: 652 + this.flashingElements = null; // L: 657 + } // L: 658 - @ObfuscatedName("ar") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-1639336490" + garbageValue = "-1466489938" ) @Export("setElementsDisabled") public void setElementsDisabled(boolean var1) { - this.elementsDisabled = !var1; // L: 655 - } // L: 656 + this.elementsDisabled = !var1; // L: 661 + } // L: 662 - @ObfuscatedName("ap") + @ObfuscatedName("ay") @ObfuscatedSignature( descriptor = "(IZI)V", - garbageValue = "-1018816964" + garbageValue = "-380169429" ) @Export("disableElement") public void disableElement(int var1, boolean var2) { - if (!var2) { // L: 659 - this.enabledElements.add(var1); // L: 660 + if (!var2) { // L: 665 + this.enabledElements.add(var1); // L: 666 } else { - this.enabledElements.remove(var1); // L: 663 + this.enabledElements.remove(var1); // L: 669 } - this.method7396(); // L: 665 - } // L: 666 + this.method7074(); // L: 671 + } // L: 672 - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(IZB)V", - garbageValue = "91" + garbageValue = "9" ) @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { - if (!var2) { // L: 669 - this.enabledCategories.add(var1); // L: 670 + if (!var2) { // L: 675 + this.enabledCategories.add(var1); // L: 676 } else { - this.enabledCategories.remove(var1); // L: 673 + this.enabledCategories.remove(var1); // L: 679 } - for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { // L: 675 - if (UserComparator7.WorldMapElement_get(var3) != null && UserComparator7.WorldMapElement_get(var3).category == var1) { // L: 676 679 - int var4 = UserComparator7.WorldMapElement_get(var3).objectId; // L: 680 - if (!var2) { // L: 681 - this.enabledElementIds.add(var4); // L: 682 + for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { // L: 681 + if (class120.WorldMapElement_get(var3) != null && class120.WorldMapElement_get(var3).category == var1) { // L: 682 685 + int var4 = class120.WorldMapElement_get(var3).objectId; // L: 686 + if (!var2) { // L: 687 + this.enabledElementIds.add(var4); // L: 688 } else { - this.enabledElementIds.remove(var4); // L: 685 + this.enabledElementIds.remove(var4); // L: 691 } } } - this.method7396(); // L: 689 - } // L: 690 + this.method7074(); // L: 695 + } // L: 696 - @ObfuscatedName("as") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "42" + descriptor = "(I)Z", + garbageValue = "1930846128" ) @Export("getElementsDisabled") public boolean getElementsDisabled() { - return !this.elementsDisabled; // L: 693 + return !this.elementsDisabled; // L: 699 } - @ObfuscatedName("aa") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(IB)Z", - garbageValue = "-10" + garbageValue = "63" ) @Export("isElementDisabled") public boolean isElementDisabled(int var1) { - return !this.enabledElements.contains(var1); // L: 697 + return !this.enabledElements.contains(var1); // L: 703 } - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "126" - ) - @Export("isCategoryDisabled") - public boolean isCategoryDisabled(int var1) { - return !this.enabledCategories.contains(var1); // L: 701 - } - - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1947147586" - ) - void method7396() { - this.field4500.clear(); // L: 705 - this.field4500.addAll(this.enabledElements); // L: 706 - this.field4500.addAll(this.enabledElementIds); // L: 707 - } // L: 708 - @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "(IS)Z", + garbageValue = "1000" + ) + @Export("isCategoryDisabled") + public boolean isCategoryDisabled(int var1) { + return !this.enabledCategories.contains(var1); // L: 707 + } + + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2064216648" + ) + void method7074() { + this.field4534.clear(); // L: 711 + this.field4534.addAll(this.enabledElements); // L: 712 + this.field4534.addAll(this.enabledElementIds); // L: 713 + } // L: 714 + + @ObfuscatedName("bo") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "-1996855172" + garbageValue = "1625310918" ) @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.method4186(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 + if (this.cacheLoader.isLoaded()) { // L: 717 + int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 720 + int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 721 + List var9 = this.worldMapManager.method4645(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: 722 + if (!var9.isEmpty()) { // L: 723 Iterator var10 = var9.iterator(); boolean var13; do { - if (!var10.hasNext()) { // L: 720 - return; // L: 736 + if (!var10.hasNext()) { // L: 726 + return; // L: 742 } - AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 721 - WorldMapElement var12 = UserComparator7.WorldMapElement_get(var11.getElement()); // L: 723 - var13 = false; // L: 724 + AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 727 + WorldMapElement var12 = class120.WorldMapElement_get(var11.getElement()); // L: 729 + var13 = false; // L: 730 - for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { // L: 725 - if (var12.menuActions[var14] != null) { // L: 726 - class21.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 727 - var13 = true; // L: 728 + for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { // L: 731 + if (var12.menuActions[var14] != null) { // L: 732 + Projectile.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 733 + var13 = true; // L: 734 } } - } while(!var13); // L: 731 + } while(!var13); // L: 737 } } - } // L: 712 718 732 + } // L: 718 724 738 - @ObfuscatedName("bo") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(ILks;I)Lks;", - garbageValue = "-267672290" + descriptor = "(ILkd;I)Lkd;", + garbageValue = "-1588915400" ) - public Coord method7269(int var1, Coord var2) { - if (!this.cacheLoader.isLoaded()) { // L: 739 - return null; // L: 740 - } else if (!this.worldMapManager.isLoaded()) { // L: 742 - return null; // L: 743 - } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { // L: 745 + public Coord method7076(int var1, Coord var2) { + if (!this.cacheLoader.isLoaded()) { // L: 745 return null; // L: 746 + } else if (!this.worldMapManager.isLoaded()) { // L: 748 + return null; // L: 749 + } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { // L: 751 + return null; // L: 752 } else { - HashMap var3 = this.worldMapManager.buildIcons(); // L: 748 - List var4 = (List)var3.get(var1); // L: 749 - if (var4 != null && !var4.isEmpty()) { // L: 750 - AbstractWorldMapIcon var5 = null; // L: 753 - int var6 = -1; // L: 754 - Iterator var7 = var4.iterator(); // L: 755 + HashMap var3 = this.worldMapManager.buildIcons(); // L: 754 + List var4 = (List)var3.get(var1); // L: 755 + if (var4 != null && !var4.isEmpty()) { // L: 756 + AbstractWorldMapIcon var5 = null; // L: 759 + int var6 = -1; // L: 760 + Iterator var7 = var4.iterator(); // L: 761 while (true) { AbstractWorldMapIcon var8; int var11; do { if (!var7.hasNext()) { - return var5.coord2; // L: 770 + return var5.coord2; // L: 776 } - var8 = (AbstractWorldMapIcon)var7.next(); // L: 756 - int var9 = var8.coord2.x - var2.x; // L: 758 - int var10 = var8.coord2.y - var2.y; // L: 759 - var11 = var10 * var10 + var9 * var9; // L: 760 - if (var11 == 0) { // L: 761 - return var8.coord2; // L: 762 + var8 = (AbstractWorldMapIcon)var7.next(); // L: 762 + int var9 = var8.coord2.x - var2.x; // L: 764 + int var10 = var8.coord2.y - var2.y; // L: 765 + var11 = var10 * var10 + var9 * var9; // L: 766 + if (var11 == 0) { // L: 767 + return var8.coord2; // L: 768 } - } while(var11 >= var6 && var5 != null); // L: 764 + } while(var11 >= var6 && var5 != null); // L: 770 - var5 = var8; // L: 765 - var6 = var11; // L: 766 + var5 = var8; // L: 771 + var6 = var11; // L: 772 } } else { - return null; // L: 751 + return null; // L: 757 } } } - @ObfuscatedName("bl") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(IILks;Lks;B)V", - garbageValue = "-98" + descriptor = "(IILkd;Lkd;I)V", + garbageValue = "-887021024" ) @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 + ScriptEvent var5 = new ScriptEvent(); // L: 780 + WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); // L: 781 + var5.setArgs(new Object[]{var6}); // L: 782 + switch(var1) { // L: 783 case 1008: - var5.setType(10); // L: 800 - break; + var5.setType(10); // L: 796 + break; // L: 797 case 1009: - var5.setType(11); // L: 780 + var5.setType(11); // L: 806 break; case 1010: - var5.setType(12); // L: 790 + var5.setType(12); // L: 786 break; case 1011: - var5.setType(13); // L: 785 - break; // L: 786 + var5.setType(13); // L: 791 + break; // L: 792 case 1012: - var5.setType(14); // L: 795 + var5.setType(14); // L: 801 } - ClanSettings.runScriptEvent(var5); // L: 804 - } // L: 805 + class144.runScriptEvent(var5); // L: 810 + } // L: 811 - @ObfuscatedName("be") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(I)Lhq;", - garbageValue = "885482314" + descriptor = "(I)Liw;", + garbageValue = "-1807679022" ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { - if (!this.cacheLoader.isLoaded()) { // L: 808 - return null; // L: 809 - } else if (!this.worldMapManager.isLoaded()) { // L: 811 - return null; // L: 812 + if (!this.cacheLoader.isLoaded()) { // L: 814 + return null; // L: 815 + } else if (!this.worldMapManager.isLoaded()) { // L: 817 + return null; // L: 818 } else { - HashMap var1 = this.worldMapManager.buildIcons(); // L: 814 - this.field4468 = new LinkedList(); // L: 815 - Iterator var2 = var1.values().iterator(); // L: 816 + HashMap var1 = this.worldMapManager.buildIcons(); // L: 820 + this.field4566 = new LinkedList(); // L: 821 + Iterator var2 = var1.values().iterator(); // L: 822 while (var2.hasNext()) { - List var3 = (List)var2.next(); // L: 817 - this.field4468.addAll(var3); // L: 819 + List var3 = (List)var2.next(); // L: 823 + this.field4566.addAll(var3); // L: 825 } - this.iconIterator = this.field4468.iterator(); // L: 822 - return this.iconNext(); // L: 823 + this.iconIterator = this.field4566.iterator(); // L: 828 + return this.iconNext(); // L: 829 } } - @ObfuscatedName("bb") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(I)Lhq;", - garbageValue = "581290708" + descriptor = "(B)Liw;", + garbageValue = "-86" ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { - if (this.iconIterator == null) { // L: 827 - return null; // L: 828 + if (this.iconIterator == null) { // L: 833 + return null; // L: 834 } else { AbstractWorldMapIcon var1; do { - if (!this.iconIterator.hasNext()) { // L: 830 - return null; // L: 836 + if (!this.iconIterator.hasNext()) { // L: 836 + return null; // L: 842 } - var1 = (AbstractWorldMapIcon)this.iconIterator.next(); // L: 831 - } while(var1.getElement() == -1); // L: 832 + var1 = (AbstractWorldMapIcon)this.iconIterator.next(); // L: 837 + } while(var1.getElement() == -1); // L: 838 - return var1; // L: 833 + return var1; // L: 839 } } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "21" + ) + protected static final void method7222() { + UserComparator5.clock.mark(); // L: 438 + + int var0; + for (var0 = 0; var0 < 32; ++var0) { // L: 439 + GameEngine.graphicsTickTimes[var0] = 0L; + } + + for (var0 = 0; var0 < 32; ++var0) { // L: 440 + GameEngine.clientTickTimes[var0] = 0L; + } + + GameEngine.gameCyclesToDo = 0; // L: 441 + } // L: 442 } diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index 112eb2ea62..9c5459e5e0 100644 --- a/runescape-client/src/main/java/WorldMapArchiveLoader.java +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -4,33 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oo") +@ObfuscatedName("oy") @Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { - @ObfuscatedName("am") - @Export("fontHelvetica13") - static java.awt.Font fontHelvetica13; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("cacheName") String cacheName; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("archive") AbstractArchive archive; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1677535767 + intValue = 1691331765 ) @Export("percentLoaded") int percentLoaded; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("loaded") boolean loaded; @ObfuscatedSignature( - descriptor = "(Lln;)V" + descriptor = "(Llp;)V" ) WorldMapArchiveLoader(AbstractArchive var1) { this.percentLoaded = 0; // L: 13 @@ -38,10 +35,10 @@ public class WorldMapArchiveLoader { this.archive = var1; // L: 17 } // L: 18 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "36138809" + garbageValue = "-1839353893" ) @Export("reset") void reset(String var1) { @@ -55,15 +52,15 @@ public class WorldMapArchiveLoader { } } // L: 22 25 31 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1816632619" + garbageValue = "-1569392009" ) @Export("load") int load() { if (this.percentLoaded < 33) { // L: 34 - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2414.name, this.cacheName)) { // L: 35 + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2907.name, this.cacheName)) { // L: 35 return this.percentLoaded; // L: 36 } @@ -71,7 +68,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 33) { // L: 40 - if (this.archive.isValidFileName(WorldMapCacheName.field2418.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2418.name, this.cacheName)) { // L: 41 42 + if (this.archive.isValidFileName(WorldMapCacheName.field2908.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2908.name, this.cacheName)) { // L: 41 42 return this.percentLoaded; // L: 43 } @@ -79,7 +76,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 66) { // L: 48 - if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2417.name)) { // L: 49 + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2911.name)) { // L: 49 return this.percentLoaded; // L: 50 } @@ -90,23 +87,32 @@ public class WorldMapArchiveLoader { return this.percentLoaded; // L: 55 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "4676" + descriptor = "(I)Z", + garbageValue = "-1022349002" ) @Export("isLoaded") boolean isLoaded() { return this.loaded; // L: 59 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1760303453" + descriptor = "(B)I", + garbageValue = "-12" ) @Export("getPercentLoaded") int getPercentLoaded() { return this.percentLoaded; // L: 63 } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "([BIS)I", + garbageValue = "-8446" + ) + public static int method7020(byte[] var0, int var1) { + return Clock.method3249(var0, 0, var1); // L: 56 + } } diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 28eea60970..f98c9824a5 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -1,5 +1,3 @@ -import java.io.File; -import java.io.IOException; import java.util.Iterator; import java.util.LinkedList; import net.runelite.mapping.Export; @@ -8,67 +6,73 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gu") +@ObfuscatedName("hm") @Implements("WorldMapArea") public class WorldMapArea { - @ObfuscatedName("v") + @ObfuscatedName("f") + @Export("formattedOperatingSystemName") + public static String formattedOperatingSystemName; + @ObfuscatedName("ao") + @Export("hasFocus") + protected static boolean hasFocus; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1619651077 + intValue = 1777839071 ) @Export("id") int id; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("internalName") String internalName; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("externalName") String externalName; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -988816927 + intValue = -466670555 ) @Export("backGroundColor") int backGroundColor; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 865751719 + intValue = 1573986951 ) @Export("zoom") int zoom; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lks;" + descriptor = "Lkd;" ) @Export("origin") Coord origin; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1477331149 + intValue = 976938007 ) @Export("regionLowX") int regionLowX; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -194565457 + intValue = -281612569 ) @Export("regionHighX") int regionHighX; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1241290265 + intValue = -711482523 ) @Export("regionLowY") int regionLowY; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 702405047 + intValue = 1976100383 ) @Export("regionHighY") int regionHighY; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("isMain") boolean isMain; - @ObfuscatedName("p") + @ObfuscatedName("c") @Export("sections") LinkedList sections; @@ -84,10 +88,10 @@ public class WorldMapArea { this.isMain = false; // L: 19 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;IB)V", - garbageValue = "61" + descriptor = "(Lpx;IB)V", + garbageValue = "20" ) @Export("read") public void read(Buffer var1, int var2) { @@ -109,81 +113,82 @@ public class WorldMapArea { this.setBounds(); // L: 36 } // L: 37 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lpi;I)Lhs;", - garbageValue = "-156804208" + descriptor = "(Lpx;B)Lie;", + garbageValue = "38" ) @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 40 - WorldMapSectionType var3 = (WorldMapSectionType)MusicPatchPcmStream.findEnumerated(WorldMapSectionType.method4305(), var2); // L: 41 - Object var4 = null; // L: 42 - switch(var3.type) { // L: 43 + WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE2, WorldMapSectionType.WORLDMAPSECTIONTYPE1}; // L: 43 + WorldMapSectionType var4 = (WorldMapSectionType)class291.findEnumerated(var3, var2); // L: 45 + Object var5 = null; // L: 46 + switch(var4.type) { // L: 47 case 0: - var4 = new class204(); // L: 48 - break; // L: 49 + var5 = new WorldMapSection0(); // L: 49 + break; case 1: - var4 = new WorldMapSection0(); // L: 51 - break; // L: 52 + var5 = new WorldMapSection2(); // L: 57 + break; // L: 58 case 2: - var4 = new WorldMapSection1(); // L: 45 + var5 = new class229(); // L: 60 break; case 3: - var4 = new WorldMapSection2(); // L: 54 + var5 = new WorldMapSection1(); // L: 54 break; // L: 55 default: - throw new IllegalStateException(""); // L: 57 + throw new IllegalStateException(""); // L: 52 } - ((WorldMapSection)var4).read(var1); // L: 59 - return (WorldMapSection)var4; // L: 60 + ((WorldMapSection)var5).read(var1); // L: 63 + return (WorldMapSection)var5; // L: 64 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-1632482006" + descriptor = "(IIIB)Z", + garbageValue = "48" ) @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("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "87299869" + descriptor = "(IIS)Z", + garbageValue = "16574" ) @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; } @@ -192,390 +197,228 @@ public class WorldMapArea { } } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "1977712276" + garbageValue = "1090356101" ) @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()) { - return null; // L: 100 + 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 + return var5.getBorderTileLengths(var1, var2, var3); // L: 100 } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIB)Lks;", - garbageValue = "32" + descriptor = "(III)Lkd;", + garbageValue = "634567261" ) @Export("coord") public Coord coord(int var1, int var2) { - Iterator var3 = this.sections.iterator(); // L: 104 + Iterator var3 = this.sections.iterator(); // L: 108 WorldMapSection var4; do { if (!var3.hasNext()) { - return null; // L: 112 + return null; // L: 116 } - var4 = (WorldMapSection)var3.next(); // L: 105 - } while(!var4.containsPosition(var1, var2)); // L: 107 + var4 = (WorldMapSection)var3.next(); // L: 109 + } while(!var4.containsPosition(var1, var2)); // L: 111 - return var4.coord(var1, var2); // L: 108 - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1245875017" - ) - @Export("setBounds") - void setBounds() { - Iterator var1 = this.sections.iterator(); // L: 116 - - while (var1.hasNext()) { - WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 117 - var2.expandBounds(this); // L: 119 - } - - } // L: 122 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1605690613" - ) - @Export("getId") - public int getId() { - return this.id; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-616797466" - ) - @Export("getIsMain") - public boolean getIsMain() { - return this.isMain; // L: 129 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "2076460427" - ) - @Export("getInternalName") - public String getInternalName() { - return this.internalName; - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(S)Ljava/lang/String;", - garbageValue = "-14972" - ) - @Export("getExternalName") - public String getExternalName() { - return this.externalName; // L: 137 + return var4.coord(var1, var2); // L: 112 } @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1149525230" + ) + @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("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1206801353" + garbageValue = "-1853977483" + ) + @Export("getId") + public int getId() { + return this.id; // L: 129 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "458064679" + ) + @Export("getIsMain") + public boolean getIsMain() { + return this.isMain; // L: 133 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "16" + ) + @Export("getInternalName") + public String getInternalName() { + return this.internalName; // L: 137 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-2112752839" + ) + @Export("getExternalName") + public String getExternalName() { + return this.externalName; // L: 141 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "80" ) @Export("getBackGroundColor") int getBackGroundColor() { - return this.backGroundColor; + return this.backGroundColor; // L: 145 } @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1480409778" + garbageValue = "40622917" ) @Export("getZoom") public int getZoom() { - return this.zoom; + return this.zoom; // L: 149 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "32" + descriptor = "(S)I", + garbageValue = "160" ) @Export("getRegionLowX") public int getRegionLowX() { - return this.regionLowX; - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-916655253" - ) - @Export("getRegionHighX") - public int getRegionHighX() { - return this.regionHighX; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1639961591" - ) - @Export("getRegionLowY") - public int getRegionLowY() { - return this.regionLowY; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1377567233" - ) - @Export("getRegionHighY") - public int getRegionHighY() { - return this.regionHighY; // L: 161 + return this.regionLowX; // L: 153 } @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2107638017" + garbageValue = "1655978989" ) - @Export("getOriginX") - public int getOriginX() { - return this.origin.x; + @Export("getRegionHighX") + public int getRegionHighX() { + return this.regionHighX; // L: 157 } @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "622710860" + descriptor = "(B)I", + garbageValue = "-112" ) - @Export("getOriginPlane") - public int getOriginPlane() { - return this.origin.plane; + @Export("getRegionLowY") + public int getRegionLowY() { + return this.regionLowY; // L: 161 } @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-27476" + descriptor = "(I)I", + garbageValue = "2143670007" + ) + @Export("getRegionHighY") + public int getRegionHighY() { + return this.regionHighY; // L: 165 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-108749497" + ) + @Export("getOriginX") + public int getOriginX() { + return this.origin.x; // L: 169 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1959056800" + ) + @Export("getOriginPlane") + public int getOriginPlane() { + return this.origin.plane; // L: 173 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1472370022" ) @Export("getOriginY") public int getOriginY() { - return this.origin.y; + return this.origin.y; // L: 177 } - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Lks;", - garbageValue = "2133331168" + descriptor = "(I)Lkd;", + garbageValue = "591229615" ) @Export("getOrigin") public Coord getOrigin() { - return new Coord(this.origin); + return new Coord(this.origin); // L: 181 } - @ObfuscatedName("c") + @ObfuscatedName("fq") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;", - garbageValue = "1973093508" + descriptor = "(IIB)V", + garbageValue = "1" ) - static File method4036(String var0, String var1, int var2) { - String var3 = var2 == 0 ? "" : "" + var2; // L: 123 - class28.JagexCache_locationFile = new File(NetSocket.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); // L: 124 - String var4 = null; // L: 125 - String var5 = null; // L: 126 - boolean var6 = false; // L: 127 - File var22; - if (class28.JagexCache_locationFile.exists()) { // L: 128 - try { - AccessFile var7 = new AccessFile(class28.JagexCache_locationFile, "rw", 10000L); // L: 131 + static void method4514(int var0, int var1) { + int[] var2 = new int[9]; // L: 1504 - Buffer var8; - int var9; - for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) { // L: 132 133 136 - var9 = var7.read(var8.array, var8.offset, var8.array.length - var8.offset); // L: 134 - if (var9 == -1) { // L: 135 - throw new IOException(); - } - } - - var8.offset = 0; // L: 138 - var9 = var8.readUnsignedByte(); // L: 139 - if (var9 < 1 || var9 > 3) { - throw new IOException("" + var9); // L: 140 - } - - int var10 = 0; // L: 141 - if (var9 > 1) { // L: 142 - var10 = var8.readUnsignedByte(); - } - - if (var9 <= 2) { // L: 143 - var4 = var8.readStringCp1252NullCircumfixed(); // L: 144 - if (var10 == 1) { // L: 145 - var5 = var8.readStringCp1252NullCircumfixed(); - } - } else { - var4 = var8.readCESU8(); // L: 148 - if (var10 == 1) { // L: 149 - var5 = var8.readCESU8(); - } - } - - var7.close(); // L: 151 - } catch (IOException var20) { // L: 153 - var20.printStackTrace(); // L: 154 + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 1505 + int var4 = var3 * 32 + 15 + 128; // L: 1506 + int var5 = class10.method94(var4); // L: 1507 + int var6 = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 1508 + int var8 = var1 - 334; // L: 1511 + if (var8 < 0) { // L: 1512 + var8 = 0; + } else if (var8 > 100) { // L: 1513 + var8 = 100; } - if (var4 != null) { // L: 156 - var22 = new File(var4); // L: 157 - if (!var22.exists()) { // L: 158 - var4 = null; // L: 159 - } - } - - if (var4 != null) { // L: 162 - var22 = new File(var4, "test.dat"); // L: 163 - if (!AbstractWorldMapIcon.method4405(var22, true)) { // L: 164 - var4 = null; // L: 165 - } - } + int var9 = (Client.zoomWidth - Client.zoomHeight) * var8 / 100 + Client.zoomHeight; // L: 1514 + int var7 = var9 * var5 / 256; // L: 1515 + var2[var3] = var7 * var6 >> 16; // L: 1518 } - if (var4 == null && var2 == 0) { // L: 169 - label125: - for (int var15 = 0; var15 < class216.cacheSubPaths.length; ++var15) { // L: 170 - for (int var16 = 0; var16 < ItemContainer.cacheParentPaths.length; ++var16) { // L: 171 - File var17 = new File(ItemContainer.cacheParentPaths[var16] + class216.cacheSubPaths[var15] + File.separatorChar + var0 + File.separatorChar); // L: 172 - if (var17.exists() && AbstractWorldMapIcon.method4405(new File(var17, "test.dat"), true)) { // L: 173 174 - var4 = var17.toString(); // L: 175 - var6 = true; // L: 176 - break label125; // L: 177 - } - } - } - } - - if (var4 == null) { // L: 183 - var4 = NetSocket.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 184 - var6 = true; // L: 185 - } - - if (var5 != null) { // L: 187 - File var21 = new File(var5); // L: 188 - var22 = new File(var4); // L: 189 - - try { - File[] var23 = var21.listFiles(); // L: 191 - File[] var18 = var23; // L: 193 - - for (int var11 = 0; var11 < var18.length; ++var11) { // L: 194 - File var12 = var18[var11]; - File var13 = new File(var22, var12.getName()); - boolean var14 = var12.renameTo(var13); - if (!var14) { - throw new IOException(); - } - } - } catch (Exception var19) { - var19.printStackTrace(); - } - - var6 = true; - } - - if (var6) { - class16.method194(new File(var4), (File)null); - } - - return new File(var4); - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "1294916560" - ) - @Export("SpriteBuffer_decode") - public static void SpriteBuffer_decode(byte[] var0) { - Buffer var1 = new Buffer(var0); // L: 195 - var1.offset = var0.length - 2; // L: 196 - class451.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 197 - class451.SpriteBuffer_xOffsets = new int[class451.SpriteBuffer_spriteCount]; // L: 198 - class271.SpriteBuffer_yOffsets = new int[class451.SpriteBuffer_spriteCount]; // L: 199 - class451.SpriteBuffer_spriteWidths = new int[class451.SpriteBuffer_spriteCount]; // L: 200 - class451.SpriteBuffer_spriteHeights = new int[class451.SpriteBuffer_spriteCount]; // L: 201 - FriendLoginUpdate.SpriteBuffer_pixels = new byte[class451.SpriteBuffer_spriteCount][]; // L: 202 - var1.offset = var0.length - 7 - class451.SpriteBuffer_spriteCount * 8; // L: 203 - class451.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 204 - class451.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 205 - int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 206 - - int var3; - for (var3 = 0; var3 < class451.SpriteBuffer_spriteCount; ++var3) { // L: 207 - class451.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class451.SpriteBuffer_spriteCount; ++var3) { // L: 208 - class271.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class451.SpriteBuffer_spriteCount; ++var3) { // L: 209 - class451.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class451.SpriteBuffer_spriteCount; ++var3) { // L: 210 - class451.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); - } - - var1.offset = var0.length - 7 - class451.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 211 - NetFileRequest.SpriteBuffer_spritePalette = new int[var2]; // L: 212 - - for (var3 = 1; var3 < var2; ++var3) { // L: 213 - NetFileRequest.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 214 - if (NetFileRequest.SpriteBuffer_spritePalette[var3] == 0) { // L: 215 - NetFileRequest.SpriteBuffer_spritePalette[var3] = 1; - } - } - - var1.offset = 0; // L: 217 - - for (var3 = 0; var3 < class451.SpriteBuffer_spriteCount; ++var3) { // L: 218 - int var4 = class451.SpriteBuffer_spriteWidths[var3]; // L: 219 - int var5 = class451.SpriteBuffer_spriteHeights[var3]; // L: 220 - int var6 = var4 * var5; // L: 221 - byte[] var7 = new byte[var6]; // L: 222 - FriendLoginUpdate.SpriteBuffer_pixels[var3] = var7; // L: 223 - int var8 = var1.readUnsignedByte(); // L: 224 - int var9; - if (var8 == 0) { // L: 225 - for (var9 = 0; var9 < var6; ++var9) { // L: 226 - var7[var9] = var1.readByte(); - } - } else if (var8 == 1) { // L: 228 - for (var9 = 0; var9 < var4; ++var9) { // L: 229 - for (int var10 = 0; var10 < var5; ++var10) { // L: 230 - var7[var9 + var10 * var4] = var1.readByte(); // L: 231 - } - } - } - } - - } // L: 236 + Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334); // L: 1520 + } // L: 1521 } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 6739a4a2cd..b3aa181920 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -5,27 +5,28 @@ 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("hi") +@ObfuscatedName("iq") @Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { @ObfuscatedName("w") @Export("worldMapData0Set") HashSet worldMapData0Set; - @ObfuscatedName("k") + @ObfuscatedName("b") @Export("worldMapData1Set") HashSet worldMapData1Set; - @ObfuscatedName("d") + @ObfuscatedName("t") @Export("iconList") List iconList; WorldMapAreaData() { } // L: 14 - @ObfuscatedName("cm") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(Lpi;Lpi;IZB)V", - garbageValue = "0" + descriptor = "(Lpx;Lpx;IZI)V", + garbageValue = "696765491" ) @Export("init") void init(Buffer var1, Buffer var2, int var3, boolean var4) { @@ -64,10 +65,10 @@ public class WorldMapAreaData extends WorldMapArea { this.initIconsList(var2, var4); // L: 42 } // L: 43 - @ObfuscatedName("cc") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(Lpi;ZI)V", - garbageValue = "-313386834" + descriptor = "(Lpx;ZI)V", + garbageValue = "-838366517" ) @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { @@ -75,7 +76,7 @@ public class WorldMapAreaData extends WorldMapArea { int var3 = var1.readUnsignedShort(); // L: 47 for (int var4 = 0; var4 < var3; ++var4) { // L: 48 - int var5 = var1.method7692(); // L: 49 + int var5 = var1.method7532(); // L: 49 Coord var6 = new Coord(var1.readInt()); // L: 50 boolean var7 = var1.readUnsignedByte() == 1; // L: 51 if (var2 || !var7) { // L: 52 @@ -84,4 +85,219 @@ public class WorldMapAreaData extends WorldMapArea { } } // L: 56 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "676720431" + ) + public static boolean method4880(int var0) { + return var0 >= 0 && var0 < 112 ? KeyHandler.field120[var0] : false; // L: 227 228 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(ILbb;ZI)I", + garbageValue = "782138310" + ) + static int method4887(int var0, Script var1, boolean var2) { + int var4 = -1; // L: 612 + Widget var3; + if (var0 >= 2000) { // L: 613 + var0 -= 1000; // L: 614 + var4 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 615 + var3 = class92.getWidget(var4); // L: 616 + } else { + var3 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 618 + } + + if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 619 + class12.Interpreter_intStackSize -= 2; // L: 620 + var3.scrollX = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 621 + if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 622 + var3.scrollX = var3.scrollWidth - var3.width; + } + + if (var3.scrollX < 0) { // L: 623 + var3.scrollX = 0; + } + + var3.scrollY = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 624 + if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 625 + var3.scrollY = var3.scrollHeight - var3.height; + } + + if (var3.scrollY < 0) { // L: 626 + var3.scrollY = 0; + } + + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 627 + return 1; // L: 628 + } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 630 + var3.color = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 631 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 632 + return 1; // L: 633 + } else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 635 + var3.fill = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 636 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 637 + return 1; // L: 638 + } else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 640 + var3.transparencyTop = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 641 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 642 + return 1; // L: 643 + } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 645 + var3.lineWid = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 646 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 647 + return 1; // L: 648 + } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 650 + var3.spriteId2 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 651 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 652 + return 1; // L: 653 + } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 655 + var3.spriteAngle = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 656 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 657 + return 1; // L: 658 + } else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 660 + var3.spriteTiling = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 661 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 662 + return 1; // L: 663 + } else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 665 + var3.modelType = 1; // L: 666 + var3.modelId = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 667 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 668 + return 1; // L: 669 + } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 671 + class12.Interpreter_intStackSize -= 6; // L: 672 + var3.modelOffsetX = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 673 + var3.modelOffsetY = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 674 + var3.modelAngleX = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 675 + var3.modelAngleY = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 3]; // L: 676 + var3.modelAngleZ = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 4]; // L: 677 + var3.modelZoom = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 5]; // L: 678 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 679 + return 1; // L: 680 + } else { + int var8; + if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 682 + var8 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 683 + if (var8 != var3.sequenceId) { // L: 684 + var3.sequenceId = var8; // L: 685 + var3.modelFrame = 0; // L: 686 + var3.modelFrameCycle = 0; // L: 687 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 688 + } + + return 1; // L: 690 + } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 692 + var3.modelOrthog = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 693 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 694 + return 1; // L: 695 + } else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 697 + String var7 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 698 + if (!var7.equals(var3.text)) { // L: 699 + var3.text = var7; // L: 700 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 701 + } + + return 1; // L: 703 + } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 705 + var3.fontId = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 706 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 707 + return 1; // L: 708 + } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 710 + class12.Interpreter_intStackSize -= 3; // L: 711 + var3.textXAlignment = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 712 + var3.textYAlignment = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 713 + var3.textLineHeight = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 714 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 715 + return 1; // L: 716 + } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 718 + var3.textShadowed = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 719 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 720 + return 1; // L: 721 + } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 723 + var3.outline = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 724 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 725 + return 1; // L: 726 + } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 728 + var3.spriteShadow = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 729 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 730 + return 1; // L: 731 + } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 733 + var3.spriteFlipV = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 734 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 735 + return 1; // L: 736 + } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 738 + var3.spriteFlipH = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 739 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 740 + return 1; // L: 741 + } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 743 + class12.Interpreter_intStackSize -= 2; // L: 744 + var3.scrollWidth = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 745 + var3.scrollHeight = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 746 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 747 + if (var4 != -1 && var3.type == 0) { // L: 748 + UserComparator8.revalidateWidgetScroll(NetSocket.Widget_interfaceComponents[var4 >> 16], var3, false); + } + + return 1; // L: 749 + } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 751 + Skills.resumePauseWidget(var3.id, var3.childIndex); // L: 752 + Client.meslayerContinueWidget = var3; // L: 753 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 754 + return 1; // L: 755 + } else if (var0 == 1122) { // L: 757 + var3.spriteId = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 758 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 759 + return 1; // L: 760 + } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 762 + var3.color2 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 763 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 764 + return 1; // L: 765 + } else if (var0 == 1124) { // L: 767 + var3.transparencyBot = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 768 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 769 + return 1; // L: 770 + } else if (var0 == 1125) { // L: 772 + var8 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 773 + FillMode var6 = (FillMode)class291.findEnumerated(WorldMapEvent.FillMode_values(), var8); // L: 774 + if (var6 != null) { // L: 775 + var3.fillMode = var6; // L: 776 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 777 + } + + return 1; // L: 779 + } else { + boolean var5; + if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 781 + var5 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 782 + var3.field3428 = var5; // L: 783 + return 1; // L: 784 + } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 786 + var5 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 787 + var3.modelTransparency = var5; // L: 788 + return 1; // L: 789 + } else if (var0 == 1128) { // L: 791 + class12.Interpreter_intStackSize -= 2; // L: 792 + return 1; // L: 793 + } else if (var0 == 1129) { // L: 795 + var3.field3431 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 796 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 797 + return 1; // L: 798 + } else if (var0 == 1130) { // L: 800 + var3.method5449(Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize], UserComparator7.urlRequester, class92.method2374()); // L: 801 + return 1; // L: 802 + } else if (var0 == 1131) { // L: 804 + class12.Interpreter_intStackSize -= 2; // L: 805 + var3.method5451(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]); // L: 806 + return 1; // L: 807 + } else if (var0 == 1132) { // L: 809 + var3.method5468(Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize], Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 810 + return 1; // L: 811 + } else { + return 2; // L: 813 + } + } + } + } } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index c5c55b08a6..2ca24209de 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -1,46 +1,64 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hw") +@ObfuscatedName("id") @Implements("WorldMapCacheName") public class WorldMapCacheName { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lid;" ) - public static final WorldMapCacheName field2413; - @ObfuscatedName("c") + public static final WorldMapCacheName field2910; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lid;" ) - public static final WorldMapCacheName field2414; - @ObfuscatedName("i") + public static final WorldMapCacheName field2907; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lid;" ) - public static final WorldMapCacheName field2418; - @ObfuscatedName("f") + public static final WorldMapCacheName field2908; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lid;" ) - static final WorldMapCacheName field2419; - @ObfuscatedName("b") + static final WorldMapCacheName field2909; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lid;" ) - public static final WorldMapCacheName field2417; - @ObfuscatedName("n") + public static final WorldMapCacheName field2911; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Llp;" + ) + @Export("Widget_spritesArchive") + static AbstractArchive Widget_spritesArchive; + @ObfuscatedName("bm") + @ObfuscatedGetter( + intValue = 1965056495 + ) + static int field2912; + @ObfuscatedName("gf") + @ObfuscatedSignature( + descriptor = "Lfl;" + ) + @Export("socketTask") + static Task socketTask; + @ObfuscatedName("m") @Export("name") public final String name; static { - field2413 = new WorldMapCacheName("details"); // L: 4 - field2414 = new WorldMapCacheName("compositemap"); // L: 5 - field2418 = new WorldMapCacheName("compositetexture"); // L: 6 - field2419 = new WorldMapCacheName("area"); // L: 7 - field2417 = new WorldMapCacheName("labels"); // L: 8 + field2910 = new WorldMapCacheName("details"); // L: 4 + field2907 = new WorldMapCacheName("compositemap"); // L: 5 + field2908 = new WorldMapCacheName("compositetexture"); // L: 6 + field2909 = new WorldMapCacheName("area"); // L: 7 + field2911 = new WorldMapCacheName("labels"); // L: 8 } WorldMapCacheName(String var1) { diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index 8b8fa4e2ca..774be8dc8a 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -3,28 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ge") +@ObfuscatedName("hz") @Implements("WorldMapData_0") public class WorldMapData_0 extends AbstractWorldMapData { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - @Export("ObjectDefinition_archive") - public static AbstractArchive ObjectDefinition_archive; - WorldMapData_0() { } // L: 6 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;S)V", - garbageValue = "-2625" + descriptor = "(Lpx;I)V", + garbageValue = "-2029115050" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 9 - if (var2 != WorldMapID.field2383.value) { // L: 10 + if (var2 != WorldMapID.field2879.value) { // L: 10 throw new IllegalStateException(""); // L: 11 } else { super.minPlane = var1.readUnsignedByte(); // L: 13 @@ -33,53 +26,53 @@ public class WorldMapData_0 extends AbstractWorldMapData { super.regionYLow = var1.readUnsignedShort(); // L: 16 super.regionX = var1.readUnsignedShort(); // L: 17 super.regionY = var1.readUnsignedShort(); // L: 18 - super.groupId = var1.method7692(); // L: 19 - super.fileId = var1.method7692(); // L: 20 + super.groupId = var1.method7532(); // L: 19 + super.fileId = var1.method7532(); // L: 20 } } // L: 21 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "169222990" + descriptor = "(Lpx;I)V", + garbageValue = "933342926" ) @Export("readGeography") void readGeography(Buffer var1) { - 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.field2334 = new byte[super.planes][64][64]; // L: 27 - super.field2342 = 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 != class214.field2380.value) { // L: 31 - throw new IllegalStateException(""); // L: 32 + super.planes = Math.min(super.planes, 4); // L: 25 + super.floorUnderlayIds = new short[1][64][64]; // L: 26 + super.floorOverlayIds = new short[super.planes][64][64]; // L: 27 + super.field2845 = new byte[super.planes][64][64]; // L: 28 + super.field2847 = new byte[super.planes][64][64]; // L: 29 + super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 30 + int var2 = var1.readUnsignedByte(); // L: 31 + if (var2 != class239.field2875.value) { // L: 32 + throw new IllegalStateException(""); // L: 33 } else { - 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) { // L: 39 - for (int var6 = 0; var6 < 64; ++var6) { // L: 40 - this.readTile(var5, var6, var1); // L: 41 + int var3 = var1.readUnsignedByte(); // L: 35 + int var4 = var1.readUnsignedByte(); // L: 36 + if (var3 == super.regionX && var4 == super.regionY) { // L: 37 + for (int var5 = 0; var5 < 64; ++var5) { // L: 40 + for (int var6 = 0; var6 < 64; ++var6) { // L: 41 + this.readTile(var5, var6, var1); // L: 42 } } } else { - throw new IllegalStateException(""); // L: 37 + throw new IllegalStateException(""); // L: 38 } } - } // L: 44 - - public int hashCode() { - return super.regionX | super.regionY << 8; // L: 55 - } + } // L: 45 public boolean equals(Object var1) { - if (!(var1 instanceof WorldMapData_0)) { // L: 47 - return false; // L: 48 + if (!(var1 instanceof WorldMapData_0)) { // L: 49 + return false; // L: 50 } 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; // L: 52 + return super.regionX == var2.regionX && var2.regionY == super.regionY; // L: 53 } } + + public int hashCode() { + return super.regionX | super.regionY << 8; // L: 58 + } } diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index 5c861d8dc9..2f2f9184cd 100644 --- a/runescape-client/src/main/java/WorldMapData_1.java +++ b/runescape-client/src/main/java/WorldMapData_1.java @@ -1,33 +1,37 @@ +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("gg") +@ObfuscatedName("hj") @Implements("WorldMapData_1") public class WorldMapData_1 extends AbstractWorldMapData { - @ObfuscatedName("v") + @ObfuscatedName("av") + @Export("garbageCollector") + static GarbageCollectorMXBean garbageCollector; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1189550107 + intValue = -490109915 ) @Export("chunkXLow") int chunkXLow; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1085074515 + intValue = 963547753 ) @Export("chunkYLow") int chunkYLow; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1863655397 + intValue = -1228146275 ) @Export("chunkX") int chunkX; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1631671287 + intValue = -2073132681 ) @Export("chunkY") int chunkY; @@ -35,15 +39,15 @@ public class WorldMapData_1 extends AbstractWorldMapData { WorldMapData_1() { } // L: 11 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "1916863393" + descriptor = "(Lpx;B)V", + garbageValue = "108" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 14 - if (var2 != WorldMapID.field2387.value) { // L: 15 + if (var2 != WorldMapID.field2877.value) { // L: 15 throw new IllegalStateException(""); // L: 16 } else { super.minPlane = var1.readUnsignedByte(); // L: 18 @@ -56,127 +60,249 @@ 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.method7692(); // L: 28 - super.fileId = var1.method7692(); // L: 29 + super.groupId = var1.method7532(); // L: 28 + super.fileId = var1.method7532(); // L: 29 } } // L: 30 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "169222990" + descriptor = "(Lpx;I)V", + garbageValue = "933342926" ) @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.field2334 = new byte[super.planes][64][64]; // L: 36 - super.field2342 = 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 != class214.field2378.value) { // L: 40 - throw new IllegalStateException(""); // L: 41 + super.planes = Math.min(super.planes, 4); // L: 34 + super.floorUnderlayIds = new short[1][64][64]; // L: 35 + super.floorOverlayIds = new short[super.planes][64][64]; // L: 36 + super.field2845 = new byte[super.planes][64][64]; // L: 37 + super.field2847 = new byte[super.planes][64][64]; // L: 38 + super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 39 + int var2 = var1.readUnsignedByte(); // L: 40 + if (var2 != class239.field2872.value) { // L: 41 + throw new IllegalStateException(""); // L: 42 } else { - int var3 = var1.readUnsignedByte(); // L: 43 - int var4 = var1.readUnsignedByte(); // L: 44 - int var5 = var1.readUnsignedByte(); // L: 45 - int var6 = var1.readUnsignedByte(); // L: 46 - if (var3 == super.regionX && var4 == super.regionY && var5 == this.chunkX && var6 == this.chunkY) { // L: 47 - for (int var7 = 0; var7 < 8; ++var7) { // L: 50 - for (int var8 = 0; var8 < 8; ++var8) { // L: 51 - this.readTile(var7 + this.chunkX * 8, var8 + this.chunkY * 8, var1); // L: 52 + int var3 = var1.readUnsignedByte(); // L: 44 + int var4 = var1.readUnsignedByte(); // L: 45 + int var5 = var1.readUnsignedByte(); // L: 46 + int var6 = var1.readUnsignedByte(); // L: 47 + if (var3 == super.regionX && var4 == super.regionY && var5 == this.chunkX && var6 == this.chunkY) { // L: 48 + for (int var7 = 0; var7 < 8; ++var7) { // L: 51 + for (int var8 = 0; var8 < 8; ++var8) { // L: 52 + this.readTile(var7 + this.chunkX * 8, var8 + this.chunkY * 8, var1); // L: 53 } } } else { - throw new IllegalStateException(""); // L: 48 + throw new IllegalStateException(""); // L: 49 } } - } // L: 55 + } // L: 56 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)I", garbageValue = "-8" ) @Export("getChunkXLow") int getChunkXLow() { - return this.chunkXLow; + return this.chunkXLow; // L: 76 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "16777215" + garbageValue = "1782342314" ) @Export("getChunkYLow") int getChunkYLow() { - return this.chunkYLow; + return this.chunkYLow; // L: 80 } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2037619431" + garbageValue = "1449526509" ) @Export("getChunkX") int getChunkX() { - return this.chunkX; // L: 81 + return this.chunkX; // L: 84 } - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "93025886" + garbageValue = "-413234934" ) @Export("getChunkY") int getChunkY() { - return this.chunkY; // L: 85 + return this.chunkY; // L: 88 } public boolean equals(Object var1) { - if (!(var1 instanceof WorldMapData_1)) { // L: 58 - return false; // L: 59 + if (!(var1 instanceof WorldMapData_1)) { // L: 60 + return false; // L: 61 } else { - WorldMapData_1 var2 = (WorldMapData_1)var1; // L: 61 - if (super.regionX == var2.regionX && var2.regionY == super.regionY) { - return this.chunkX == var2.chunkX && this.chunkY == var2.chunkY; + WorldMapData_1 var2 = (WorldMapData_1)var1; // L: 63 + if (super.regionX == var2.regionX && super.regionY == var2.regionY) { // L: 64 + return this.chunkX == var2.chunkX && var2.chunkY == this.chunkY; // L: 67 } else { - return false; + return false; // L: 65 } } } public int hashCode() { - return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; + return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; // L: 72 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "([BIII)Ljava/lang/String;", - garbageValue = "-264358279" + descriptor = "(ZI)V", + garbageValue = "-21477697" ) - static String method4226(byte[] var0, int var1, int var2) { - StringBuilder var3 = new StringBuilder(); // L: 62 + static void method4706(boolean var0) { + byte var1 = 0; // L: 1074 + if (!class118.method2721()) { // L: 1075 + var1 = 12; // L: 1076 + } else if (class82.client.method1128() || class82.client.method1520()) { // L: 1078 + var1 = 10; // L: 1079 + } - for (int var4 = var1; var4 < var2 + var1; var4 += 3) { // L: 63 - int var5 = var0[var4] & 255; // L: 64 - var3.append(class346.field4136[var5 >>> 2]); // L: 65 - if (var4 < var2 - 1) { // L: 66 - int var6 = var0[var4 + 1] & 255; // L: 67 - var3.append(class346.field4136[(var5 & 3) << 4 | var6 >>> 4]); // L: 68 - if (var4 < var2 - 2) { // L: 69 - int var7 = var0[var4 + 2] & 255; // L: 70 - var3.append(class346.field4136[(var6 & 15) << 2 | var7 >>> 6]).append(class346.field4136[var7 & 63]); // L: 71 - } else { - var3.append(class346.field4136[(var6 & 15) << 2]).append("="); // L: 73 - } + class126.method2799(var1); // L: 1081 + if (var0) { // L: 1082 + Login.Login_username = ""; // L: 1083 + Login.Login_password = ""; // L: 1084 + WorldMapCacheName.field2912 = 0; // L: 1085 + class92.otp = ""; // L: 1086 + } + + if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 1089 + if (class12.clientPreferences.method2241() != null) { // L: 1090 + Login.Login_username = class12.clientPreferences.method2241(); // L: 1091 + Client.Login_isUsernameRemembered = true; // L: 1092 } else { - var3.append(class346.field4136[(var5 & 3) << 4]).append("=="); // L: 75 + Client.Login_isUsernameRemembered = false; // L: 1094 } } - return var3.toString(); // L: 77 + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 1097 + Login.currentLoginField = 1; // L: 1098 + } else { + Login.currentLoginField = 0; // L: 1101 + } + + } // L: 1104 + + @ObfuscatedName("hj") + @ObfuscatedSignature( + descriptor = "(IIIIIIII)V", + garbageValue = "-1880965646" + ) + @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: 7922 + if (Client.isLowDetail && var0 != class128.Client_plane) { // L: 7923 + return; + } + + long var7 = 0L; // L: 7924 + boolean var9 = true; // L: 7925 + boolean var10 = false; // L: 7926 + boolean var11 = false; // L: 7927 + if (var1 == 0) { // L: 7928 + var7 = class175.scene.getBoundaryObjectTag(var0, var2, var3); + } + + if (var1 == 1) { // L: 7929 + var7 = class175.scene.getWallDecorationTag(var0, var2, var3); + } + + if (var1 == 2) { // L: 7930 + var7 = class175.scene.getGameObjectTag(var0, var2, var3); + } + + if (var1 == 3) { // L: 7931 + var7 = class175.scene.getFloorDecorationTag(var0, var2, var3); + } + + int var12; + if (var7 != 0L) { // L: 7932 + var12 = class175.scene.getObjectFlags(var0, var2, var3, var7); // L: 7933 + int var14 = NetSocket.Entity_unpackID(var7); // L: 7934 + int var15 = var12 & 31; // L: 7935 + int var16 = var12 >> 6 & 3; // L: 7936 + ObjectComposition var13; + if (var1 == 0) { // L: 7937 + class175.scene.removeBoundaryObject(var0, var2, var3); // L: 7938 + var13 = class82.getObjectDefinition(var14); // L: 7939 + if (var13.interactType != 0) { // L: 7940 + Client.collisionMaps[var0].method3756(var2, var3, var15, var16, var13.boolean1); + } + } + + if (var1 == 1) { // L: 7942 + class175.scene.removeWallDecoration(var0, var2, var3); + } + + if (var1 == 2) { // L: 7943 + class175.scene.removeGameObject(var0, var2, var3); // L: 7944 + var13 = class82.getObjectDefinition(var14); // L: 7945 + if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 7946 + return; + } + + if (var13.interactType != 0) { // L: 7947 + Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var16, var13.boolean1); + } + } + + if (var1 == 3) { // L: 7949 + class175.scene.removeFloorDecoration(var0, var2, var3); // L: 7950 + var13 = class82.getObjectDefinition(var14); // L: 7951 + if (var13.interactType == 1) { // L: 7952 + Client.collisionMaps[var0].method3759(var2, var3); + } + } + } + + if (var4 >= 0) { // L: 7955 + var12 = var0; // L: 7956 + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 7957 + var12 = var0 + 1; + } + + Fonts.method7226(var0, var12, var2, var3, var4, var5, var6, class175.scene, Client.collisionMaps[var0]); // L: 7958 + } + } + + } // L: 7961 + + @ObfuscatedName("lw") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZB)Ljava/lang/String;", + garbageValue = "35" + ) + static String method4707(String var0, boolean var1) { + String var2 = var1 ? "https://" : "http://"; // L: 12529 + if (Client.gameBuild == 1) { // L: 12530 + var0 = var0 + "-wtrc"; + } else if (Client.gameBuild == 2) { // L: 12531 + var0 = var0 + "-wtqa"; + } else if (Client.gameBuild == 3) { // L: 12532 + var0 = var0 + "-wtwip"; + } else if (Client.gameBuild == 5) { // L: 12533 + var0 = var0 + "-wti"; + } else if (Client.gameBuild == 4) { // L: 12534 + var0 = "local"; + } + + String var3 = ""; // L: 12535 + if (Client.field662 != null) { // L: 12536 + var3 = "/p=" + Client.field662; + } + + String var4 = "runescape.com"; // L: 12537 + return var2 + var0 + "." + var4 + "/l=" + class263.clientLanguage + "/a=" + class230.field2807 + var3 + "/"; // L: 12538 } } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index 94ac199d56..1899cff375 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -2,25 +2,27 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hl") +@ObfuscatedName("iy") @Implements("WorldMapDecoration") public class WorldMapDecoration { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 37157343 + intValue = -170825093 ) @Export("objectDefinitionId") final int objectDefinitionId; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1991740145 + intValue = -727750889 ) @Export("decoration") final int decoration; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1682517797 + intValue = -1798867267 ) @Export("rotation") final int rotation; @@ -30,4 +32,106 @@ public class WorldMapDecoration { this.decoration = var2; // L: 10 this.rotation = var3; // L: 11 } // L: 12 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "2105271367" + ) + @Export("loadInterface") + public static boolean loadInterface(int var0) { + if (class120.Widget_loadedInterfaces[var0]) { // L: 246 + return true; + } else if (!class134.Widget_archive.tryLoadGroup(var0)) { // L: 247 + return false; + } else { + int var1 = class134.Widget_archive.getGroupFileCount(var0); // L: 248 + if (var1 == 0) { // L: 249 + class120.Widget_loadedInterfaces[var0] = true; // L: 250 + return true; // L: 251 + } else { + if (NetSocket.Widget_interfaceComponents[var0] == null) { // L: 253 + NetSocket.Widget_interfaceComponents[var0] = new Widget[var1]; + } + + for (int var2 = 0; var2 < var1; ++var2) { // L: 254 + if (NetSocket.Widget_interfaceComponents[var0][var2] == null) { // L: 255 + byte[] var3 = class134.Widget_archive.takeFile(var0, var2); // L: 256 + if (var3 != null) { // L: 257 + NetSocket.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 258 + NetSocket.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 259 + if (var3[0] == -1) { // L: 260 + NetSocket.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); + } else { + NetSocket.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 261 + } + } + } + } + + class120.Widget_loadedInterfaces[var0] = true; // L: 265 + return true; // L: 266 + } + } + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(ILbb;ZI)I", + garbageValue = "1988799748" + ) + static int method4804(int var0, Script var1, boolean var2) { + Widget var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1341 + if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1342 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1343 + return 1; // L: 1344 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1346 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1347 + return 1; // L: 1348 + } else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1350 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3.text; // L: 1351 + return 1; // L: 1352 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1354 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1355 + return 1; // L: 1356 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1358 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1359 + return 1; // L: 1360 + } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1362 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1363 + return 1; // L: 1364 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1366 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1367 + return 1; // L: 1368 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1370 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1371 + return 1; // L: 1372 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1374 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1375 + return 1; // L: 1376 + } else if (var0 == ScriptOpcodes.IF_GETTRANS) { // L: 1378 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1379 + return 1; // L: 1380 + } else if (var0 == 2610) { // L: 1382 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1383 + return 1; // L: 1384 + } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1386 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.color; // L: 1387 + return 1; // L: 1388 + } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1390 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.color2; // L: 1391 + return 1; // L: 1392 + } else if (var0 == 2613) { // L: 1394 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1395 + return 1; // L: 1396 + } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1398 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1399 + return 1; // L: 1400 + } else if (var0 != 2615 && var0 != 2616) { // L: 1402 + return 2; // L: 1406 + } else { + ++class12.Interpreter_intStackSize; // L: 1403 + return 1; // L: 1404 + } + } } diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index 4a6c42ccdf..b180921f1f 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -4,134 +4,128 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ko") +@ObfuscatedName("kw") @Implements("WorldMapDecorationType") public enum WorldMapDecorationType implements MouseWheel { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lko;" - ) - field3517(0, 0), - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lko;" - ) - field3512(1, 0), - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lko;" - ) - field3509(2, 0), - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lko;" - ) - field3500(3, 0), - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lko;" - ) - field3501(9, 2), - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lko;" - ) - field3502(4, 1), - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lko;" - ) - field3507(5, 1), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lko;" - ) - field3499(6, 1), - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lko;" - ) - field3505(7, 1), @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lkw;" ) - field3504(8, 1), - @ObfuscatedName("r") + field3571(0, 0), + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lkw;" ) - field3497(12, 2), - @ObfuscatedName("p") + field3570(1, 0), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lkw;" ) - field3508(13, 2), - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lko;" - ) - field3521(14, 2), + field3558(2, 0), @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lkw;" ) - field3510(15, 2), - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lko;" - ) - field3511(16, 2), - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lko;" - ) - field3506(17, 2), - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lko;" - ) - field3515(18, 2), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lko;" - ) - field3514(19, 2), - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lko;" - ) - field3513(20, 2), - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lko;" - ) - field3516(21, 2), + field3559(3, 0), @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lkw;" ) - field3498(10, 2), + field3560(9, 2), + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lkw;" + ) + field3556(4, 1), + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lkw;" + ) + field3564(5, 1), + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lkw;" + ) + field3563(6, 1), + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lkw;" + ) + field3572(7, 1), + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lkw;" + ) + field3565(8, 1), @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lkw;" ) - field3518(11, 2), + field3566(12, 2), + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lkw;" + ) + field3567(13, 2), + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lkw;" + ) + field3557(14, 2), + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lkw;" + ) + field3569(15, 2), + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lkw;" + ) + field3576(16, 2), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lkw;" + ) + field3561(17, 2), + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lkw;" + ) + field3568(18, 2), + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lkw;" + ) + field3573(19, 2), + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lkw;" + ) + field3574(20, 2), + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lkw;" + ) + field3575(21, 2), + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lkw;" + ) + field3562(10, 2), + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lkw;" + ) + field3577(11, 2), @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lkw;" ) - field3519(22, 3); + field3578(22, 3); - @ObfuscatedName("ed") - @ObfuscatedSignature( - descriptor = "Llx;" - ) - @Export("archive9") - static Archive archive9; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1027603677 + intValue = -1442497389 ) @Export("id") public final int id; @@ -144,13 +138,57 @@ public enum WorldMapDecorationType implements MouseWheel { this.id = var3; // L: 34 } // L: 35 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 38 + return this.id; // L: 39 } + + @ObfuscatedName("kw") + @ObfuscatedSignature( + descriptor = "(Lki;I)V", + garbageValue = "1049661564" + ) + static final void method5575(Widget var0) { + int var1 = var0.contentType; // L: 12160 + if (var1 == 324) { // L: 12161 + if (Client.field602 == -1) { // L: 12162 + Client.field602 = var0.spriteId2; // L: 12163 + Client.field763 = var0.spriteId; // L: 12164 + } + + if (Client.playerAppearance.isFemale) { // L: 12166 + var0.spriteId2 = Client.field602; + } else { + var0.spriteId2 = Client.field763; // L: 12167 + } + + } else if (var1 == 325) { // L: 12170 + if (Client.field602 == -1) { // L: 12171 + Client.field602 = var0.spriteId2; // L: 12172 + Client.field763 = var0.spriteId; // L: 12173 + } + + if (Client.playerAppearance.isFemale) { // L: 12175 + var0.spriteId2 = Client.field763; + } else { + var0.spriteId2 = Client.field602; // L: 12176 + } + + } else if (var1 == 327) { // L: 12179 + var0.modelAngleX = 150; // L: 12180 + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 12181 + var0.modelType = 5; // L: 12182 + var0.modelId = 0; // L: 12183 + } else if (var1 == 328) { // L: 12186 + var0.modelAngleX = 150; // L: 12187 + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 12188 + var0.modelType = 5; // L: 12189 + var0.modelId = 1; // L: 12190 + } + } // L: 12168 12177 12184 12191 12193 } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index 28f9da2589..d168e7bf1f 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -1,129 +1,107 @@ -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("fe") +@ObfuscatedName("fx") @Implements("WorldMapElement") public class WorldMapElement extends DualNode { - @ObfuscatedName("tn") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -157770033 - ) - static int field1837; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - @Export("WorldMapElement_archive") - static AbstractArchive WorldMapElement_archive; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "[Lfe;" - ) - @Export("WorldMapElement_cached") - static WorldMapElement[] WorldMapElement_cached; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 225433591 + intValue = -1647278563 ) @Export("WorldMapElement_count") public static int WorldMapElement_count; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("WorldMapElement_cachedSprites") public static EvictingDualNodeHashTable WorldMapElement_cachedSprites; - @ObfuscatedName("bw") - static String field1836; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1299473343 + intValue = 1174190197 ) @Export("objectId") public final int objectId; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 2002473353 + intValue = 1853548417 ) @Export("sprite1") public int sprite1; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1967880505 + intValue = 195753019 ) @Export("sprite2") int sprite2; - @ObfuscatedName("l") + @ObfuscatedName("s") @Export("name") public String name; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -713900129 + intValue = 814064351 ) - public int field1819; - @ObfuscatedName("o") + public int field1871; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1130122781 + intValue = -1883868595 ) @Export("textSize") public int textSize; - @ObfuscatedName("p") - public boolean field1822; + @ObfuscatedName("c") + public boolean field1876; @ObfuscatedName("w") - public boolean field1823; - @ObfuscatedName("k") + public boolean field1874; + @ObfuscatedName("b") @Export("menuActions") public String[] menuActions; - @ObfuscatedName("d") + @ObfuscatedName("t") @Export("menuTargetName") public String menuTargetName; - @ObfuscatedName("m") - int[] field1826; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 380033171 - ) - int field1827; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 290055171 - ) - int field1818; @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 1320968285 - ) - int field1829; + int[] field1873; @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 822364643 + intValue = -945687381 ) - int field1816; - @ObfuscatedName("a") + int field1865; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 2079888943 + ) + int field1869; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 1349758673 + ) + int field1885; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -817462247 + ) + int field1881; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lfw;" + descriptor = "Lfj;" ) @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lfk;" ) @Export("verticalAlignment") public VerticalAlignment verticalAlignment; @ObfuscatedName("j") - int[] field1821; - @ObfuscatedName("e") - byte[] field1834; + int[] field1884; @ObfuscatedName("z") + byte[] field1877; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -504229365 + intValue = 1922405763 ) @Export("category") public int category; @@ -136,23 +114,23 @@ public class WorldMapElement extends DualNode { this.sprite1 = -1; // L: 18 this.sprite2 = -1; // L: 19 this.textSize = 0; // L: 22 - this.field1822 = true; // L: 24 - this.field1823 = false; // L: 25 + this.field1876 = true; // L: 24 + this.field1874 = false; // L: 25 this.menuActions = new String[5]; // L: 26 - this.field1827 = Integer.MAX_VALUE; // L: 29 - this.field1818 = Integer.MAX_VALUE; // L: 30 - this.field1829 = Integer.MIN_VALUE; - this.field1816 = Integer.MIN_VALUE; + this.field1865 = Integer.MAX_VALUE; // L: 29 + this.field1869 = Integer.MAX_VALUE; // L: 30 + this.field1885 = Integer.MIN_VALUE; // L: 31 + this.field1881 = Integer.MIN_VALUE; // L: 32 this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; // L: 33 - this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; - this.category = -1; - this.objectId = var1; + this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; // L: 34 + this.category = -1; // L: 37 + this.objectId = var1; // L: 40 } // L: 41 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "2" + descriptor = "(Lpx;B)V", + garbageValue = "49" ) @Export("decode") void decode(Buffer var1) { @@ -166,21 +144,21 @@ public class WorldMapElement extends DualNode { } } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-633870320" + descriptor = "(Lpx;IB)V", + garbageValue = "6" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { // L: 77 - this.sprite1 = var1.method7692(); + this.sprite1 = var1.method7532(); } else if (var2 == 2) { // L: 78 - this.sprite2 = var1.method7692(); + this.sprite2 = var1.method7532(); } else if (var2 == 3) { // L: 79 this.name = var1.readStringCp1252NullTerminated(); } else if (var2 == 4) { // L: 80 - this.field1819 = var1.readMedium(); + this.field1871 = var1.readMedium(); } else if (var2 == 5) { // L: 81 var1.readMedium(); // L: 82 } else if (var2 == 6) { // L: 84 @@ -190,11 +168,11 @@ public class WorldMapElement extends DualNode { if (var2 == 7) { // L: 85 var6 = var1.readUnsignedByte(); // L: 86 if ((var6 & 1) == 0) { // L: 87 - this.field1822 = false; + this.field1876 = false; } if ((var6 & 2) == 2) { // L: 88 - this.field1823 = true; + this.field1874 = true; } } else if (var2 == 8) { // L: 90 var1.readUnsignedByte(); // L: 91 @@ -202,32 +180,32 @@ public class WorldMapElement extends DualNode { this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); } else if (var2 == 15) { // L: 94 var6 = var1.readUnsignedByte(); // L: 95 - this.field1826 = new int[var6 * 2]; // L: 96 + this.field1873 = new int[var6 * 2]; // L: 96 int var4; for (var4 = 0; var4 < var6 * 2; ++var4) { // L: 97 - this.field1826[var4] = var1.readShort(); + this.field1873[var4] = var1.readShort(); } var1.readInt(); // L: 98 var4 = var1.readUnsignedByte(); // L: 99 - this.field1821 = new int[var4]; // L: 100 + this.field1884 = new int[var4]; // L: 100 int var5; - for (var5 = 0; var5 < this.field1821.length; ++var5) { // L: 101 - this.field1821[var5] = var1.readInt(); + for (var5 = 0; var5 < this.field1884.length; ++var5) { // L: 101 + this.field1884[var5] = var1.readInt(); } - this.field1834 = new byte[var6]; // L: 102 + this.field1877 = new byte[var6]; // L: 102 for (var5 = 0; var5 < var6; ++var5) { // L: 103 - this.field1834[var5] = var1.readByte(); + this.field1877[var5] = var1.readByte(); } } else if (var2 != 16) { // L: 105 if (var2 == 17) { // L: 106 this.menuTargetName = var1.readStringCp1252NullTerminated(); } else if (var2 == 18) { // L: 107 - var1.method7692(); // L: 108 + var1.method7532(); // L: 108 } else if (var2 == 19) { // L: 110 this.category = var1.readUnsignedShort(); } else if (var2 == 21) { // L: 111 @@ -242,508 +220,87 @@ public class WorldMapElement extends DualNode { var1.readShort(); // L: 123 var1.readShort(); // L: 124 } else if (var2 == 25) { // L: 126 - var1.method7692(); // L: 127 + var1.method7532(); // L: 127 } else if (var2 == 28) { // L: 129 var1.readUnsignedByte(); // L: 130 } else if (var2 == 29) { // L: 132 - HorizontalAlignment[] var3 = new HorizontalAlignment[]{HorizontalAlignment.field1890, HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field1889}; // L: 135 - this.horizontalAlignment = (HorizontalAlignment)MusicPatchPcmStream.findEnumerated(var3, var1.readUnsignedByte()); // L: 137 + HorizontalAlignment[] var3 = new HorizontalAlignment[]{HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field1937, HorizontalAlignment.field1938}; // L: 135 + this.horizontalAlignment = (HorizontalAlignment)class291.findEnumerated(var3, var1.readUnsignedByte()); // L: 137 } else if (var2 == 30) { // L: 139 - this.verticalAlignment = (VerticalAlignment)MusicPatchPcmStream.findEnumerated(class295.method5745(), var1.readUnsignedByte()); // L: 140 + VerticalAlignment[] var7 = new VerticalAlignment[]{VerticalAlignment.field2001, VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1994}; // L: 142 + this.verticalAlignment = (VerticalAlignment)class291.findEnumerated(var7, var1.readUnsignedByte()); // L: 144 } } } - } // L: 143 + } // L: 147 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "13" + garbageValue = "14" ) - void method3381() { - if (this.field1826 != null) { // L: 146 - for (int var1 = 0; var1 < this.field1826.length; var1 += 2) { // L: 147 - if (this.field1826[var1] < this.field1827) { // L: 148 - this.field1827 = this.field1826[var1]; - } else if (this.field1826[var1] > this.field1829) { - this.field1829 = this.field1826[var1]; // L: 149 + void method3291() { + if (this.field1873 != null) { // L: 150 + for (int var1 = 0; var1 < this.field1873.length; var1 += 2) { // L: 151 + if (this.field1873[var1] < this.field1865) { // L: 152 + this.field1865 = this.field1873[var1]; + } else if (this.field1873[var1] > this.field1885) { // L: 153 + this.field1885 = this.field1873[var1]; } - if (this.field1826[var1 + 1] < this.field1818) { // L: 150 - this.field1818 = this.field1826[var1 + 1]; - } else if (this.field1826[var1 + 1] > this.field1816) { - this.field1816 = this.field1826[var1 + 1]; // L: 151 + if (this.field1873[var1 + 1] < this.field1869) { // L: 154 + this.field1869 = this.field1873[var1 + 1]; + } else if (this.field1873[var1 + 1] > this.field1881) { + this.field1881 = this.field1873[var1 + 1]; // L: 155 } } } - } // L: 154 + } // L: 158 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(ZI)Lqi;", - garbageValue = "39477486" + descriptor = "(ZI)Lqr;", + garbageValue = "-1312642050" ) @Export("getSpriteBool") public SpritePixels getSpriteBool(boolean var1) { - int var2 = this.sprite1; // L: 157 - return this.getSprite(var2); // L: 158 + int var2 = this.sprite1; // L: 161 + return this.getSprite(var2); // L: 162 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(II)Lqr;", + garbageValue = "1990397357" + ) + @Export("getSprite") + SpritePixels getSprite(int var1) { + if (var1 < 0) { // L: 166 + return null; + } else { + SpritePixels var2 = (SpritePixels)WorldMapElement_cachedSprites.get((long)var1); // L: 167 + if (var2 != null) { // L: 168 + return var2; + } else { + var2 = StructComposition.SpriteBuffer_getSprite(GrandExchangeOfferWorldComparator.WorldMapElement_archive, var1, 0); // L: 169 + if (var2 != null) { // L: 170 + WorldMapElement_cachedSprites.put(var2, (long)var1); // L: 171 + } + + return var2; // L: 173 + } + } } @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II)Lqi;", - garbageValue = "-824891527" - ) - @Export("getSprite") - SpritePixels getSprite(int var1) { - if (var1 < 0) { // L: 162 - return null; - } else { - SpritePixels var2 = (SpritePixels)WorldMapElement_cachedSprites.get((long)var1); // L: 163 - if (var2 != null) { // L: 164 - return var2; - } else { - var2 = class6.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); // L: 165 - if (var2 != null) { // L: 166 - WorldMapElement_cachedSprites.put(var2, (long)var1); // L: 167 - } - - return var2; // L: 169 - } - } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1607536994" + descriptor = "(B)I", + garbageValue = "2" ) @Export("getObjectId") public int getObjectId() { - return this.objectId; // L: 173 + return this.objectId; // L: 177 } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZLjava/lang/String;ZI)V", - garbageValue = "1727118397" - ) - static void method3403(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 - } - } - - if (class29.field175.startsWith("win") && !var3) { // L: 39 40 - PendingSpawn.method2165(var0, 0, "openjs"); // L: 42 - return; // L: 44 - } - - if (class29.field175.startsWith("mac")) { // L: 47 - PendingSpawn.method2165(var0, 1, var2); // L: 48 - return; // L: 49 - } - - PendingSpawn.method2165(var0, 2, "openjs"); // L: 52 - } else { - PendingSpawn.method2165(var0, 3, "openjs"); // L: 57 - } - - } // L: 60 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-1481708201" - ) - @Export("isDigit") - public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; // L: 142 - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(IIIIIILhv;Lgv;B)V", - garbageValue = "-47" - ) - @Export("addObjects") - static final void addObjects(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: 332 333 334 - if (var0 < Tiles.Tiles_minPlane) { // L: 337 - Tiles.Tiles_minPlane = var0; - } - - ObjectComposition var8 = class146.getObjectDefinition(var3); // L: 338 - int var9; - int var10; - if (var4 != 1 && var4 != 3) { // L: 341 - var9 = var8.sizeX; // L: 346 - var10 = var8.sizeY; // L: 347 - } else { - var9 = var8.sizeY; // L: 342 - var10 = var8.sizeX; // L: 343 - } - - int var11; - int var12; - if (var9 + var1 <= 104) { // L: 353 - var11 = (var9 >> 1) + var1; // L: 354 - var12 = (var9 + 1 >> 1) + var1; // L: 355 - } else { - var11 = var1; // L: 358 - var12 = var1 + 1; // L: 359 - } - - int var13; - int var14; - if (var10 + var2 <= 104) { // L: 361 - var13 = (var10 >> 1) + var2; // L: 362 - var14 = var2 + (var10 + 1 >> 1); // L: 363 - } else { - var13 = var2; // L: 366 - var14 = var2 + 1; // L: 367 - } - - int[][] var15 = Tiles.Tiles_heights[var0]; // L: 369 - int var16 = var15[var11][var14] + var15[var12][var13] + var15[var11][var13] + var15[var12][var14] >> 2; // L: 370 - int var17 = (var1 << 7) + (var9 << 6); // L: 371 - int var18 = (var2 << 7) + (var10 << 6); // L: 372 - long var19 = GameObject.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 373 - int var21 = var5 + (var4 << 6); // L: 374 - if (var8.int3 == 1) { // L: 375 - var21 += 256; - } - - if (var8.hasSound()) { // L: 376 - class360.method6589(var0, var1, var2, var8, var4); - } - - Object var29; - if (var5 == 22) { // L: 377 - if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 378 - if (var8.animationId == -1 && var8.transforms == null) { // L: 380 - var29 = var8.getEntity(22, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 381 - } - - var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var29, var19, var21); // L: 382 - if (var8.interactType == 1 && var7 != null) { // L: 383 - var7.setBlockedByFloorDec(var1, var2); - } - - } - } else { - int var28; - if (var5 != 10 && var5 != 11) { // L: 386 - int[] var10000; - if (var5 >= 12) { // L: 407 - if (var8.animationId == -1 && var8.transforms == null) { // L: 409 - var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 410 - } - - var6.method4882(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); // L: 411 - if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 412 - var10000 = class420.field4545[var0][var1]; - var10000[var2] |= 2340; - } - - if (var8.interactType != 0 && var7 != null) { // L: 413 - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } else if (var5 == 0) { // L: 416 - if (var8.animationId == -1 && var8.transforms == null) { // L: 418 - var29 = var8.getEntity(0, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 419 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field990[var4], 0, var19, var21); // L: 420 - if (var4 == 0) { // L: 421 - if (var8.clipped) { // L: 422 - class392.field4374[var0][var1][var2] = 50; // L: 423 - class392.field4374[var0][var1][var2 + 1] = 50; // L: 424 - } - - if (var8.modelClipped) { // L: 426 - var10000 = class420.field4545[var0][var1]; - var10000[var2] |= 585; - } - } else if (var4 == 1) { // L: 428 - if (var8.clipped) { // L: 429 - class392.field4374[var0][var1][var2 + 1] = 50; // L: 430 - class392.field4374[var0][var1 + 1][var2 + 1] = 50; // L: 431 - } - - if (var8.modelClipped) { // L: 433 - var10000 = class420.field4545[var0][var1]; - var10000[1 + var2] |= 1170; - } - } else if (var4 == 2) { // L: 435 - if (var8.clipped) { // L: 436 - class392.field4374[var0][var1 + 1][var2] = 50; // L: 437 - class392.field4374[var0][var1 + 1][var2 + 1] = 50; // L: 438 - } - - if (var8.modelClipped) { // L: 440 - var10000 = class420.field4545[var0][var1 + 1]; - var10000[var2] |= 585; - } - } else if (var4 == 3) { // L: 442 - if (var8.clipped) { // L: 443 - class392.field4374[var0][var1][var2] = 50; // L: 444 - class392.field4374[var0][var1 + 1][var2] = 50; // L: 445 - } - - if (var8.modelClipped) { // L: 447 - var10000 = class420.field4545[var0][var1]; - var10000[var2] |= 1170; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 449 - var7.method3872(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { // L: 450 - var6.method4748(var0, var1, var2, var8.int2); - } - - } else if (var5 == 1) { // L: 453 - if (var8.animationId == -1 && var8.transforms == null) { // L: 455 - var29 = var8.getEntity(1, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 456 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field989[var4], 0, var19, var21); // L: 457 - if (var8.clipped) { // L: 458 - if (var4 == 0) { // L: 459 - class392.field4374[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { // L: 460 - class392.field4374[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { // L: 461 - class392.field4374[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { // L: 462 - class392.field4374[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 464 - var7.method3872(var1, var2, var5, var4, var8.boolean1); - } - - } else { - int var22; - if (var5 == 2) { // L: 467 - var22 = var4 + 1 & 3; // L: 468 - Object var24; - Object var30; - if (var8.animationId == -1 && var8.transforms == null) { // L: 471 - var30 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 472 - var24 = var8.getEntity(2, var22, var15, var17, var16, var18); // L: 473 - } else { - var30 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 476 - var24 = new DynamicObject(var3, 2, var22, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 477 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var30, (Renderable)var24, Tiles.field990[var4], Tiles.field990[var22], var19, var21); // L: 479 - if (var8.modelClipped) { // L: 480 - if (var4 == 0) { // L: 481 - var10000 = class420.field4545[var0][var1]; // L: 482 - var10000[var2] |= 585; - var10000 = class420.field4545[var0][var1]; // L: 483 - var10000[1 + var2] |= 1170; - } else if (var4 == 1) { // L: 485 - var10000 = class420.field4545[var0][var1]; // L: 486 - var10000[1 + var2] |= 1170; - var10000 = class420.field4545[var0][var1 + 1]; // L: 487 - var10000[var2] |= 585; - } else if (var4 == 2) { // L: 489 - var10000 = class420.field4545[var0][var1 + 1]; // L: 490 - var10000[var2] |= 585; - var10000 = class420.field4545[var0][var1]; // L: 491 - var10000[var2] |= 1170; - } else if (var4 == 3) { // L: 493 - var10000 = class420.field4545[var0][var1]; // L: 494 - var10000[var2] |= 1170; - var10000 = class420.field4545[var0][var1]; // L: 495 - var10000[var2] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 498 - var7.method3872(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { // L: 499 - var6.method4748(var0, var1, var2, var8.int2); - } - - } else if (var5 == 3) { // L: 502 - if (var8.animationId == -1 && var8.transforms == null) { // L: 504 - var29 = var8.getEntity(3, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 505 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field989[var4], 0, var19, var21); // L: 506 - if (var8.clipped) { // L: 507 - if (var4 == 0) { // L: 508 - class392.field4374[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { // L: 509 - class392.field4374[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { // L: 510 - class392.field4374[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { // L: 511 - class392.field4374[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 513 - var7.method3872(var1, var2, var5, var4, var8.boolean1); - } - - } else if (var5 == 9) { // L: 516 - if (var8.animationId == -1 && var8.transforms == null) { // L: 518 - var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 519 - } - - var6.method4882(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); // L: 520 - if (var8.interactType != 0 && var7 != null) { // L: 521 - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - if (var8.int2 != 16) { // L: 522 - var6.method4748(var0, var1, var2, var8.int2); - } - - } else if (var5 == 4) { // L: 525 - if (var8.animationId == -1 && var8.transforms == null) { // L: 527 - var29 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 528 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field990[var4], 0, 0, 0, var19, var21); // L: 529 - } else { - long var23; - Object var25; - if (var5 == 5) { // L: 532 - var22 = 16; // L: 533 - var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 534 - if (0L != var23) { // L: 535 - var22 = class146.getObjectDefinition(FileSystem.Entity_unpackID(var23)).int2; - } - - if (var8.animationId == -1 && var8.transforms == null) { // L: 537 - var25 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 538 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field990[var4], 0, var22 * Tiles.field992[var4], var22 * Tiles.field993[var4], var19, var21); // L: 539 - } else if (var5 == 6) { // L: 542 - var22 = 8; // L: 543 - var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 544 - if (var23 != 0L) { // L: 545 - var22 = class146.getObjectDefinition(FileSystem.Entity_unpackID(var23)).int2 / 2; - } - - if (var8.animationId == -1 && var8.transforms == null) { // L: 547 - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 548 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var22 * Tiles.field997[var4], var22 * Tiles.field995[var4], var19, var21); // L: 549 - } else if (var5 == 7) { // L: 552 - var28 = var4 + 2 & 3; // L: 554 - if (var8.animationId == -1 && var8.transforms == null) { // L: 555 - var29 = var8.getEntity(4, var28 + 4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 4, var28 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 556 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, 256, var28, 0, 0, var19, var21); // L: 557 - } else if (var5 == 8) { // L: 560 - var22 = 8; // L: 561 - var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 562 - if (0L != var23) { // L: 563 - var22 = class146.getObjectDefinition(FileSystem.Entity_unpackID(var23)).int2 / 2; - } - - int var27 = var4 + 2 & 3; // L: 566 - Object var26; - if (var8.animationId == -1 && var8.transforms == null) { // L: 567 - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 568 - var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 569 - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 572 - var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 573 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var22 * Tiles.field997[var4], var22 * Tiles.field995[var4], var19, var21); // L: 575 - } - } - } - } else { - if (var8.animationId == -1 && var8.transforms == null) { // L: 388 - var29 = var8.getEntity(10, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 389 - } - - if (var29 != null && var6.method4882(var0, var1, var2, var16, var9, var10, (Renderable)var29, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 390 391 - var28 = 15; // L: 392 - if (var29 instanceof Model) { // L: 393 - var28 = ((Model)var29).method5014() / 4; // L: 394 - if (var28 > 30) { // L: 395 - var28 = 30; - } - } - - for (int var31 = 0; var31 <= var9; ++var31) { // L: 397 - for (int var32 = 0; var32 <= var10; ++var32) { // L: 398 - if (var28 > class392.field4374[var0][var31 + var1][var32 + var2]) { // L: 399 - class392.field4374[var0][var31 + var1][var32 + var2] = (byte)var28; - } - } - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 404 - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } - } - } - } // L: 384 405 414 451 465 500 514 523 530 540 550 558 576 578 - - @ObfuscatedName("lw") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-62" - ) - @Export("Clan_joinChat") - static final void Clan_joinChat(String var0) { - if (!var0.equals("")) { // L: 12393 - PacketBufferNode var1 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2986, Client.packetWriter.isaacCipher); // L: 12395 - var1.packetBuffer.writeByte(class425.stringCp1252NullTerminatedByteSize(var0)); // L: 12396 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 12397 - Client.packetWriter.addNode(var1); // L: 12398 - } - } // L: 12399 } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index c6e6a0718b..467953d5f8 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -4,52 +4,422 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hh") +@ObfuscatedName("it") @Implements("WorldMapEvent") public class WorldMapEvent { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 205058023 + intValue = 1384072805 ) @Export("mapElement") public int mapElement; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lks;" + descriptor = "Lkd;" ) @Export("coord1") public Coord coord1; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lks;" + descriptor = "Lkd;" ) @Export("coord2") public Coord coord2; @ObfuscatedSignature( - descriptor = "(ILks;Lks;)V" + descriptor = "(ILkd;Lkd;)V" ) public WorldMapEvent(int var1, Coord var2, Coord var3) { - this.mapElement = var1; // L: 11 - this.coord1 = var2; // L: 12 + this.mapElement = var1; + this.coord1 = var2; this.coord2 = var3; // L: 13 } // L: 14 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lln;I)V", - garbageValue = "-1383377565" + descriptor = "(ILjava/lang/String;Ljava/lang/String;B)V", + garbageValue = "-2" ) - public static void method4506(AbstractArchive var0) { - InvDefinition.InvDefinition_archive = var0; // L: 17 - } // L: 18 + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { + UserComparator7.addChatMessage(var0, var1, var2, (String)null); // L: 19 + } // L: 20 - @ObfuscatedName("b") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-615981815" + descriptor = "([BZI)Ljava/lang/Object;", + garbageValue = "-2126153906" ) - public static boolean method4505(int var0) { - return var0 == WorldMapDecorationType.field3519.id; // L: 46 + public static Object method4929(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: 16 + } } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(B)[Lqw;", + garbageValue = "-27" + ) + @Export("FillMode_values") + public static FillMode[] FillMode_values() { + return new FillMode[]{FillMode.field4753, FillMode.field4754, FillMode.SOLID}; // L: 15 + } + + @ObfuscatedName("hg") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "-1670571059" + ) + @Export("drawObject") + static final void drawObject(int var0, int var1, int var2, int var3, int var4) { + long var5 = class175.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5990 + int var7; + int var8; + int var9; + int var10; + int var12; + int var13; + if (0L != var5) { // L: 5991 + var7 = class175.scene.getObjectFlags(var0, var1, var2, var5); // L: 5992 + var8 = var7 >> 6 & 3; // L: 5993 + var9 = var7 & 31; // L: 5994 + var10 = var3; // L: 5995 + if (LoginPacket.method5022(var5)) { // L: 5996 + var10 = var4; + } + + int[] var11 = InterfaceParent.sceneMinimapSprite.pixels; // L: 5997 + var12 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5998 + var13 = NetSocket.Entity_unpackID(var5); // L: 5999 + ObjectComposition var14 = class82.getObjectDefinition(var13); // L: 6000 + if (var14.mapSceneId != -1) { // L: 6001 + IndexedSprite var15 = class29.mapSceneSprites[var14.mapSceneId]; // L: 6002 + if (var15 != null) { // L: 6003 + int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; // L: 6004 + int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; // L: 6005 + var15.drawAt(var1 * 4 + var16 + 48, (104 - var2 - var14.sizeY) * 4 + var17 + 48); // L: 6006 + } + } else { + if (var9 == 0 || var9 == 2) { // L: 6010 + if (var8 == 0) { // L: 6011 + var11[var12] = var10; // L: 6012 + var11[var12 + 512] = var10; // L: 6013 + var11[var12 + 1024] = var10; // L: 6014 + var11[var12 + 1536] = var10; // L: 6015 + } else if (var8 == 1) { // L: 6017 + var11[var12] = var10; // L: 6018 + var11[var12 + 1] = var10; // L: 6019 + var11[var12 + 2] = var10; // L: 6020 + var11[var12 + 3] = var10; // L: 6021 + } else if (var8 == 2) { // L: 6023 + var11[var12 + 3] = var10; // L: 6024 + var11[var12 + 512 + 3] = var10; // L: 6025 + var11[var12 + 1024 + 3] = var10; // L: 6026 + var11[var12 + 1536 + 3] = var10; // L: 6027 + } else if (var8 == 3) { // L: 6029 + var11[var12 + 1536] = var10; // L: 6030 + var11[var12 + 1536 + 1] = var10; // L: 6031 + var11[var12 + 1536 + 2] = var10; // L: 6032 + var11[var12 + 1536 + 3] = var10; // L: 6033 + } + } + + if (var9 == 3) { // L: 6036 + if (var8 == 0) { // L: 6037 + var11[var12] = var10; + } else if (var8 == 1) { // L: 6038 + var11[var12 + 3] = var10; + } else if (var8 == 2) { // L: 6039 + var11[var12 + 1536 + 3] = var10; + } else if (var8 == 3) { // L: 6040 + var11[var12 + 1536] = var10; + } + } + + if (var9 == 2) { // L: 6042 + if (var8 == 3) { // L: 6043 + var11[var12] = var10; // L: 6044 + var11[var12 + 512] = var10; // L: 6045 + var11[var12 + 1024] = var10; // L: 6046 + var11[var12 + 1536] = var10; // L: 6047 + } else if (var8 == 0) { // L: 6049 + var11[var12] = var10; // L: 6050 + var11[var12 + 1] = var10; // L: 6051 + var11[var12 + 2] = var10; // L: 6052 + var11[var12 + 3] = var10; // L: 6053 + } else if (var8 == 1) { // L: 6055 + var11[var12 + 3] = var10; // L: 6056 + var11[var12 + 512 + 3] = var10; // L: 6057 + var11[var12 + 1024 + 3] = var10; // L: 6058 + var11[var12 + 1536 + 3] = var10; // L: 6059 + } else if (var8 == 2) { // L: 6061 + var11[var12 + 1536] = var10; // L: 6062 + var11[var12 + 1536 + 1] = var10; // L: 6063 + var11[var12 + 1536 + 2] = var10; // L: 6064 + var11[var12 + 1536 + 3] = var10; // L: 6065 + } + } + } + } + + var5 = class175.scene.getGameObjectTag(var0, var1, var2); // L: 6070 + if (var5 != 0L) { // L: 6071 + var7 = class175.scene.getObjectFlags(var0, var1, var2, var5); // L: 6072 + var8 = var7 >> 6 & 3; // L: 6073 + var9 = var7 & 31; // L: 6074 + var10 = NetSocket.Entity_unpackID(var5); // L: 6075 + ObjectComposition var24 = class82.getObjectDefinition(var10); // L: 6076 + int var19; + if (var24.mapSceneId != -1) { // L: 6077 + IndexedSprite var20 = class29.mapSceneSprites[var24.mapSceneId]; // L: 6078 + if (var20 != null) { // L: 6079 + var13 = (var24.sizeX * 4 - var20.subWidth) / 2; // L: 6080 + var19 = (var24.sizeY * 4 - var20.subHeight) / 2; // L: 6081 + var20.drawAt(var13 + var1 * 4 + 48, var19 + (104 - var2 - var24.sizeY) * 4 + 48); // L: 6082 + } + } else if (var9 == 9) { // L: 6085 + var12 = 15658734; // L: 6086 + if (LoginPacket.method5022(var5)) { // L: 6087 + var12 = 15597568; + } + + int[] var18 = InterfaceParent.sceneMinimapSprite.pixels; // L: 6088 + var19 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 6089 + if (var8 != 0 && var8 != 2) { // L: 6090 + var18[var19] = var12; // L: 6097 + var18[var19 + 1 + 512] = var12; // L: 6098 + var18[var19 + 1024 + 2] = var12; // L: 6099 + var18[var19 + 1536 + 3] = var12; // L: 6100 + } else { + var18[var19 + 1536] = var12; // L: 6091 + var18[var19 + 1 + 1024] = var12; // L: 6092 + var18[var19 + 512 + 2] = var12; // L: 6093 + var18[var19 + 3] = var12; // L: 6094 + } + } + } + + var5 = class175.scene.getFloorDecorationTag(var0, var1, var2); // L: 6104 + if (var5 != 0L) { // L: 6105 + var7 = NetSocket.Entity_unpackID(var5); // L: 6106 + ObjectComposition var21 = class82.getObjectDefinition(var7); // L: 6107 + if (var21.mapSceneId != -1) { // L: 6108 + IndexedSprite var22 = class29.mapSceneSprites[var21.mapSceneId]; // L: 6109 + if (var22 != null) { // L: 6110 + var10 = (var21.sizeX * 4 - var22.subWidth) / 2; // L: 6111 + int var23 = (var21.sizeY * 4 - var22.subHeight) / 2; // L: 6112 + var22.drawAt(var1 * 4 + var10 + 48, (104 - var2 - var21.sizeY) * 4 + var23 + 48); // L: 6113 + } + } + } + + } // L: 6117 + + @ObfuscatedName("ic") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "1650699748" + ) + @Export("addSceneMenuOptions") + static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 9925 + Projectile.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 9926 + } + + long var4 = -1L; // L: 9929 + long var6 = -1L; // L: 9930 + + int var8; + for (var8 = 0; var8 < class114.method2637(); ++var8) { // L: 9931 + long var23 = class132.method2833(var8); // L: 9932 + if (var6 != var23) { // L: 9933 + var6 = var23; // L: 9934 + int var11 = class17.method236(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 9937 + int var12 = var11; // L: 9939 + int var13 = ClanChannelMember.method2819(var8); // L: 9940 + int var14 = GrandExchangeOfferNameComparator.method5790(var8); // L: 9941 + int var15 = NetSocket.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 9944 + int var16 = var15; // L: 9946 + if (var14 == 2 && class175.scene.getObjectFlags(class128.Client_plane, var11, var13, var23) >= 0) { // L: 9947 9948 + ObjectComposition var17 = class82.getObjectDefinition(var15); // L: 9949 + if (var17.transforms != null) { // L: 9950 + var17 = var17.transform(); + } + + if (var17 == null) { // L: 9951 + continue; + } + + if (Client.isItemSelected == 1) { // L: 9952 + Projectile.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class166.colorStartTag(65535) + var17.name, 1, var15, var11, var13); // L: 9953 + } else if (Client.isSpellSelected) { // L: 9956 + if ((class113.selectedSpellFlags & 4) == 4) { // L: 9957 + Projectile.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class166.colorStartTag(65535) + var17.name, 2, var15, var11, var13); // L: 9958 + } + } else { + String[] var18 = var17.actions; // L: 9963 + if (var18 != null) { // L: 9964 + for (int var19 = 4; var19 >= 0; --var19) { // L: 9965 + if (var18[var19] != null) { // L: 9966 + short var20 = 0; // L: 9967 + if (var19 == 0) { // L: 9968 + var20 = 3; + } + + if (var19 == 1) { // L: 9969 + var20 = 4; + } + + if (var19 == 2) { // L: 9970 + var20 = 5; + } + + if (var19 == 3) { // L: 9971 + var20 = 6; + } + + if (var19 == 4) { // L: 9972 + var20 = 1001; + } + + Projectile.insertMenuItemNoShift(var18[var19], class166.colorStartTag(65535) + var17.name, var20, var16, var12, var13); // L: 9973 + } + } + } + + Projectile.insertMenuItemNoShift("Examine", class166.colorStartTag(65535) + var17.name, 1002, var17.id, var12, var13); // L: 9978 + } + } + + Player var21; + int var25; + NPC var26; + int var33; + int[] var34; + if (var14 == 1) { // L: 9983 + NPC var29 = Client.npcs[var16]; // L: 9984 + if (var29 == null) { // L: 9985 + continue; + } + + if (var29.definition.size == 1 && (var29.x & 127) == 64 && (var29.y & 127) == 64) { // L: 9986 + for (var25 = 0; var25 < Client.npcCount; ++var25) { // L: 9987 + var26 = Client.npcs[Client.npcIndices[var25]]; // L: 9988 + if (var26 != null && var26 != var29 && var26.definition.size == 1 && var26.x == var29.x && var26.y == var29.y) { // L: 9989 + WorldMapLabelSize.addNpcToMenu(var26, Client.npcIndices[var25], var12, var13); + } + } + + var25 = Players.Players_count; // L: 9991 + var34 = Players.Players_indices; // L: 9992 + + for (var33 = 0; var33 < var25; ++var33) { // L: 9993 + var21 = Client.players[var34[var33]]; // L: 9994 + if (var21 != null && var29.x == var21.x && var29.y == var21.y) { // L: 9995 + ApproximateRouteStrategy.addPlayerToMenu(var21, var34[var33], var12, var13); + } + } + } + + WorldMapLabelSize.addNpcToMenu(var29, var16, var12, var13); // L: 9998 + } + + if (var14 == 0) { // L: 10000 + Player var30 = Client.players[var16]; // L: 10001 + if (var30 == null) { // L: 10002 + continue; + } + + if ((var30.x & 127) == 64 && (var30.y & 127) == 64) { // L: 10003 + for (var25 = 0; var25 < Client.npcCount; ++var25) { // L: 10004 + var26 = Client.npcs[Client.npcIndices[var25]]; // L: 10005 + if (var26 != null && var26.definition.size == 1 && var26.x == var30.x && var30.y == var26.y) { // L: 10006 + WorldMapLabelSize.addNpcToMenu(var26, Client.npcIndices[var25], var12, var13); + } + } + + var25 = Players.Players_count; // L: 10008 + var34 = Players.Players_indices; // L: 10009 + + for (var33 = 0; var33 < var25; ++var33) { // L: 10010 + var21 = Client.players[var34[var33]]; // L: 10011 + if (var21 != null && var21 != var30 && var21.x == var30.x && var30.y == var21.y) { // L: 10012 + ApproximateRouteStrategy.addPlayerToMenu(var21, var34[var33], var12, var13); + } + } + } + + if (var16 != Client.combatTargetPlayerIndex) { // L: 10015 + ApproximateRouteStrategy.addPlayerToMenu(var30, var16, var12, var13); + } else { + var4 = var23; // L: 10016 + } + } + + if (var14 == 3) { // L: 10018 + NodeDeque var32 = Client.groundItems[class128.Client_plane][var12][var13]; // L: 10019 + if (var32 != null) { // L: 10020 + for (TileItem var31 = (TileItem)var32.first(); var31 != null; var31 = (TileItem)var32.next()) { // L: 10021 10022 10055 + ItemComposition var35 = FileSystem.ItemDefinition_get(var31.id); // L: 10023 + if (Client.isItemSelected == 1) { // L: 10024 + Projectile.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class166.colorStartTag(16748608) + var35.name, 16, var31.id, var12, var13); // L: 10025 + } else if (Client.isSpellSelected) { // L: 10028 + if ((class113.selectedSpellFlags & 1) == 1) { // L: 10029 + Projectile.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class166.colorStartTag(16748608) + var35.name, 17, var31.id, var12, var13); // L: 10030 + } + } else { + String[] var27 = var35.groundActions; // L: 10035 + + for (int var28 = 4; var28 >= 0; --var28) { // L: 10036 + if (var27 != null && var27[var28] != null) { // L: 10037 + byte var22 = 0; // L: 10038 + if (var28 == 0) { // L: 10039 + var22 = 18; + } + + if (var28 == 1) { // L: 10040 + var22 = 19; + } + + if (var28 == 2) { // L: 10041 + var22 = 20; + } + + if (var28 == 3) { // L: 10042 + var22 = 21; + } + + if (var28 == 4) { // L: 10043 + var22 = 22; + } + + Projectile.insertMenuItemNoShift(var27[var28], class166.colorStartTag(16748608) + var35.name, var22, var31.id, var12, var13); // L: 10044 + } else if (var28 == 2) { // L: 10047 + Projectile.insertMenuItemNoShift("Take", class166.colorStartTag(16748608) + var35.name, 20, var31.id, var12, var13); // L: 10048 + } + } + + Projectile.insertMenuItemNoShift("Examine", class166.colorStartTag(16748608) + var35.name, 1004, var31.id, var12, var13); // L: 10052 + } + } + } + } + } + } + + if (-1L != var4) { // L: 10060 + var8 = class17.method236(var4); // L: 10061 + int var9 = ScriptEvent.method2085(var4); // L: 10062 + Player var10 = Client.players[Client.combatTargetPlayerIndex]; // L: 10063 + ApproximateRouteStrategy.addPlayerToMenu(var10, Client.combatTargetPlayerIndex, var8, var9); // L: 10064 + } + + } // L: 10066 } diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index f2d4f033d4..f17d20914b 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -4,83 +4,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hm") +@ObfuscatedName("ik") @Implements("WorldMapID") public class WorldMapID { - @ObfuscatedName("ua") - @ObfuscatedGetter( - longValue = -1968541600004373947L - ) - static long field2388; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhm;" + descriptor = "Lik;" ) - static final WorldMapID field2383; - @ObfuscatedName("c") + static final WorldMapID field2879; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lhm;" + descriptor = "Lik;" ) - static final WorldMapID field2387; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lky;" - ) - @Export("scriptDotWidget") - static Widget scriptDotWidget; - @ObfuscatedName("bd") + static final WorldMapID field2877; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1523273113 - ) - static int field2386; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 171627445 + intValue = 923674533 ) @Export("value") final int value; static { - field2383 = new WorldMapID(0); // L: 4 - field2387 = new WorldMapID(1); // L: 5 + field2879 = new WorldMapID(0); // L: 4 + field2877 = new WorldMapID(1); // L: 5 } WorldMapID(int var1) { this.value = var1; } // L: 10 - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1758610928" - ) - @Export("Widget_unpackTargetMask") - public static int Widget_unpackTargetMask(int var0) { - return var0 >> 11 & 63; // L: 9 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-670115477" - ) - public static boolean method4360() { - ReflectionCheck var0 = (ReflectionCheck)class54.reflectionChecks.last(); // L: 28 - return var0 != null; // L: 29 - } - - @ObfuscatedName("fn") - @ObfuscatedSignature( - descriptor = "(IZZZB)Llx;", - garbageValue = "-70" - ) - @Export("newArchive") - static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { - ArchiveDisk var4 = null; // L: 1972 - if (JagexCache.JagexCache_dat2File != null) { // L: 1973 - var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, class115.JagexCache_idxFiles[var0], 1000000); - } - - return new Archive(var4, class182.masterDisk, var0, var1, var2, var3); // L: 1974 + @ObfuscatedName("o") + public static double method4811(double var0) { + return Math.exp(-var0 * var0 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 9 } } diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index a1a6669c09..ba93d519ae 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -4,44 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gr") +@ObfuscatedName("hs") @Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { - @ObfuscatedName("r") - public static short[] field2300; - @ObfuscatedName("v") + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lli;" + ) + @Export("NetCache_currentResponse") + public static NetFileRequest NetCache_currentResponse; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -500474045 + intValue = -956371221 ) @Export("element") final int element; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lip;" ) @Export("label") final WorldMapLabel label; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1264890287 + intValue = 2031981367 ) @Export("subWidth") final int subWidth; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1575477647 + intValue = -1919685021 ) @Export("subHeight") final int subHeight; @ObfuscatedSignature( - descriptor = "(Lks;Lks;ILho;)V" + descriptor = "(Lkd;Lkd;ILip;)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 = UserComparator7.WorldMapElement_get(this.getElement()); // L: 17 + WorldMapElement var5 = class120.WorldMapElement_get(this.getElement()); // L: 17 SpritePixels var6 = var5.getSpriteBool(false); // L: 18 if (var6 != null) { // L: 19 this.subWidth = var6.subWidth; // L: 20 @@ -53,43 +57,67 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { } // L: 27 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "364835409" + descriptor = "(B)I", + garbageValue = "16" ) @Export("getElement") public int getElement() { - return this.element; // L: 30 + return this.element; // L: 31 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)Lho;", - garbageValue = "-32" + descriptor = "(I)Lip;", + garbageValue = "1420245554" ) @Export("getLabel") WorldMapLabel getLabel() { - return this.label; // L: 34 + return this.label; // L: 36 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-915724910" + descriptor = "(B)I", + garbageValue = "102" ) @Export("getSubWidth") int getSubWidth() { - return this.subWidth; // L: 38 + return this.subWidth; // L: 41 } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1982860019" + garbageValue = "-1663406998" ) @Export("getSubHeight") int getSubHeight() { - return this.subHeight; // L: 42 + return this.subHeight; // L: 46 } + + @ObfuscatedName("gj") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1424752711" + ) + @Export("playSong") + static void playSong(int var0) { + if (var0 == -1 && !Client.playingJingle) { // L: 3800 + ApproximateRouteStrategy.method1110(); // L: 3801 + } else if (var0 != -1 && var0 != Client.currentTrackGroupId && class12.clientPreferences.method2248() != 0 && !Client.playingJingle) { // L: 3803 + Archive var1 = AbstractUserComparator.archive6; // L: 3804 + int var2 = class12.clientPreferences.method2248(); // L: 3805 + class273.musicPlayerStatus = 1; // L: 3807 + ClanChannelMember.musicTrackArchive = var1; // L: 3808 + StructComposition.musicTrackGroupId = var0; // L: 3809 + FriendsList.musicTrackFileId = 0; // L: 3810 + Clock.musicTrackVolume = var2; // L: 3811 + VertexNormal.musicTrackBoolean = false; // L: 3812 + GrandExchangeEvent.pcmSampleLength = 2; // L: 3813 + } + + Client.currentTrackGroupId = var0; // L: 3816 + } // L: 3817 } diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index 530c0f0987..192c44fdcf 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -4,48 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gy") +@ObfuscatedName("hb") @Implements("WorldMapIcon_1") public class WorldMapIcon_1 extends AbstractWorldMapIcon { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1439678685 + intValue = 51181617 ) @Export("objectDefId") final int objectDefId; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lhd;" ) @Export("region") final WorldMapRegion region; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1837597233 + intValue = -351714887 ) @Export("element") int element; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lip;" ) @Export("label") WorldMapLabel label; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 129612535 + intValue = 1557282329 ) @Export("subWidth") int subWidth; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 325263315 + intValue = 1198695651 ) @Export("subHeight") int subHeight; @ObfuscatedSignature( - descriptor = "(Lks;Lks;ILgd;)V" + descriptor = "(Lkd;Lkd;ILhd;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { super(var1, var2); // L: 17 @@ -54,16 +54,16 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { this.init(); // L: 20 } // L: 21 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1679326087" + garbageValue = "-760266737" ) @Export("init") void init() { - this.element = class146.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24 - this.label = this.region.createMapLabel(UserComparator7.WorldMapElement_get(this.element)); // L: 25 - WorldMapElement var1 = UserComparator7.WorldMapElement_get(this.getElement()); // L: 26 + this.element = class82.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24 + this.label = this.region.createMapLabel(class120.WorldMapElement_get(this.element)); // L: 25 + WorldMapElement var1 = class120.WorldMapElement_get(this.getElement()); // L: 26 SpritePixels var2 = var1.getSpriteBool(false); // L: 27 if (var2 != null) { // L: 28 this.subWidth = var2.subWidth; // L: 29 @@ -75,64 +75,43 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { } // L: 36 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "364835409" + descriptor = "(B)I", + garbageValue = "16" ) @Export("getElement") public int getElement() { - return this.element; // L: 39 + return this.element; // L: 40 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)Lho;", - garbageValue = "-32" + descriptor = "(I)Lip;", + garbageValue = "1420245554" ) @Export("getLabel") WorldMapLabel getLabel() { - return this.label; // L: 43 + return this.label; // L: 45 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-915724910" + descriptor = "(B)I", + garbageValue = "102" ) @Export("getSubWidth") int getSubWidth() { - return this.subWidth; // L: 47 + return this.subWidth; // L: 50 } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1982860019" + garbageValue = "-1663406998" ) @Export("getSubHeight") int getSubHeight() { - return this.subHeight; // L: 51 - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Lpi;IB)Ljava/lang/String;", - garbageValue = "50" - ) - static String method3933(Buffer var0, int var1) { - try { - int var2 = var0.readUShortSmart(); // L: 65 - if (var2 > var1) { // L: 66 - var2 = var1; - } - - byte[] var3 = new byte[var2]; // L: 67 - var0.offset += class282.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 68 - String var4 = class118.decodeStringCp1252(var3, 0, var2); // L: 69 - return var4; // L: 70 - } catch (Exception var6) { // L: 72 - return "Cabbage"; // L: 73 - } + return this.subHeight; // L: 55 } } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index 28d3342ccd..8de7d12f32 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -1,38 +1,36 @@ -import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ho") +@ObfuscatedName("ip") @Implements("WorldMapLabel") public class WorldMapLabel { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("text") String text; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -748694571 + intValue = -233966441 ) @Export("width") int width; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 703588799 + intValue = -606142323 ) @Export("height") int height; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Lhw;" ) @Export("size") WorldMapLabelSize size; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IILgp;)V" + descriptor = "(Ljava/lang/String;IILhw;)V" ) WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) { this.text = var1; // L: 10 @@ -40,373 +38,4 @@ public class WorldMapLabel { this.height = var3; // L: 12 this.size = var4; // L: 13 } // L: 14 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)Lfq;", - garbageValue = "-1327829114" - ) - @Export("KitDefinition_get") - public static KitDefinition KitDefinition_get(int var0) { - KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); // L: 27 - if (var1 != null) { // L: 28 - return var1; - } else { - byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); // L: 29 - var1 = new KitDefinition(); // L: 30 - if (var2 != null) { // L: 31 - var1.decode(new Buffer(var2)); - } - - KitDefinition.KitDefinition_cached.put(var1, (long)var0); // L: 32 - return var1; // L: 33 - } - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-1060633923" - ) - static int method4354(int var0, Script var1, boolean var2) { - String var3; - int var9; - if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 3267 - var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3268 - var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3269 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3 + var9; // L: 3270 - return 1; // L: 3271 - } else { - String var4; - if (var0 == ScriptOpcodes.APPEND) { // L: 3273 - class122.Interpreter_stringStackSize -= 2; // L: 3274 - var3 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize]; // L: 3275 - var4 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize + 1]; // L: 3276 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3 + var4; // L: 3277 - return 1; // L: 3278 - } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 3280 - var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3281 - var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3282 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3 + ItemLayer.intToString(var9, true); // L: 3283 - return 1; // L: 3284 - } else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 3286 - var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3287 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 3288 - return 1; // L: 3289 - } else { - int var6; - int var10; - if (var0 == ScriptOpcodes.FROMDATE) { // L: 3291 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3292 - long var13 = (11745L + (long)var10) * 86400000L; // L: 3293 - Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 3294 - var6 = Interpreter.Interpreter_calendar.get(5); // L: 3295 - int var17 = Interpreter.Interpreter_calendar.get(2); // L: 3296 - int var8 = Interpreter.Interpreter_calendar.get(1); // L: 3297 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 3298 - return 1; // L: 3299 - } else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 3301 - if (var0 == ScriptOpcodes.TOSTRING) { // L: 3309 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3310 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 3311 - return 1; // L: 3312 - } else if (var0 == ScriptOpcodes.COMPARE) { // L: 3314 - class122.Interpreter_stringStackSize -= 2; // L: 3315 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanChannelMember.method2869(PlayerType.compareStrings(Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize + 1], Skills.clientLanguage)); // L: 3316 - return 1; // L: 3317 - } else { - int var5; - byte[] var11; - Font var12; - if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 3319 - var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3320 - Interpreter.Interpreter_intStackSize -= 2; // L: 3321 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3322 - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3323 - var11 = class166.archive13.takeFile(var5, 0); // L: 3324 - var12 = new Font(var11); // L: 3325 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 3326 - return 1; // L: 3327 - } else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 3329 - var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3330 - Interpreter.Interpreter_intStackSize -= 2; // L: 3331 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3332 - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3333 - var11 = class166.archive13.takeFile(var5, 0); // L: 3334 - var12 = new Font(var11); // L: 3335 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 3336 - return 1; // L: 3337 - } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 3339 - class122.Interpreter_stringStackSize -= 2; // L: 3340 - var3 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize]; // L: 3341 - var4 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize + 1]; // L: 3342 - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 3343 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3; - } else { - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4; // L: 3344 - } - - return 1; // L: 3345 - } else if (var0 == ScriptOpcodes.ESCAPE) { // L: 3347 - var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3348 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 3349 - return 1; // L: 3350 - } else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 3352 - var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3353 - var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3354 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 3355 - return 1; // L: 3356 - } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 3358 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3359 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClientPreferences.isCharPrintable((char)var10) ? 1 : 0; // L: 3360 - return 1; // L: 3361 - } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 3363 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3364 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class131.isAlphaNumeric((char)var10) ? 1 : 0; // L: 3365 - return 1; // L: 3366 - } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 3368 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3369 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SoundSystem.isCharAlphabetic((char)var10) ? 1 : 0; // L: 3370 - return 1; // L: 3371 - } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 3373 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3374 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapElement.isDigit((char)var10) ? 1 : 0; // L: 3375 - return 1; // L: 3376 - } else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 3378 - var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3379 - if (var3 != null) { // L: 3380 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.length(); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3381 - } - - return 1; // L: 3382 - } else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 3384 - var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3385 - Interpreter.Interpreter_intStackSize -= 2; // L: 3386 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3387 - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3388 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 3389 - return 1; // L: 3390 - } else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 3392 - var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3393 - StringBuilder var15 = new StringBuilder(var3.length()); // L: 3394 - boolean var16 = false; // L: 3395 - - for (var6 = 0; var6 < var3.length(); ++var6) { // L: 3396 - char var7 = var3.charAt(var6); // L: 3397 - if (var7 == '<') { // L: 3398 - var16 = true; - } else if (var7 == '>') { // L: 3399 - var16 = false; - } else if (!var16) { // L: 3400 - var15.append(var7); - } - } - - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var15.toString(); // L: 3402 - return 1; // L: 3403 - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 3405 - var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3406 - var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3407 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 3408 - return 1; // L: 3409 - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 3411 - class122.Interpreter_stringStackSize -= 2; // L: 3412 - var3 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize]; // L: 3413 - var4 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize + 1]; // L: 3414 - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3415 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 3416 - return 1; // L: 3417 - } else if (var0 == 4122) { // L: 3419 - var3 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3420 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 3421 - return 1; // L: 3422 - } else { - return 2; // L: 3424 - } - } - } else { - class122.Interpreter_stringStackSize -= 2; // L: 3302 - var3 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize]; // L: 3303 - var4 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize + 1]; // L: 3304 - if (GrandExchangeEvents.localPlayer.appearance != null && GrandExchangeEvents.localPlayer.appearance.isFemale) { // L: 3305 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4; - } else { - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3; // L: 3306 - } - - return 1; // L: 3307 - } - } - } - } - - @ObfuscatedName("hw") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-543558308" - ) - @Export("getTileHeight") - static final int getTileHeight(int var0, int var1, int var2) { - int var3 = var0 >> 7; // L: 5432 - int var4 = var1 >> 7; // L: 5433 - if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 5434 - int var5 = var2; // L: 5435 - if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 5436 - var5 = var2 + 1; - } - - int var6 = var0 & 127; // L: 5437 - int var7 = var1 & 127; // L: 5438 - int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7; // L: 5439 - int var9 = var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; // L: 5440 - return var7 * var9 + var8 * (128 - var7) >> 7; // L: 5441 - } else { - return 0; - } - } - - @ObfuscatedName("km") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1796221797" - ) - @Export("changeGameOptions") - static final void changeGameOptions(int var0) { - class143.method3072(); // L: 12041 - - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 12043 - if (var1.obj != null) { // L: 12044 - var1.set(); - } - } - - int var3 = class134.VarpDefinition_get(var0).type; // L: 12047 - if (var3 != 0) { // L: 12048 - int var2 = Varps.Varps_main[var0]; // L: 12049 - if (var3 == 1) { // L: 12050 - if (var2 == 1) { // L: 12051 - KitDefinition.method3453(0.9D); - } - - if (var2 == 2) { // L: 12052 - KitDefinition.method3453(0.8D); - } - - if (var2 == 3) { // L: 12053 - KitDefinition.method3453(0.7D); - } - - if (var2 == 4) { // L: 12054 - KitDefinition.method3453(0.6D); - } - } - - if (var3 == 3) { // L: 12056 - if (var2 == 0) { // L: 12057 - class1.method11(255); - } - - if (var2 == 1) { // L: 12058 - class1.method11(192); - } - - if (var2 == 2) { // L: 12059 - class1.method11(128); - } - - if (var2 == 3) { // L: 12060 - class1.method11(64); - } - - if (var2 == 4) { // L: 12061 - class1.method11(0); - } - } - - if (var3 == 4) { // L: 12063 - if (var2 == 0) { // L: 12064 - class126.method2824(127); - } - - if (var2 == 1) { // L: 12065 - class126.method2824(96); - } - - if (var2 == 2) { // L: 12066 - class126.method2824(64); - } - - if (var2 == 3) { // L: 12067 - class126.method2824(32); - } - - if (var2 == 4) { // L: 12068 - class126.method2824(0); - } - } - - if (var3 == 5) { // L: 12070 - Client.leftClickOpensMenu = var2; - } - - if (var3 == 6) { - Client.chatEffects = var2; // L: 12071 - } - - if (var3 == 9) { // L: 12072 - Client.field524 = var2; - } - - if (var3 == 10) { // L: 12073 - if (var2 == 0) { // L: 12074 - class127.method2830(127); - } - - if (var2 == 1) { // L: 12075 - class127.method2830(96); - } - - if (var2 == 2) { // L: 12076 - class127.method2830(64); - } - - if (var2 == 3) { // L: 12077 - class127.method2830(32); - } - - if (var2 == 4) { // L: 12078 - class127.method2830(0); - } - } - - if (var3 == 17) { // L: 12080 - Client.followerIndex = var2 & 65535; // L: 12081 - } - - if (var3 == 18) { // L: 12083 - Client.playerAttackOption = (AttackOption)MusicPatchPcmStream.findEnumerated(FriendSystem.method1743(), var2); // L: 12084 - if (Client.playerAttackOption == null) { // L: 12085 - Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - if (var3 == 19) { // L: 12087 - if (var2 == -1) { // L: 12088 - Client.combatTargetPlayerIndex = -1; - } else { - Client.combatTargetPlayerIndex = var2 & 2047; // L: 12089 - } - } - - if (var3 == 22) { // L: 12091 - Client.npcAttackOption = (AttackOption)MusicPatchPcmStream.findEnumerated(FriendSystem.method1743(), var2); // L: 12092 - if (Client.npcAttackOption == null) { // L: 12093 - Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - } - } // L: 12095 } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index 3a7f165429..8b7f752ff1 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -4,226 +4,233 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gp") +@ObfuscatedName("hw") @Implements("WorldMapLabelSize") public class WorldMapLabelSize { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Lhw;" ) @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Lhw;" ) @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Lhw;" ) @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; - @ObfuscatedName("il") - @ObfuscatedSignature( - descriptor = "[Lqi;" - ) - @Export("mapMarkerSprites") - static SpritePixels[] mapMarkerSprites; - @ObfuscatedName("if") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -131170417 + intValue = 553621229 ) - @Export("cameraX") - static int cameraX; - @ObfuscatedName("f") + final int field2708; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1256735251 + intValue = -2002311863 ) - final int field2208; - @ObfuscatedName("b") + final int field2712; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 624849635 + intValue = 216104665 ) - final int field2215; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1061569375 - ) - final int field2210; + final int field2714; static { - WorldMapLabelSize_small = new WorldMapLabelSize(1, 0, 4); // L: 7 + WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4); // L: 7 WorldMapLabelSize_medium = new WorldMapLabelSize(2, 1, 2); // L: 8 - WorldMapLabelSize_large = new WorldMapLabelSize(0, 2, 0); // L: 9 + WorldMapLabelSize_large = new WorldMapLabelSize(1, 2, 0); // L: 9 } WorldMapLabelSize(int var1, int var2, int var3) { - this.field2208 = var1; // L: 19 - this.field2215 = var2; // L: 20 - this.field2210 = var3; // L: 21 - } // L: 22 + this.field2708 = var1; // L: 15 + this.field2712 = var2; // L: 16 + this.field2714 = var3; // L: 17 + } // L: 18 - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(FB)Z", - garbageValue = "89" + descriptor = "(FI)Z", + garbageValue = "-459015930" ) - boolean method3902(float var1) { - return var1 >= (float)this.field2210; // L: 25 + boolean method4409(float var1) { + return var1 >= (float)this.field2714; // L: 21 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)[Lgp;", - garbageValue = "10456859" + descriptor = "(Llp;B)V", + garbageValue = "70" ) - static WorldMapLabelSize[] method3901() { - return new WorldMapLabelSize[]{WorldMapLabelSize_small, WorldMapLabelSize_medium, WorldMapLabelSize_large}; // L: 15 - } + public static void method4417(AbstractArchive var0) { + FloorOverlayDefinition.FloorOverlayDefinition_archive = var0; // L: 24 + } // L: 25 - @ObfuscatedName("q") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "-697751860" + descriptor = "(I)V", + garbageValue = "1257472711" ) - @Export("hashString") - public static int hashString(CharSequence var0) { - int var1 = var0.length(); // L: 131 - int var2 = 0; // L: 132 + public static void method4414() { + synchronized(MouseHandler.MouseHandler_instance) { // L: 50 + MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 51 + MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 52 + MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 53 + MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 54 + MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 55 + MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 56 + MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 57 + MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 58 + MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 59 + } + } // L: 61 - for (int var3 = 0; var3 < var1; ++var3) { // L: 133 - var2 = (var2 << 5) - var2 + class327.charToByteCp1252(var0.charAt(var3)); + @ObfuscatedName("fa") + @ObfuscatedSignature( + descriptor = "(IIIB)V", + garbageValue = "-55" + ) + @Export("queueSoundEffect") + static void queueSoundEffect(int var0, int var1, int var2) { + if (class12.clientPreferences.method2244() != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 3789 + Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 3790 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 3791 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 3792 + Client.soundEffects[Client.soundEffectCount] = null; // L: 3793 + Client.soundLocations[Client.soundEffectCount] = 0; // L: 3794 + ++Client.soundEffectCount; // L: 3795 } - return var2; // L: 134 - } + } // L: 3797 - @ObfuscatedName("a") + @ObfuscatedName("ij") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)V", - garbageValue = "-2017129698" + descriptor = "(Lcd;IIIB)V", + garbageValue = "46" ) - static final void method3903(String var0, int var1) { - PacketBufferNode var2 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2898, Client.packetWriter.isaacCipher); // L: 214 - var2.packetBuffer.writeByte(class425.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 215 - var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 216 - var2.packetBuffer.method7804(var1); // L: 217 - Client.packetWriter.addNode(var2); // L: 218 - } // L: 219 - - @ObfuscatedName("ii") - @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;B)V", - garbageValue = "-40" - ) - @Export("widgetDefaultMenuAction") - static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = ItemComposition.getWidgetChild(var1, var2); // L: 9688 - if (var5 != null) { // L: 9689 - if (var5.onOp != null) { // L: 9690 - ScriptEvent var6 = new ScriptEvent(); // L: 9691 - var6.widget = var5; // L: 9692 - var6.opIndex = var0; // L: 9693 - var6.targetName = var4; // L: 9694 - var6.args = var5.onOp; // L: 9695 - ClanSettings.runScriptEvent(var6); // L: 9696 + @Export("addNpcToMenu") + static final void addNpcToMenu(NPC var0, int var1, int var2, int var3) { + NPCComposition var4 = var0.definition; // L: 10069 + if (Client.menuOptionsCount < 400) { // L: 10070 + if (var4.transforms != null) { // L: 10071 + var4 = var4.transform(); } - boolean var11 = true; // L: 9698 - if (var5.contentType > 0) { // L: 9699 - var11 = ModeWhere.method6100(var5); - } + if (var4 != null) { // L: 10072 + if (var4.isInteractable) { // L: 10073 + if (!var4.isFollower || Client.followerIndex == var1) { // L: 10074 + String var5 = var0.method2342(); // L: 10075 + int var6; + if (var4.combatLevel != 0 && var0.field1210 != 0) { // L: 10076 + var6 = var0.field1210 != -1 ? var0.field1210 * 731891927 * -1765430553 : var4.combatLevel * 580256741 * -200769043; // L: 10077 + var5 = var5 + IgnoreList.method6430(var6, ModelData0.localPlayer.combatLevel) + " " + " (" + "level-" + var6 + ")"; // L: 10078 + } + + if (var4.isFollower && Client.followerOpsLowPriority) { // L: 10080 + Projectile.insertMenuItemNoShift("Examine", class166.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 10081 + } + + if (Client.isItemSelected == 1) { // L: 10084 + Projectile.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class166.colorStartTag(16776960) + var5, 7, var1, var2, var3); // L: 10085 + } else if (Client.isSpellSelected) { // L: 10088 + if ((class113.selectedSpellFlags & 2) == 2) { // L: 10089 + Projectile.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class166.colorStartTag(16776960) + var5, 8, var1, var2, var3); // L: 10090 + } + } else { + var6 = var4.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 10095 + String[] var7 = var4.actions; // L: 10096 + int var8; + int var9; + if (var7 != null) { // L: 10097 + for (var8 = 4; var8 >= 0; --var8) { // L: 10098 + if (var7[var8] != null && !var7[var8].equalsIgnoreCase("Attack")) { // L: 10099 + var9 = 0; // L: 10100 + if (var8 == 0) { // L: 10101 + var9 = var6 + 9; + } + + if (var8 == 1) { // L: 10102 + var9 = var6 + 10; + } + + if (var8 == 2) { // L: 10103 + var9 = var6 + 11; + } + + if (var8 == 3) { // L: 10104 + var9 = var6 + 12; + } + + if (var8 == 4) { // L: 10105 + var9 = var6 + 13; + } + + Projectile.insertMenuItemNoShift(var7[var8], class166.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 10106 + } + } + } + + if (var7 != null) { // L: 10111 + for (var8 = 4; var8 >= 0; --var8) { // L: 10112 + if (var7[var8] != null && var7[var8].equalsIgnoreCase("Attack")) { // L: 10113 + short var10 = 0; // L: 10114 + if (Client.npcAttackOption != AttackOption.AttackOption_hidden) { // L: 10115 + if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var4.combatLevel > ModelData0.localPlayer.combatLevel) { // L: 10116 + var10 = 2000; // L: 10117 + } + + var9 = 0; // L: 10119 + if (var8 == 0) { // L: 10120 + var9 = var10 + 9; + } + + if (var8 == 1) { + var9 = var10 + 10; // L: 10121 + } + + if (var8 == 2) { // L: 10122 + var9 = var10 + 11; + } + + if (var8 == 3) { // L: 10123 + var9 = var10 + 12; + } + + if (var8 == 4) { // L: 10124 + var9 = var10 + 13; + } + + Projectile.insertMenuItemNoShift(var7[var8], class166.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 10125 + } + } + } + } + + if (!var4.isFollower || !Client.followerOpsLowPriority) { // L: 10130 + Projectile.insertMenuItemNoShift("Examine", class166.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 10131 + } + } - if (var11) { // L: 9700 - int var8 = class326.getWidgetFlags(var5); // L: 9702 - int var9 = var0 - 1; // L: 9703 - boolean var7 = (var8 >> var9 + 1 & 1) != 0; // L: 9705 - if (var7) { // L: 9707 - PacketBufferNode var10; - if (var0 == 1) { // L: 9710 - var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2908, Client.packetWriter.isaacCipher); // L: 9712 - var10.packetBuffer.writeInt(var1); // L: 9713 - var10.packetBuffer.writeShort(var2); // L: 9714 - var10.packetBuffer.writeShort(var3); // L: 9715 - Client.packetWriter.addNode(var10); // L: 9716 } - - if (var0 == 2) { // L: 9718 - var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2945, Client.packetWriter.isaacCipher); // L: 9720 - var10.packetBuffer.writeInt(var1); // L: 9721 - var10.packetBuffer.writeShort(var2); // L: 9722 - var10.packetBuffer.writeShort(var3); // L: 9723 - Client.packetWriter.addNode(var10); // L: 9724 - } - - if (var0 == 3) { // L: 9726 - var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2941, Client.packetWriter.isaacCipher); // L: 9728 - var10.packetBuffer.writeInt(var1); // L: 9729 - var10.packetBuffer.writeShort(var2); // L: 9730 - var10.packetBuffer.writeShort(var3); // L: 9731 - Client.packetWriter.addNode(var10); // L: 9732 - } - - if (var0 == 4) { // L: 9734 - var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2966, Client.packetWriter.isaacCipher); // L: 9736 - var10.packetBuffer.writeInt(var1); // L: 9737 - var10.packetBuffer.writeShort(var2); // L: 9738 - var10.packetBuffer.writeShort(var3); // L: 9739 - Client.packetWriter.addNode(var10); // L: 9740 - } - - if (var0 == 5) { // L: 9742 - var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2906, Client.packetWriter.isaacCipher); // L: 9744 - var10.packetBuffer.writeInt(var1); // L: 9745 - var10.packetBuffer.writeShort(var2); // L: 9746 - var10.packetBuffer.writeShort(var3); // L: 9747 - Client.packetWriter.addNode(var10); // L: 9748 - } - - if (var0 == 6) { // L: 9750 - var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2944, Client.packetWriter.isaacCipher); // L: 9752 - var10.packetBuffer.writeInt(var1); // L: 9753 - var10.packetBuffer.writeShort(var2); // L: 9754 - var10.packetBuffer.writeShort(var3); // L: 9755 - Client.packetWriter.addNode(var10); // L: 9756 - } - - if (var0 == 7) { // L: 9758 - var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2982, Client.packetWriter.isaacCipher); // L: 9760 - var10.packetBuffer.writeInt(var1); // L: 9761 - var10.packetBuffer.writeShort(var2); // L: 9762 - var10.packetBuffer.writeShort(var3); // L: 9763 - Client.packetWriter.addNode(var10); // L: 9764 - } - - if (var0 == 8) { // L: 9766 - var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2960, Client.packetWriter.isaacCipher); // L: 9768 - var10.packetBuffer.writeInt(var1); // L: 9769 - var10.packetBuffer.writeShort(var2); // L: 9770 - var10.packetBuffer.writeShort(var3); // L: 9771 - Client.packetWriter.addNode(var10); // L: 9772 - } - - if (var0 == 9) { // L: 9774 - var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2943, Client.packetWriter.isaacCipher); // L: 9776 - var10.packetBuffer.writeInt(var1); // L: 9777 - var10.packetBuffer.writeShort(var2); // L: 9778 - var10.packetBuffer.writeShort(var3); // L: 9779 - Client.packetWriter.addNode(var10); // L: 9780 - } - - if (var0 == 10) { // L: 9782 - var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2917, Client.packetWriter.isaacCipher); // L: 9784 - var10.packetBuffer.writeInt(var1); // L: 9785 - var10.packetBuffer.writeShort(var2); // L: 9786 - var10.packetBuffer.writeShort(var3); // L: 9787 - Client.packetWriter.addNode(var10); // L: 9788 - } - } } } - } // L: 9708 9790 + } // L: 10135 + + @ObfuscatedName("jx") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "397937565" + ) + @Export("runIntfCloseListeners") + static final void runIntfCloseListeners(int var0, int var1) { + if (WorldMapDecoration.loadInterface(var0)) { // L: 11741 + MusicPatchPcmStream.runComponentCloseListeners(NetSocket.Widget_interfaceComponents[var0], var1); // L: 11742 + } + } // L: 11743 } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 21f2a15993..cacc4a150b 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -9,98 +9,98 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gq") +@ObfuscatedName("hp") @Implements("WorldMapManager") public final class WorldMapManager { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("loaded") boolean loaded; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("loadStarted") boolean loadStarted; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Liq;" ) @Export("mapAreaData") WorldMapAreaData mapAreaData; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lqi;" + descriptor = "Lqr;" ) @Export("compositeTextureSprite") SpritePixels compositeTextureSprite; - @ObfuscatedName("b") + @ObfuscatedName("a") @Export("icons") HashMap icons; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "[[Lgd;" + descriptor = "[[Lhd;" ) @Export("regions") WorldMapRegion[][] regions; - @ObfuscatedName("s") + @ObfuscatedName("p") @Export("scaleHandlers") HashMap scaleHandlers; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "[Lqq;" + descriptor = "[Lqd;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("geographyArchive") final AbstractArchive geographyArchive; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("groundArchive") final AbstractArchive groundArchive; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("fonts") final HashMap fonts; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -851451677 + intValue = 1992474543 ) @Export("tileX") int tileX; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1258410279 + intValue = 1099755425 ) @Export("tileY") int tileY; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 925141589 + intValue = 670998135 ) @Export("tileWidth") int tileWidth; - @ObfuscatedName("d") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1725085239 + intValue = -2098187555 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1463105989 + intValue = 1501443401 ) @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( - descriptor = "([Lqq;Ljava/util/HashMap;Lln;Lln;)V" + descriptor = "([Lqd;Ljava/util/HashMap;Llp;Llp;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.loaded = false; // L: 16 this.loadStarted = false; // L: 17 - this.scaleHandlers = new HashMap(); + this.scaleHandlers = new HashMap(); // L: 22 this.pixelsPerTile = 0; // L: 31 this.mapSceneSprites = var1; // L: 34 this.fonts = var2; // L: 35 @@ -108,10 +108,10 @@ public final class WorldMapManager { this.groundArchive = var4; // L: 37 } // L: 38 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lln;Ljava/lang/String;ZI)V", - garbageValue = "-2044848511" + descriptor = "(Llp;Ljava/lang/String;ZI)V", + garbageValue = "1061155576" ) @Export("load") public void load(AbstractArchive var1, String var2, boolean var3) { @@ -119,10 +119,10 @@ public final class WorldMapManager { this.loaded = false; // L: 44 this.loadStarted = true; // L: 45 System.nanoTime(); // L: 46 - int var4 = var1.getGroupId(WorldMapCacheName.field2413.name); // L: 47 + int var4 = var1.getGroupId(WorldMapCacheName.field2910.name); // L: 47 int var5 = var1.getFileId(var4, var2); // L: 48 - Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2413.name, var2)); // L: 49 - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2414.name, var2)); // L: 50 + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2910.name, var2)); // L: 49 + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2907.name, var2)); // L: 50 System.nanoTime(); // L: 51 System.nanoTime(); // L: 52 this.mapAreaData = new WorldMapAreaData(); // L: 53 @@ -144,330 +144,365 @@ public final class WorldMapManager { int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; // L: 68 System.nanoTime(); // L: 69 System.nanoTime(); // L: 70 - AbstractWorldMapIcon.method4429(); // L: 71 - this.regions = new WorldMapRegion[var16][var9]; // L: 72 - Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); // L: 73 + WorldMapRegion.WorldMapRegion_cachedSprites.clear(); // L: 72 + this.regions = new WorldMapRegion[var16][var9]; // L: 74 + Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); // L: 75 while (var10.hasNext()) { - WorldMapData_0 var11 = (WorldMapData_0)var10.next(); // L: 74 - int var12 = var11.regionX; // L: 76 - int var13 = var11.regionY; // L: 77 - int var14 = var12 - this.mapAreaData.getRegionLowX(); // L: 78 - int var15 = var13 - this.mapAreaData.getRegionLowY(); // L: 79 - 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 + WorldMapData_0 var11 = (WorldMapData_0)var10.next(); // L: 76 + int var12 = var11.regionX; // L: 78 + int var13 = var11.regionY; // L: 79 + int var14 = var12 - this.mapAreaData.getRegionLowX(); // L: 80 + int var15 = var13 - this.mapAreaData.getRegionLowY(); // L: 81 + this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 82 + this.regions[var14][var15].initWorldMapData0(var11, this.mapAreaData.iconList); // L: 83 } - for (int var17 = 0; var17 < var16; ++var17) { // L: 84 - for (int var18 = 0; var18 < var9; ++var18) { // L: 85 - 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 + for (int var17 = 0; var17 < var16; ++var17) { // L: 86 + for (int var18 = 0; var18 < var9; ++var18) { // L: 87 + if (this.regions[var17][var18] == null) { // L: 88 + this.regions[var17][var18] = new WorldMapRegion(this.mapAreaData.getRegionLowX() + var17, this.mapAreaData.getRegionLowY() + var18, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 89 + this.regions[var17][var18].initWorldMapData1(this.mapAreaData.worldMapData1Set, this.mapAreaData.iconList); // L: 90 } } } - System.nanoTime(); // L: 92 - System.nanoTime(); // L: 93 - if (var1.isValidFileName(WorldMapCacheName.field2418.name, var2)) { // L: 94 - byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2418.name, var2); // L: 95 - this.compositeTextureSprite = Interpreter.method1889(var20); // L: 96 + System.nanoTime(); // L: 94 + System.nanoTime(); // L: 95 + if (var1.isValidFileName(WorldMapCacheName.field2908.name, var2)) { // L: 96 + byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2908.name, var2); // L: 97 + this.compositeTextureSprite = Frames.method4217(var20); // L: 98 } - System.nanoTime(); // L: 98 - var1.clearGroups(); // L: 99 - var1.clearFiles(); // L: 100 - this.loaded = true; // L: 101 + System.nanoTime(); // L: 100 + var1.clearGroups(); // L: 101 + var1.clearFiles(); // L: 102 + this.loaded = true; // L: 103 } - } // L: 42 102 + } // L: 42 104 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-59" + garbageValue = "-39" ) @Export("clearIcons") public final void clearIcons() { - this.icons = null; // L: 105 - } // L: 106 + this.icons = null; // L: 107 + } // L: 108 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(IIIIIIIII)V", - garbageValue = "-2135709682" + garbageValue = "-1519819198" ) @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[] var12 = new int[4]; // L: 112 - Rasterizer2D.Rasterizer2D_getClipArray(var12); // L: 113 - WorldMapRectangle var13 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 114 - float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 115 - int var15 = (int)Math.ceil((double)var14); // L: 116 - this.pixelsPerTile = var15; // L: 117 - if (!this.scaleHandlers.containsKey(var15)) { // L: 118 - WorldMapScaleHandler var16 = new WorldMapScaleHandler(var15); // L: 119 - var16.init(); // L: 120 - this.scaleHandlers.put(var15, var16); // L: 121 + int[] var9 = Rasterizer2D.Rasterizer2D_pixels; // L: 111 + int var10 = Rasterizer2D.Rasterizer2D_width; // L: 112 + int var11 = Rasterizer2D.Rasterizer2D_height; // L: 113 + int[] var12 = new int[4]; // L: 114 + Rasterizer2D.Rasterizer2D_getClipArray(var12); // L: 115 + WorldMapRectangle var13 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 116 + float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 117 + int var15 = (int)Math.ceil((double)var14); // L: 118 + this.pixelsPerTile = var15; // L: 119 + if (!this.scaleHandlers.containsKey(var15)) { // L: 120 + WorldMapScaleHandler var16 = new WorldMapScaleHandler(var15); // L: 121 + var16.init(); // L: 122 + this.scaleHandlers.put(var15, var16); // L: 123 } - int var23 = var13.x + var13.width - 1; // L: 123 - int var17 = var13.y + var13.height - 1; // L: 124 + int var23 = var13.x + var13.width - 1; // L: 125 + int var17 = var13.y + var13.height - 1; // L: 126 int var18; int var19; - for (var18 = var13.x; var18 <= var23; ++var18) { // L: 125 - for (var19 = var13.y; var19 <= var17; ++var19) { // L: 126 - this.regions[var18][var19].drawTile(var15, (WorldMapScaleHandler)this.scaleHandlers.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); // L: 127 + for (var18 = var13.x; var18 <= var23; ++var18) { // L: 127 + for (var19 = var13.y; var19 <= var17; ++var19) { // L: 128 + this.regions[var18][var19].drawTile(var15, (WorldMapScaleHandler)this.scaleHandlers.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); // L: 129 } } - Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); // L: 130 - Rasterizer2D.Rasterizer2D_setClipArray(var12); // L: 131 - var18 = (int)(var14 * 64.0F); // L: 132 - var19 = this.tileX + var1; // L: 133 - int var20 = var2 + this.tileY; // L: 134 + Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); // L: 132 + Rasterizer2D.Rasterizer2D_setClipArray(var12); // L: 133 + var18 = (int)(64.0F * var14); // L: 134 + var19 = this.tileX + var1; // L: 135 + int var20 = var2 + this.tileY; // L: 136 - for (int var21 = var13.x; var21 < var13.width + var13.x; ++var21) { // L: 135 - for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) { // L: 136 - this.regions[var21][var22].method4039(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.width + var13.x; ++var21) { // L: 137 + for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) { // L: 138 + this.regions[var21][var22].method4516(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); // L: 139 } } - } // L: 140 + } // L: 142 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", - garbageValue = "-2068355734" + garbageValue = "-561586744" ) @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)(64.0F * var15); // L: 145 - int var17 = this.tileX + var1; // L: 146 - int var18 = var2 + this.tileY; // L: 147 + WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 145 + float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 146 + int var16 = (int)(var15 * 64.0F); // L: 147 + int var17 = this.tileX + var1; // L: 148 + int var18 = var2 + this.tileY; // L: 149 int var19; int var20; - for (var19 = var14.x; var19 < var14.x + var14.width; ++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 + for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { // L: 150 + for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 151 + if (var13) { // L: 152 + this.regions[var19][var20].initWorldMapIcon1s(); // L: 153 } - this.regions[var19][var20].method4097(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].method4526(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); // L: 155 } } - 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 - this.regions[var19][var20].flashElements(var10, var11, var12); // L: 159 + if (var10 != null && var11 > 0) { + for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { + for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) { + this.regions[var19][var20].flashElements(var10, var11, var12); } } } - } // L: 163 + } // L: 165 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(IIIILjava/util/HashSet;IIB)V", - garbageValue = "-36" + garbageValue = "-8" ) @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 - if (var6 > 0 && var6 % var7 < var7 / 2) { // L: 170 - if (this.icons == null) { // L: 173 - this.buildIcons0(); // L: 174 + if (this.compositeTextureSprite != null) { + this.compositeTextureSprite.drawScaledAt(var1, var2, var3, var4); + if (var6 > 0 && var6 % var7 < var7 / 2) { // L: 172 + if (this.icons == null) { + this.buildIcons0(); } - Iterator var8 = var5.iterator(); // L: 176 + Iterator var8 = var5.iterator(); while (true) { List var10; do { if (!var8.hasNext()) { - return; // L: 193 + return; // L: 195 } - int var9 = (Integer)var8.next(); // L: 177 - var10 = (List)this.icons.get(var9); // L: 179 - } while(var10 == null); // L: 180 + int var9 = (Integer)var8.next(); // L: 179 + var10 = (List)this.icons.get(var9); + } while(var10 == null); // L: 182 - Iterator var11 = var10.iterator(); // L: 183 + Iterator var11 = var10.iterator(); - while (var11.hasNext()) { // L: 190 - 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 - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); // L: 188 + while (var11.hasNext()) { // L: 185 + AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); // L: 186 + int var13 = var3 * (var12.coord2.x - this.tileX) / this.tileWidth; // L: 188 + int var14 = var4 - (var12.coord2.y - this.tileY) * var4 / this.tileHeight; // L: 189 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); // L: 190 } } } } - } // L: 167 171 + } // L: 169 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIIIIIIIIIB)Ljava/util/List;", - garbageValue = "-46" + descriptor = "(IIIIIIIIIII)Ljava/util/List;", + garbageValue = "598797638" ) - public List method4186(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 + public List method4645(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: 198 + if (!this.loaded) { // L: 199 + return var11; // L: 200 } else { - WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 200 - float var13 = this.getPixelsPerTile(var7, var3 - var1); // L: 201 - int var14 = (int)(64.0F * var13); // L: 202 - int var15 = this.tileX + var1; // L: 203 - int var16 = var2 + this.tileY; // L: 204 + WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 202 + float var13 = this.getPixelsPerTile(var7, var3 - var1); // L: 203 + int var14 = (int)(var13 * 64.0F); // L: 204 + int var15 = this.tileX + var1; // L: 205 + int var16 = var2 + this.tileY; // L: 206 - for (int var17 = var12.x; var17 < var12.x + var12.width; ++var17) { // L: 205 - for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { // L: 206 - List var19 = this.regions[var17][var18].method4069(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 + for (int var17 = var12.x; var17 < var12.width + var12.x; ++var17) { // L: 207 + for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { // L: 208 + List var19 = this.regions[var17][var18].method4547(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: 209 + if (!var19.isEmpty()) { // L: 210 + var11.addAll(var19); // L: 211 } } } - return var11; // L: 213 + return var11; // L: 215 } } + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(IIIIB)Lig;", + garbageValue = "24" + ) + @Export("createWorldMapRectangle") + WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { + WorldMapRectangle var5 = new WorldMapRectangle(this); // L: 219 + int var6 = this.tileX + var1; // L: 220 + int var7 = var2 + this.tileY; // L: 221 + int var8 = var3 + this.tileX; // L: 222 + int var9 = var4 + this.tileY; // L: 223 + int var10 = var6 / 64; // L: 224 + int var11 = var7 / 64; // L: 225 + int var12 = var8 / 64; // L: 226 + int var13 = var9 / 64; // L: 227 + var5.width = var12 - var10 + 1; // L: 228 + var5.height = var13 - var11 + 1; // L: 229 + var5.x = var10 - this.mapAreaData.getRegionLowX(); // L: 230 + var5.y = var11 - this.mapAreaData.getRegionLowY(); // L: 231 + if (var5.x < 0) { // L: 232 + var5.width += var5.x; // L: 233 + var5.x = 0; // L: 234 + } + + if (var5.x > this.regions.length - var5.width) { // L: 236 + var5.width = this.regions.length - var5.x; // L: 237 + } + + if (var5.y < 0) { // L: 239 + var5.height += var5.y; // L: 240 + var5.y = 0; // L: 241 + } + + if (var5.y > this.regions[0].length - var5.height) { // L: 243 + var5.height = this.regions[0].length - var5.y; // L: 244 + } + + var5.width = Math.min(var5.width, this.regions.length); // L: 246 + var5.height = Math.min(var5.height, this.regions[0].length); // L: 247 + return var5; // L: 248 + } + @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(IIIII)Lhj;", - garbageValue = "-1952906949" - ) - @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 - int var7 = var2 + this.tileY; // L: 219 - int var8 = var3 + this.tileX; // L: 220 - int var9 = var4 + this.tileY; // L: 221 - int var10 = var6 / 64; // L: 222 - int var11 = var7 / 64; // L: 223 - int var12 = var8 / 64; // L: 224 - int var13 = var9 / 64; // L: 225 - var5.width = var12 - var10 + 1; // L: 226 - var5.height = var13 - var11 + 1; // L: 227 - var5.x = var10 - this.mapAreaData.getRegionLowX(); // L: 228 - var5.y = var11 - this.mapAreaData.getRegionLowY(); // L: 229 - if (var5.x < 0) { // L: 230 - var5.width += var5.x; // L: 231 - var5.x = 0; // L: 232 - } - - if (var5.x > this.regions.length - var5.width) { // L: 234 - var5.width = this.regions.length - var5.x; // L: 235 - } - - if (var5.y < 0) { // L: 237 - var5.height += var5.y; // L: 238 - var5.y = 0; // L: 239 - } - - if (var5.y > this.regions[0].length - var5.height) { // L: 241 - var5.height = this.regions[0].length - var5.y; // L: 242 - } - - var5.width = Math.min(var5.width, this.regions.length); // L: 244 - var5.height = Math.min(var5.height, this.regions[0].length); // L: 245 - return var5; // L: 246 - } - - @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1503029363" + garbageValue = "1915795539" ) @Export("isLoaded") public boolean isLoaded() { - return this.loaded; // L: 250 + return this.loaded; // L: 252 } - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(B)Ljava/util/HashMap;", - garbageValue = "-9" + garbageValue = "94" ) @Export("buildIcons") public HashMap buildIcons() { - this.buildIcons0(); // L: 254 - return this.icons; // L: 255 + this.buildIcons0(); // L: 256 + return this.icons; // L: 257 } - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-465034080" + garbageValue = "-1311394013" ) @Export("buildIcons0") void buildIcons0() { - if (this.icons == null) { // L: 259 - this.icons = new HashMap(); // L: 260 + if (this.icons == null) { // L: 261 + this.icons = new HashMap(); // L: 262 } - this.icons.clear(); // L: 262 + this.icons.clear(); // L: 264 - for (int var1 = 0; var1 < this.regions.length; ++var1) { // L: 263 - for (int var2 = 0; var2 < this.regions[var1].length; ++var2) { // L: 264 - List var3 = this.regions[var1][var2].icons(); // L: 265 - Iterator var4 = var3.iterator(); // L: 266 + for (int var1 = 0; var1 < this.regions.length; ++var1) { // L: 265 + for (int var2 = 0; var2 < this.regions[var1].length; ++var2) { // L: 266 + List var3 = this.regions[var1][var2].icons(); // L: 267 + Iterator var4 = var3.iterator(); // L: 268 while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 267 - if (var5.hasValidElement()) { // L: 269 - int var6 = var5.getElement(); // L: 270 - if (!this.icons.containsKey(var6)) { // L: 271 - LinkedList var7 = new LinkedList(); // L: 272 - var7.add(var5); // L: 273 - this.icons.put(var6, var7); // L: 274 + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 269 + if (var5.hasValidElement()) { // L: 271 + int var6 = var5.getElement(); // L: 272 + if (!this.icons.containsKey(var6)) { // L: 273 + LinkedList var7 = new LinkedList(); // L: 274 + var7.add(var5); // L: 275 + this.icons.put(var6, var7); // L: 276 } else { - List var8 = (List)this.icons.get(var6); // L: 277 - var8.add(var5); // L: 278 + List var8 = (List)this.icons.get(var6); // L: 279 + var8.add(var5); // L: 280 } } } } } - } // L: 284 + } // L: 286 - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(III)F", - garbageValue = "-1925282400" + garbageValue = "1633980675" ) @Export("getPixelsPerTile") float getPixelsPerTile(int var1, int var2) { - float var3 = (float)var1 / (float)var2; // L: 287 - if (var3 > 8.0F) { // L: 288 + float var3 = (float)var1 / (float)var2; // L: 289 + if (var3 > 8.0F) { // L: 290 return 8.0F; - } else if (var3 < 1.0F) { // L: 289 + } else if (var3 < 1.0F) { // L: 291 return 1.0F; } else { - int var4 = Math.round(var3); // L: 290 - return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; // L: 291 292 + int var4 = Math.round(var3); // L: 292 + return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; // L: 293 294 } } - @ObfuscatedName("f") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)[Lka;", - garbageValue = "-1779749419" + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "1507362286" ) - @Export("PlayerType_values") - public static PlayerType[] PlayerType_values() { - return new PlayerType[]{PlayerType.PlayerType_normal, PlayerType.field3920, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_ultimateIronman, PlayerType.field3927, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_ironman, PlayerType.field3923}; // L: 22 + public static String method4679(String var0) { + int var1 = var0.length(); // L: 158 + char[] var2 = new char[var1]; // L: 159 + byte var3 = 2; // L: 160 + + for (int var4 = 0; var4 < var1; ++var4) { // L: 161 + char var5 = var0.charAt(var4); // L: 162 + if (var3 == 0) { // L: 163 + var5 = Character.toLowerCase(var5); + } else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 164 + char var6; + if (var5 != 181 && var5 != 402) { // L: 167 + var6 = Character.toTitleCase(var5); // L: 171 + } else { + var6 = var5; // L: 168 + } + + var5 = var6; // L: 173 + } + + if (Character.isLetter(var5)) { + var3 = 0; // L: 175 + } else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 176 + if (Character.isSpaceChar(var5)) { // L: 177 + if (var3 != 2) { // L: 178 + var3 = 1; + } + } else { + var3 = 1; // L: 180 + } + } else { + var3 = 2; + } + + var2[var4] = var5; // L: 181 + } + + return new String(var2); // L: 183 } } diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index 74a0ae67d2..eb988950c1 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -4,57 +4,43 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hj") +@ObfuscatedName("ig") @Implements("WorldMapRectangle") public final class WorldMapRectangle { - @ObfuscatedName("si") - @ObfuscatedSignature( - descriptor = "Las;" - ) - @Export("decimator") - static Decimator decimator; - @ObfuscatedName("p") - public static short[][] field2356; - @ObfuscatedName("eu") - @ObfuscatedSignature( - descriptor = "Llx;" - ) - @Export("archive18") - static Archive archive18; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -916427651 + intValue = 10914297 ) @Export("width") int width; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 34585137 + intValue = 1439555673 ) @Export("height") int height; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -504322827 + intValue = -959506253 ) @Export("x") int x; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1729721737 + intValue = -1518441747 ) @Export("y") int y; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lgq;" + descriptor = "Lhp;" ) final WorldMapManager this$0; @ObfuscatedSignature( - descriptor = "(Lgq;)V" + descriptor = "(Lhp;)V" ) WorldMapRectangle(WorldMapManager var1) { - this.this$0 = var1; // L: 303 + this.this$0 = var1; // L: 305 } } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index e99d278af1..604f17a57d 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -10,61 +10,61 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gd") +@ObfuscatedName("hd") @Implements("WorldMapRegion") public class WorldMapRegion { - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1770017441 - ) - @Export("clientType") - public static int clientType; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Lic;" ) @Export("WorldMapRegion_cachedSprites") - public static DemotingHashTable WorldMapRegion_cachedSprites; - @ObfuscatedName("n") + static DemotingHashTable WorldMapRegion_cachedSprites; + @ObfuscatedName("fz") @ObfuscatedGetter( - intValue = 2095222453 + intValue = -832880865 + ) + @Export("currentPort") + static int currentPort; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 1022747117 ) @Export("regionX") int regionX; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 2124136901 + intValue = 295918545 ) @Export("regionY") int regionY; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lge;" + descriptor = "Lhz;" ) @Export("worldMapData_0") WorldMapData_0 worldMapData_0; - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("worldMapData1List") LinkedList worldMapData1List; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 827222531 + intValue = -2124547861 ) @Export("backgroundColor") int backgroundColor; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 465516293 + intValue = -1151544367 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("p") + @ObfuscatedName("c") @Export("icon0List") List icon0List; @ObfuscatedName("w") @Export("iconMap") HashMap iconMap; - @ObfuscatedName("k") + @ObfuscatedName("b") @Export("fonts") final HashMap fonts; @@ -82,13 +82,13 @@ public class WorldMapRegion { this.fonts = var4; // L: 57 } // L: 58 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "-32" + descriptor = "(IIII)V", + garbageValue = "1328537818" ) - void method4039(int var1, int var2, int var3) { - SpritePixels var4 = UserComparator5.method2599(this.regionX, this.regionY, this.pixelsPerTile); // L: 61 + void method4516(int var1, int var2, int var3) { + SpritePixels var4 = SoundSystem.method774(this.regionX, this.regionY, this.pixelsPerTile); // L: 61 if (var4 != null) { // L: 62 if (var3 == this.pixelsPerTile * 64) { // L: 63 var4.drawAt(var1, var2); // L: 64 @@ -99,10 +99,10 @@ public class WorldMapRegion { } } // L: 69 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lge;Ljava/util/List;B)V", - garbageValue = "25" + descriptor = "(Lhz;Ljava/util/List;I)V", + garbageValue = "-544065510" ) @Export("initWorldMapData0") void initWorldMapData0(WorldMapData_0 var1, List var2) { @@ -111,10 +111,10 @@ public class WorldMapRegion { this.addAllToIconList(var2); // L: 74 } // L: 75 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(Ljava/util/HashSet;Ljava/util/List;I)V", - garbageValue = "674550029" + garbageValue = "1544276205" ) @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { @@ -131,15 +131,15 @@ public class WorldMapRegion { this.addAllToIconList(var2); // L: 87 } // L: 88 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIIILhz;S)V", - garbageValue = "8217" + descriptor = "(IIIILib;I)V", + garbageValue = "1261476375" ) @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { for (int var6 = var1; var6 < var3 + var1; ++var6) { // L: 91 - label50: + label74: for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 92 for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 93 WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 94 @@ -147,11 +147,33 @@ public class WorldMapRegion { WorldMapDecoration[] var10 = var9; // L: 99 for (int var11 = 0; var11 < var10.length; ++var11) { // L: 100 - WorldMapDecoration var12 = var10[var11]; // L: 101 - ObjectComposition var13 = class146.getObjectDefinition(var12.objectDefinitionId); // L: 103 - if (VerticalAlignment.method3539(var13)) { // L: 104 - this.getIcon(var13, var8, var6, var7, var5); // L: 107 - continue label50; + ObjectComposition var13; + boolean var14; + label65: { + WorldMapDecoration var12 = var10[var11]; // L: 101 + var13 = class82.getObjectDefinition(var12.objectDefinitionId); // L: 103 + if (var13.transforms != null) { // L: 106 + int[] var15 = var13.transforms; // L: 108 + + for (int var16 = 0; var16 < var15.length; ++var16) { // L: 109 + int var17 = var15[var16]; // L: 110 + ObjectComposition var18 = class82.getObjectDefinition(var17); // L: 112 + if (var18.mapIconId != -1) { // L: 113 + var14 = true; // L: 114 + break label65; + } + } + } else if (var13.mapIconId != -1) { // L: 121 + var14 = true; // L: 122 + break label65; // L: 123 + } + + var14 = false; // L: 125 + } + + if (var14) { // L: 127 + this.getIcon(var13, var8, var6, var7, var5); // L: 130 + continue label74; // L: 131 } } } @@ -159,747 +181,1459 @@ public class WorldMapRegion { } } - } // L: 115 + } // L: 138 - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lgj;IIILhz;I)V", - garbageValue = "-1962947985" + descriptor = "(Lgy;IIILib;I)V", + garbageValue = "-956469356" ) @Export("getIcon") void getIcon(ObjectComposition var1, int var2, int var3, int var4, AbstractWorldMapData var5) { - Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 118 - Coord var7 = null; // L: 119 - if (this.worldMapData_0 != null) { // L: 120 - var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 121 + Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 141 + Coord var7 = null; // L: 142 + if (this.worldMapData_0 != null) { // L: 143 + var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 144 } else { - WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 124 - var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var4 + var8.regionYLow * 64 + var8.getChunkYLow() * 8); // L: 125 + WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 147 + var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); // L: 148 } WorldMapElement var9; Object var10; - if (var1.transforms != null) { // L: 128 - var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 129 + if (var1.transforms != null) { // L: 151 + var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 152 } else { - var9 = UserComparator7.WorldMapElement_get(var1.mapIconId); // L: 132 - var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 133 + var9 = class120.WorldMapElement_get(var1.mapIconId); // L: 155 + var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 156 } - var9 = UserComparator7.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 135 - if (var9.field1822) { // L: 136 - this.iconMap.put(new Coord(0, var3, var4), var10); // L: 137 + var9 = class120.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 158 + if (var9.field1876) { // L: 159 + this.iconMap.put(new Coord(0, var3, var4), var10); // L: 160 } - } // L: 139 + } // L: 162 - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-86" + garbageValue = "9" ) @Export("initWorldMapIcon1s") void initWorldMapIcon1s() { - Iterator var1 = this.iconMap.values().iterator(); // L: 142 + Iterator var1 = this.iconMap.values().iterator(); // L: 165 while (var1.hasNext()) { - AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 143 - if (var2 instanceof WorldMapIcon_1) { // L: 145 - ((WorldMapIcon_1)var2).init(); // L: 146 + AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 166 + if (var2 instanceof WorldMapIcon_1) { // L: 168 + ((WorldMapIcon_1)var2).init(); // L: 169 } } - } // L: 150 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Ljava/util/List;I)V", - garbageValue = "-867806211" - ) - @Export("addAllToIconList") - void addAllToIconList(List var1) { - Iterator var2 = var1.iterator(); // L: 153 - - while (var2.hasNext()) { - WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 154 - if (UserComparator7.WorldMapElement_get(var3.element).field1822 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 156 159 - WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method4082(var3.element)); // L: 160 - this.icon0List.add(var4); // L: 161 - } - } - - } // L: 165 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-84" - ) - void method4046() { - if (this.worldMapData_0 != null) { // L: 168 - this.worldMapData_0.reset(); // L: 169 - } else { - Iterator var1 = this.worldMapData1List.iterator(); // L: 172 - - while (var1.hasNext()) { // L: 177 - WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 173 - var2.reset(); // L: 175 - } - } - - } // L: 179 + } // L: 173 @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lln;I)Z", - garbageValue = "1708143981" + descriptor = "(Ljava/util/List;B)V", + garbageValue = "-78" + ) + @Export("addAllToIconList") + void addAllToIconList(List var1) { + Iterator var2 = var1.iterator(); // L: 176 + + while (var2.hasNext()) { + WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 177 + if (class120.WorldMapElement_get(var3.element).field1876 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 179 182 + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method4545(var3.element)); // L: 183 + this.icon0List.add(var4); // L: 184 + } + } + + } // L: 188 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "0" + ) + void method4523() { + if (this.worldMapData_0 != null) { // L: 191 + this.worldMapData_0.reset(); // L: 192 + } else { + Iterator var1 = this.worldMapData1List.iterator(); // L: 195 + + while (var1.hasNext()) { + WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 196 + var2.reset(); // L: 198 + } + } + + } // L: 202 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(Llp;S)Z", + garbageValue = "11541" ) @Export("loadGeography") boolean loadGeography(AbstractArchive var1) { - this.iconMap.clear(); // L: 182 - if (this.worldMapData_0 != null) { // L: 183 - this.worldMapData_0.loadGeography(var1); // L: 184 - if (this.worldMapData_0.isFullyLoaded()) { // L: 185 - this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 186 - return true; // L: 187 + 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 } else { - return false; // L: 189 + return false; // L: 212 } } else { - boolean var2 = true; // L: 192 + boolean var2 = true; // L: 215 Iterator var3; WorldMapData_1 var4; - for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 193 197 - var4 = (WorldMapData_1)var3.next(); // L: 194 - var4.loadGeography(var1); // L: 196 + 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 } - if (var2) { // L: 200 - var3 = this.worldMapData1List.iterator(); // L: 201 + if (var2) { // L: 223 + var3 = this.worldMapData1List.iterator(); // L: 224 while (var3.hasNext()) { - var4 = (WorldMapData_1)var3.next(); // L: 202 - this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 204 + var4 = (WorldMapData_1)var3.next(); // L: 225 + this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 227 } } - return var2; // L: 208 + return var2; // L: 231 } } - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ILhx;[Lqq;Lln;Lln;I)V", - garbageValue = "-350994346" + descriptor = "(ILii;[Lqd;Llp;Llp;S)V", + garbageValue = "-10084" ) @Export("drawTile") void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { - this.pixelsPerTile = var1; // L: 213 - if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 214 - int var7 = this.regionX; // L: 218 - int var8 = this.regionY; // L: 219 - DemotingHashTable var9 = WorldMapRegion_cachedSprites; // L: 221 - long var10 = (long)(var1 << 16 | var7 << 8 | var8); // L: 224 - SpritePixels var6 = (SpritePixels)var9.get(var10); // L: 226 - if (var6 == null) { // L: 228 - boolean var21 = true; // L: 231 - var21 &= this.loadGeography(var4); // L: 232 - int var11; - if (this.worldMapData_0 != null) { // L: 235 - var11 = this.worldMapData_0.groupId; // L: 236 + this.pixelsPerTile = var1; // L: 236 + if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 237 + if (SoundSystem.method774(this.regionX, this.regionY, var1) == null) { // L: 240 + boolean var6 = true; // L: 243 + var6 &= this.loadGeography(var4); // L: 244 + int var8; + if (this.worldMapData_0 != null) { // L: 247 + var8 = this.worldMapData_0.groupId; // L: 248 } else { - var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 239 + var8 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 251 } - var21 &= var5.tryLoadGroup(var11); // L: 241 - if (var21) { // L: 242 - byte[] var22 = var5.takeFileFlat(var11); // L: 243 - WorldMapSprite var12 = Interpreter.method1798(var22); // L: 244 - SpritePixels var13 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 245 - var13.setRaster(); // L: 246 - if (this.worldMapData_0 != null) { // L: 247 - this.method4124(var2, var3, var12); // L: 248 + var6 &= var5.tryLoadGroup(var8); // L: 253 + if (var6) { // L: 254 + byte[] var7 = var5.takeFileFlat(var8); // L: 255 + WorldMapSprite var9; + if (var7 == null) { // L: 258 + var9 = new WorldMapSprite(); // L: 259 } else { - this.method4144(var2, var3, var12); // L: 251 + var9 = new WorldMapSprite(Frames.method4217(var7).pixels); // L: 262 } - int var14 = this.regionX; // L: 253 - int var15 = this.regionY; // L: 254 - int var16 = this.pixelsPerTile; // L: 255 - DemotingHashTable var17 = WorldMapRegion_cachedSprites; // L: 257 - long var19 = (long)(var16 << 16 | var14 << 8 | var15); // L: 261 - var17.put(var13, var19, var13.pixels.length * 4); // L: 263 - this.method4046(); // L: 265 + SpritePixels var11 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 265 + var11.setRaster(); // L: 266 + if (this.worldMapData_0 != null) { // L: 267 + this.method4528(var2, var3, var9); // L: 268 + } else { + this.method4620(var2, var3, var9); // L: 271 + } + + int var12 = this.regionX; // L: 273 + int var13 = this.regionY; // L: 274 + int var14 = this.pixelsPerTile; // L: 275 + DemotingHashTable var15 = WorldMapRegion_cachedSprites; // L: 277 + long var17 = (long)(var14 << 16 | var12 << 8 | var13); // L: 281 + var15.put(var11, var17, var11.pixels.length * 4); // L: 283 + this.method4523(); // L: 285 } } } - } // L: 215 229 266 + } // L: 238 241 286 @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IIILjava/util/HashSet;B)V", - garbageValue = "13" + descriptor = "(IIILjava/util/HashSet;I)V", + garbageValue = "1592995873" ) - void method4097(int var1, int var2, int var3, HashSet var4) { - if (var4 == null) { // L: 269 - var4 = new HashSet(); // L: 270 + void method4526(int var1, int var2, int var3, HashSet var4) { + if (var4 == null) { // L: 289 + var4 = new HashSet(); // L: 290 } - this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 272 - this.drawMapLinks(var1, var2, var4, var3); // L: 273 - } // L: 274 + this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 292 + this.drawMapLinks(var1, var2, var4, var3); // L: 293 + } // L: 294 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;III)V", - garbageValue = "463084567" + descriptor = "(Ljava/util/HashSet;IIB)V", + garbageValue = "-53" ) @Export("flashElements") void flashElements(HashSet var1, int var2, int var3) { - Iterator var4 = this.iconMap.values().iterator(); // L: 277 + Iterator var4 = this.iconMap.values().iterator(); // L: 297 while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 278 - if (var5.hasValidElement()) { // L: 280 - int var6 = var5.getElement(); // L: 281 - if (var1.contains(var6)) { // L: 282 - WorldMapElement var7 = UserComparator7.WorldMapElement_get(var6); // L: 283 - this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 284 + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 298 + if (var5.hasValidElement()) { // L: 300 + int var6 = var5.getElement(); // L: 301 + if (var1.contains(var6)) { // L: 302 + WorldMapElement var7 = class120.WorldMapElement_get(var6); // L: 303 + this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 304 } } } - this.method4059(var1, var2, var3); // L: 288 - } // L: 289 + this.method4537(var1, var2, var3); // L: 308 + } // L: 309 - @ObfuscatedName("d") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lhx;[Lqq;Lhn;S)V", - garbageValue = "-30301" + descriptor = "(Lii;[Lqd;Lix;S)V", + garbageValue = "8250" ) - void method4124(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method4528(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { int var4; int var5; - for (var4 = 0; var4 < 64; ++var4) { // L: 292 - for (var5 = 0; var5 < 64; ++var5) { // L: 293 - this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 294 - this.method4055(var4, var5, this.worldMapData_0, var1); // L: 295 + for (var4 = 0; var4 < 64; ++var4) { // L: 312 + for (var5 = 0; var5 < 64; ++var5) { // L: 313 + this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 314 + this.method4515(var4, var5, this.worldMapData_0, var1); // L: 315 } } - for (var4 = 0; var4 < 64; ++var4) { // L: 298 - for (var5 = 0; var5 < 64; ++var5) { // L: 299 - this.method4053(var4, var5, this.worldMapData_0, var1, var2); // L: 300 + for (var4 = 0; var4 < 64; ++var4) { // L: 318 + for (var5 = 0; var5 < 64; ++var5) { // L: 319 + this.method4530(var4, var5, this.worldMapData_0, var1, var2); // L: 320 } } - } // L: 303 + } // L: 323 - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lhx;[Lqq;Lhn;I)V", - garbageValue = "-1984333842" + descriptor = "(Lii;[Lqd;Lix;I)V", + garbageValue = "1922312294" ) - void method4144(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { - Iterator var4 = this.worldMapData1List.iterator(); // L: 306 + void method4620(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + Iterator var4 = this.worldMapData1List.iterator(); // L: 326 WorldMapData_1 var5; int var6; int var7; while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); // L: 307 + var5 = (WorldMapData_1)var4.next(); // L: 327 - for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 309 - for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 310 - this.drawTileGround(var6, var7, var5, var1, var3); // L: 311 - this.method4055(var6, var7, var5, var1); // L: 312 + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 329 + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 330 + this.drawTileGround(var6, var7, var5, var1, var3); // L: 331 + this.method4515(var6, var7, var5, var1); // L: 332 } } } - var4 = this.worldMapData1List.iterator(); // L: 317 + var4 = this.worldMapData1List.iterator(); // L: 337 while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); // L: 318 + var5 = (WorldMapData_1)var4.next(); // L: 338 - for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 320 - for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 321 - this.method4053(var6, var7, var5, var1, var2); // L: 322 + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 340 + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 341 + this.method4530(var6, var7, var5, var1, var2); // L: 342 } } } - } // L: 327 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(IILhz;Lhx;[Lqq;B)V", - garbageValue = "-27" - ) - void method4053(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { - this.method4098(var1, var2, var3); // L: 330 - this.method4057(var1, var2, var3, var5); // L: 331 - } // L: 332 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IILhz;Lhx;Lhn;I)V", - garbageValue = "-1568059728" - ) - @Export("drawTileGround") - void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { - int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 335 - int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 336 - if (var6 == -1 && var7 == -1) { // L: 337 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 338 - } - - int var8 = 16711935; // L: 340 - if (var7 != -1) { // L: 341 - var8 = class7.method53(var7, this.backgroundColor); // L: 342 - } - - if (var7 > -1 && var3.field2334[0][var1][var2] == 0) { // L: 344 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 345 - } else { - int var9 = this.method4056(var1, var2, var3, var5); // L: 348 - if (var7 == -1) { // L: 349 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 350 - } else { - var4.method4461(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2334[0][var1][var2], var3.field2342[0][var1][var2]); // L: 353 - } - } - } // L: 346 351 354 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(IILhz;Lhx;B)V", - garbageValue = "0" - ) - void method4055(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { - for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 357 - int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 358 - if (var6 > -1) { // L: 359 - int var7 = class7.method53(var6, this.backgroundColor); // L: 360 - if (var3.field2334[var5][var1][var2] == 0) { // L: 361 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 362 - } else { - var4.method4461(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2334[var5][var1][var2], var3.field2342[var5][var1][var2]); // L: 365 - } - } - } - - } // L: 369 + } // L: 347 @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(IILhz;Lhn;I)I", - garbageValue = "-952737975" + descriptor = "(IILib;Lii;[Lqd;I)V", + garbageValue = "-893644673" ) - int method4056(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { - return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 372 373 375 - } + void method4530(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { + this.method4535(var1, var2, var3); // L: 350 + this.method4534(var1, var2, var3, var5); // L: 351 + } // L: 352 - @ObfuscatedName("a") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IILhz;[Lqq;I)V", - garbageValue = "-902447610" + descriptor = "(IILib;Lii;Lix;I)V", + garbageValue = "337766862" ) - void method4057(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { - for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 379 - WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 380 - if (var6 != null && var6.length != 0) { // L: 381 - WorldMapDecoration[] var7 = var6; // L: 385 - - for (int var8 = 0; var8 < var7.length; ++var8) { // L: 386 - WorldMapDecoration var9 = var7[var8]; // L: 387 - if (class137.method2938(var9.decoration) || WorldMapEvent.method4505(var9.decoration)) { // L: 389 - ObjectComposition var10 = class146.getObjectDefinition(var9.objectDefinitionId); // L: 390 - if (var10.mapSceneId != -1) { // L: 391 - if (var10.mapSceneId != 46 && var10.mapSceneId != 52) { // L: 392 - var4[var10.mapSceneId].method8054(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 396 - } else { - var4[var10.mapSceneId].method8054(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 393 - } - } - } - } - } + @Export("drawTileGround") + void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { + int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 355 + int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 356 + if (var6 == -1 && var7 == -1) { // L: 357 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 358 } - } // L: 404 + int var8 = 16711935; // L: 360 + int var9; + if (var7 != -1) { // L: 361 + int var10 = this.backgroundColor; // L: 363 + FloorOverlayDefinition var12 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var7); // L: 367 + FloorOverlayDefinition var11; + if (var12 != null) { // L: 368 + var11 = var12; // L: 369 + } else { + byte[] var13 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var7); // L: 372 + var12 = new FloorOverlayDefinition(); // L: 373 + if (var13 != null) { // L: 374 + var12.decode(new Buffer(var13), var7); + } - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IILhz;B)V", - garbageValue = "-2" - ) - void method4098(int var1, int var2, AbstractWorldMapData var3) { - for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 407 - WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 408 - if (var5 != null && var5.length != 0) { // L: 409 - WorldMapDecoration[] var6 = var5; // L: 413 + var12.postDecode(); // L: 375 + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var12, (long)var7); // L: 376 + var11 = var12; // L: 377 + } - for (int var7 = 0; var7 < var6.length; ++var7) { // L: 414 - WorldMapDecoration var8 = var6[var7]; // L: 415 - int var10 = var8.decoration; // L: 418 - boolean var9 = var10 >= WorldMapDecorationType.field3517.id && var10 <= WorldMapDecorationType.field3500.id || var10 == WorldMapDecorationType.field3501.id; // L: 420 - if (var9) { // L: 422 - ObjectComposition var11 = class146.getObjectDefinition(var8.objectDefinitionId); // L: 423 - int var12 = var11.int1 != 0 ? -3407872 : -3355444; // L: 424 - if (var8.decoration == WorldMapDecorationType.field3517.id) { // L: 425 - this.method4071(var1, var2, var8.rotation, var12); // L: 426 - } - - if (var8.decoration == WorldMapDecorationType.field3509.id) { // L: 428 - this.method4071(var1, var2, var8.rotation, -3355444); // L: 429 - this.method4071(var1, var2, var8.rotation + 1, var12); // L: 430 - } - - if (var8.decoration == WorldMapDecorationType.field3500.id) { // L: 432 - if (var8.rotation == 0) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var12); // L: 433 - } - - if (var8.rotation == 1) { // L: 434 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var12); - } - - if (var8.rotation == 2) { // L: 435 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); - } - - if (var8.rotation == 3) { // L: 436 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); - } - } - - if (var8.decoration == WorldMapDecorationType.field3501.id) { // L: 438 - int var13 = var8.rotation % 2; // L: 439 - int var14; - if (var13 == 0) { // L: 440 - for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { // L: 441 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var14, 1, var12); // L: 442 - } - } else { - for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { // L: 446 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, var14 + this.pixelsPerTile * (63 - var2), 1, var12); // L: 447 - } - } - } - } + if (var11 == null) { // L: 380 + var9 = var10; // L: 381 + } else if (var11.secondaryRgb >= 0) { // L: 384 + var9 = var11.secondaryRgb | -16777216; // L: 385 + } else { + int var15; + if (var11.texture >= 0) { // L: 387 + var15 = class18.method243(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var11.texture), 96); // L: 388 + var9 = Rasterizer3D.Rasterizer3D_colorPalette[var15] | -16777216; // L: 389 + } else if (var11.primaryRgb == 16711935) { // L: 391 + var9 = var10; // L: 392 + } else { + var15 = class345.method6156(var11.hue, var11.saturation, var11.lightness); // L: 395 + int var14 = class18.method243(var15, 96); // L: 396 + var9 = Rasterizer3D.Rasterizer3D_colorPalette[var14] | -16777216; // L: 397 } } + + var8 = var9; // L: 400 } - } // L: 456 - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;II)V", - garbageValue = "1736856412" - ) - @Export("drawNonLinkMapIcons") - void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { - float var5 = (float)var4 / 64.0F; // L: 459 - float var6 = var5 / 2.0F; // L: 460 - Iterator var7 = this.iconMap.entrySet().iterator(); // L: 461 - - while (var7.hasNext()) { - Entry var8 = (Entry)var7.next(); // L: 462 - Coord var9 = (Coord)var8.getKey(); // L: 464 - int var10 = (int)((float)var1 + (float)var9.x * var5 - var6); // L: 465 - int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); // L: 466 - AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 467 - if (var12 != null && var12.hasValidElement()) { // L: 468 - var12.screenX = var10; // L: 469 - var12.screenY = var11; // L: 470 - WorldMapElement var13 = UserComparator7.WorldMapElement_get(var12.getElement()); // L: 471 - if (!var3.contains(var13.getObjectId())) { // L: 472 - this.method4064(var12, var10, var11, var5); // L: 473 - } + if (var7 > -1 && var3.field2845[0][var1][var2] == 0) { // L: 402 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 403 + } else { + var9 = this.method4533(var1, var2, var3, var5); // L: 406 + if (var7 == -1) { // L: 407 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 408 + } else { + var4.method4889(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2845[0][var1][var2], var3.field2847[0][var1][var2]); // L: 411 } } - - } // L: 478 + } // L: 404 409 412 @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;IIB)V", - garbageValue = "-7" + descriptor = "(IILib;Lii;B)V", + garbageValue = "121" ) - void method4059(HashSet var1, int var2, int var3) { - Iterator var4 = this.icon0List.iterator(); // L: 481 + void method4515(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { + for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 415 + int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 416 + if (var6 > -1) { // L: 417 + int var8 = this.backgroundColor; // L: 419 + FloorOverlayDefinition var10 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var6); // L: 423 + FloorOverlayDefinition var9; + if (var10 != null) { // L: 424 + var9 = var10; // L: 425 + } else { + byte[] var11 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var6); // L: 428 + var10 = new FloorOverlayDefinition(); // L: 429 + if (var11 != null) { // L: 430 + var10.decode(new Buffer(var11), var6); + } - while (var4.hasNext()) { // L: 490 - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 482 - if (var5.hasValidElement()) { // L: 484 - WorldMapElement var6 = UserComparator7.WorldMapElement_get(var5.getElement()); // L: 485 - if (var6 != null && var1.contains(var6.getObjectId())) { // L: 486 - this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 487 + var10.postDecode(); // L: 431 + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var10, (long)var6); // L: 432 + var9 = var10; // L: 433 + } + + int var7; + if (var9 == null) { // L: 436 + var7 = var8; // L: 437 + } else if (var9.secondaryRgb >= 0) { // L: 440 + var7 = var9.secondaryRgb | -16777216; // L: 441 + } else { + int var13; + if (var9.texture >= 0) { // L: 443 + var13 = class18.method243(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture), 96); // L: 444 + var7 = Rasterizer3D.Rasterizer3D_colorPalette[var13] | -16777216; // L: 445 + } else if (var9.primaryRgb == 16711935) { // L: 447 + var7 = var8; // L: 448 + } else { + var13 = class345.method6156(var9.hue, var9.saturation, var9.lightness); // L: 451 + int var12 = class18.method243(var13, 96); // L: 452 + var7 = Rasterizer3D.Rasterizer3D_colorPalette[var12] | -16777216; // L: 453 + } + } + + if (var3.field2845[var5][var1][var2] == 0) { // L: 457 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 458 + } else { + var4.method4889(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2845[var5][var1][var2], var3.field2847[var5][var1][var2]); // L: 461 } } } - } // L: 491 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Lfe;IIIIB)V", - garbageValue = "-104" - ) - @Export("drawBackgroundCircle") - void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { - SpritePixels var6 = var1.getSpriteBool(false); // L: 494 - if (var6 != null) { // L: 495 - var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 498 - if (var4 % var5 < var5 / 2) { // L: 499 - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 500 - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 501 - } - - } - } // L: 496 503 + } // L: 465 @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lhq;IIFI)V", - garbageValue = "-19271127" + descriptor = "(IILib;Lix;B)I", + garbageValue = "127" ) - void method4064(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = UserComparator7.WorldMapElement_get(var1.getElement()); // L: 506 - this.method4062(var5, var2, var3); // L: 507 - this.method4063(var1, var5, var2, var3, var4); // L: 508 - } // L: 509 + int method4533(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { + return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 468 469 471 + } - @ObfuscatedName("ae") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lfe;III)V", - garbageValue = "-714774385" + descriptor = "(IILib;[Lqd;B)V", + garbageValue = "20" ) - void method4062(WorldMapElement var1, int var2, int var3) { - SpritePixels var4 = var1.getSpriteBool(false); // L: 512 - if (var4 != null) { // L: 513 - int var5 = this.method4161(var4, var1.horizontalAlignment); // L: 514 - int var6 = this.method4123(var4, var1.verticalAlignment); // L: 515 - var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 516 - } + void method4534(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { + for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 475 + WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 476 + if (var6 != null && var6.length != 0) { // L: 477 + WorldMapDecoration[] var7 = var6; // L: 481 - } // L: 518 - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(Lhq;Lfe;IIFI)V", - garbageValue = "1984252761" - ) - void method4063(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { - WorldMapLabel var6 = var1.getLabel(); // L: 521 - if (var6 != null) { // L: 522 - if (var6.size.method3902(var5)) { // L: 525 - Font var7 = (Font)this.fonts.get(var6.size); // L: 528 - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1819, 0, 1, 0, var7.ascent / 2); // L: 529 - } - } - } // L: 523 526 530 - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;II)V", - garbageValue = "1065289794" - ) - @Export("drawMapLinks") - void drawMapLinks(int var1, int var2, HashSet var3, int var4) { - float var5 = (float)var4 / 64.0F; // L: 533 - Iterator var6 = this.icon0List.iterator(); // L: 534 - - while (var6.hasNext()) { // L: 543 - AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 535 - if (var7.hasValidElement()) { // L: 537 - int var8 = var7.coord2.x % 64; // L: 538 - int var9 = var7.coord2.y % 64; // L: 539 - var7.screenX = (int)((float)var1 + var5 * (float)var8); // L: 540 - var7.screenY = (int)(var5 * (float)(63 - var9) + (float)var2); // L: 541 - if (!var3.contains(var7.getElement())) { // L: 542 - this.method4064(var7, var7.screenX, var7.screenY, var5); // L: 545 + for (int var8 = 0; var8 < var7.length; ++var8) { // L: 482 + WorldMapDecoration var9 = var7[var8]; // L: 483 + if (ChatChannel.method1968(var9.decoration) || GraphicsObject.method1868(var9.decoration)) { // L: 485 + ObjectComposition var10 = class82.getObjectDefinition(var9.objectDefinitionId); // L: 486 + if (var10.mapSceneId != -1) { // L: 487 + if (var10.mapSceneId != 46 && var10.mapSceneId != 52) { // L: 488 + var4[var10.mapSceneId].method7927(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 492 + } else { + var4[var10.mapSceneId].method7927(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 489 + } + } + } } } } - } // L: 548 + } // L: 500 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(IILib;I)V", + garbageValue = "1254694573" + ) + void method4535(int var1, int var2, AbstractWorldMapData var3) { + for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 503 + WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 504 + if (var5 != null && var5.length != 0) { // L: 505 + WorldMapDecoration[] var6 = var5; // L: 509 + + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 510 + WorldMapDecoration var8 = var6[var7]; // L: 511 + if (PendingSpawn.method2164(var8.decoration)) { // L: 513 + ObjectComposition var9 = class82.getObjectDefinition(var8.objectDefinitionId); // L: 514 + int var10 = var9.int1 != 0 ? -3407872 : -3355444; // L: 515 + if (var8.decoration == WorldMapDecorationType.field3571.id) { // L: 516 + this.method4571(var1, var2, var8.rotation, var10); // L: 517 + } + + if (var8.decoration == WorldMapDecorationType.field3558.id) { // L: 519 + this.method4571(var1, var2, var8.rotation, -3355444); // L: 520 + this.method4571(var1, var2, var8.rotation + 1, var10); // L: 521 + } + + if (var8.decoration == WorldMapDecorationType.field3559.id) { // L: 523 + if (var8.rotation == 0) { // L: 524 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10); + } + + if (var8.rotation == 1) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); // L: 525 + } + + if (var8.rotation == 2) { // L: 526 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); + } + + if (var8.rotation == 3) { // L: 527 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); + } + } + + if (var8.decoration == WorldMapDecorationType.field3560.id) { // L: 529 + int var11 = var8.rotation % 2; // L: 530 + int var12; + if (var11 == 0) { // L: 531 + for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 532 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); // L: 533 + } + } else { + for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 537 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); // L: 538 + } + } + } + } + } + } + } + + } // L: 547 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IILjava/util/HashSet;IS)V", + garbageValue = "153" + ) + @Export("drawNonLinkMapIcons") + void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { + float var5 = (float)var4 / 64.0F; // L: 550 + float var6 = var5 / 2.0F; // L: 551 + Iterator var7 = this.iconMap.entrySet().iterator(); // L: 552 + + while (var7.hasNext()) { + Entry var8 = (Entry)var7.next(); // L: 553 + Coord var9 = (Coord)var8.getKey(); // L: 555 + int var10 = (int)((float)var9.x * var5 + (float)var1 - var6); // L: 556 + int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); // L: 557 + AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 558 + if (var12 != null && var12.hasValidElement()) { // L: 559 + var12.screenX = var10; // L: 560 + var12.screenY = var11; // L: 561 + WorldMapElement var13 = class120.WorldMapElement_get(var12.getElement()); // L: 562 + if (!var3.contains(var13.getObjectId())) { // L: 563 + this.method4575(var12, var10, var11, var5); // L: 564 + } + } + } + + } // L: 569 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Ljava/util/HashSet;IIS)V", + garbageValue = "256" + ) + void method4537(HashSet var1, int var2, int var3) { + Iterator var4 = this.icon0List.iterator(); // L: 572 + + while (var4.hasNext()) { + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 573 + if (var5.hasValidElement()) { // L: 575 + WorldMapElement var6 = class120.WorldMapElement_get(var5.getElement()); // L: 576 + if (var6 != null && var1.contains(var6.getObjectId())) { // L: 577 + this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 578 + } + } + } + + } // L: 582 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lfx;IIIII)V", + garbageValue = "-1051315032" + ) + @Export("drawBackgroundCircle") + void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { + SpritePixels var6 = var1.getSpriteBool(false); // L: 585 + if (var6 != null) { // L: 586 + var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 589 + if (var4 % var5 < var5 / 2) { // L: 590 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 591 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 592 + } + + } + } // L: 587 594 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Liw;IIFI)V", + garbageValue = "1241063243" + ) + void method4575(AbstractWorldMapIcon var1, int var2, int var3, float var4) { + WorldMapElement var5 = class120.WorldMapElement_get(var1.getElement()); // L: 597 + this.method4540(var5, var2, var3); // L: 598 + this.method4541(var1, var5, var2, var3, var4); // L: 599 + } // L: 600 + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(Lfx;III)V", + garbageValue = "2127201520" + ) + void method4540(WorldMapElement var1, int var2, int var3) { + SpritePixels var4 = var1.getSpriteBool(false); // L: 603 + if (var4 != null) { // L: 604 + int var5 = this.method4543(var4, var1.horizontalAlignment); // L: 605 + int var6 = this.method4619(var4, var1.verticalAlignment); // L: 606 + var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 607 + } + + } // L: 609 + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(Liw;Lfx;IIFI)V", + garbageValue = "1327912976" + ) + void method4541(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + WorldMapLabel var6 = var1.getLabel(); // L: 612 + if (var6 != null) { // L: 613 + if (var6.size.method4409(var5)) { // L: 616 + Font var7 = (Font)this.fonts.get(var6.size); // L: 619 + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1871, 0, 1, 0, var7.ascent / 2); // L: 620 + } + } + } // L: 614 617 621 @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Lqi;Lfw;I)I", - garbageValue = "1167261995" + descriptor = "(IILjava/util/HashSet;II)V", + garbageValue = "-1591705047" ) - int method4161(SpritePixels var1, HorizontalAlignment var2) { - switch(var2.value) { // L: 551 - case 1: - return -var1.subWidth / 2; // L: 562 + @Export("drawMapLinks") + void drawMapLinks(int var1, int var2, HashSet var3, int var4) { + float var5 = (float)var4 / 64.0F; // L: 624 + Iterator var6 = this.icon0List.iterator(); // L: 625 + + while (var6.hasNext()) { + AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 626 + if (var7.hasValidElement()) { // L: 628 + int var8 = var7.coord2.x % 64; // L: 629 + int var9 = var7.coord2.y % 64; // L: 630 + var7.screenX = (int)(var5 * (float)var8 + (float)var1); // L: 631 + var7.screenY = (int)((float)var2 + (float)(63 - var9) * var5); // L: 632 + if (!var3.contains(var7.getElement())) { // L: 633 + this.method4575(var7, var7.screenX, var7.screenY, var5); // L: 636 + } + } + } + + } // L: 639 + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lqr;Lfj;I)I", + garbageValue = "1784906213" + ) + int method4543(SpritePixels var1, HorizontalAlignment var2) { + switch(var2.value) { // L: 642 + case 0: + return -var1.subWidth / 2; // L: 645 case 2: - return 0; // L: 558 + return 0; // L: 649 default: - return -var1.subWidth; // L: 554 + return -var1.subWidth; // L: 653 } } - @ObfuscatedName("ak") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lqi;Lfg;I)I", - garbageValue = "1110187464" + descriptor = "(Lqr;Lfk;B)I", + garbageValue = "11" ) - int method4123(SpritePixels var1, VerticalAlignment var2) { - switch(var2.value) { // L: 568 + int method4619(SpritePixels var1, VerticalAlignment var2) { + switch(var2.value) { // L: 659 + case 0: + return 0; // L: 662 case 1: - return -var1.subHeight / 2; // L: 579 - case 2: - return 0; // L: 575 + return -var1.subHeight / 2; // L: 666 default: - return -var1.subHeight; // L: 571 + return -var1.subHeight; // L: 670 } } @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(IB)Lho;", - garbageValue = "-108" + descriptor = "(II)Lip;", + garbageValue = "1955466429" ) - WorldMapLabel method4082(int var1) { - WorldMapElement var2 = UserComparator7.WorldMapElement_get(var1); // L: 606 - return this.createMapLabel(var2); // L: 607 + WorldMapLabel method4545(int var1) { + WorldMapElement var2 = class120.WorldMapElement_get(var1); // L: 676 + return this.createMapLabel(var2); // L: 677 } - @ObfuscatedName("al") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lfe;I)Lho;", - garbageValue = "2017474757" + descriptor = "(Lfx;B)Lip;", + garbageValue = "-43" ) @Export("createMapLabel") WorldMapLabel createMapLabel(WorldMapElement var1) { - if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 611 - int var3 = var1.textSize; // L: 615 - WorldMapLabelSize[] var4 = WorldMapLabelSize.method3901(); // L: 618 - int var5 = 0; + if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 681 + int var3 = var1.textSize; // L: 685 + WorldMapLabelSize[] var4 = new WorldMapLabelSize[]{WorldMapLabelSize.WorldMapLabelSize_medium, WorldMapLabelSize.WorldMapLabelSize_large, WorldMapLabelSize.WorldMapLabelSize_small}; // L: 690 + WorldMapLabelSize[] var5 = var4; // L: 692 + int var6 = 0; WorldMapLabelSize var2; while (true) { - if (var5 >= var4.length) { - var2 = null; // L: 629 + if (var6 >= var5.length) { + var2 = null; // L: 703 break; } - WorldMapLabelSize var6 = var4[var5]; // L: 620 - if (var3 == var6.field2215) { // L: 622 - var2 = var6; // L: 623 + WorldMapLabelSize var7 = var5[var6]; // L: 694 + if (var3 == var7.field2712) { // L: 696 + var2 = var7; // L: 697 break; } - ++var5; // L: 619 + ++var6; // L: 693 } - if (var2 == null) { // L: 632 - return null; // L: 633 + if (var2 == null) { // L: 706 + return null; // L: 707 } else { - Font var14 = (Font)this.fonts.get(var2); // L: 635 - if (var14 == null) { // L: 636 - return null; // L: 637 + Font var14 = (Font)this.fonts.get(var2); // L: 709 + if (var14 == null) { // L: 710 + return null; // L: 711 } else { - int var15 = var14.lineCount(var1.name, 1000000); // L: 639 - String[] var7 = new String[var15]; // L: 640 - var14.breakLines(var1.name, (int[])null, var7); // L: 641 - int var8 = var7.length * var14.ascent / 2; // L: 642 - int var9 = 0; // L: 643 - String[] var10 = var7; // L: 645 + var6 = var14.lineCount(var1.name, 1000000); // L: 713 + String[] var15 = new String[var6]; // L: 714 + var14.breakLines(var1.name, (int[])null, var15); // L: 715 + int var8 = var15.length * var14.ascent / 2; // L: 716 + int var9 = 0; // L: 717 + String[] var10 = var15; // L: 719 - for (int var11 = 0; var11 < var10.length; ++var11) { // L: 646 - String var12 = var10[var11]; // L: 647 - int var13 = var14.stringWidth(var12); // L: 649 - if (var13 > var9) { // L: 650 - var9 = var13; // L: 651 + for (int var11 = 0; var11 < var10.length; ++var11) { // L: 720 + String var12 = var10[var11]; // L: 721 + int var13 = var14.stringWidth(var12); // L: 723 + if (var13 > var9) { // L: 724 + var9 = var13; // L: 725 } } - return new WorldMapLabel(var1.name, var9, var8, var2); // L: 656 + return new WorldMapLabel(var1.name, var9, var8, var2); // L: 730 } } } else { - return null; // L: 612 + return null; // L: 682 } } - @ObfuscatedName("av") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(IIIIII)Ljava/util/List;", - garbageValue = "-1950583236" + garbageValue = "1348030891" ) - List method4069(int var1, int var2, int var3, int var4, int var5) { - LinkedList var6 = new LinkedList(); // L: 660 - if (var4 >= var1 && var5 >= var2) { // L: 661 - if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 662 + List method4547(int var1, int var2, int var3, int var4, int var5) { + LinkedList var6 = new LinkedList(); // L: 734 + if (var4 >= var1 && var5 >= var2) { // L: 735 + if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 736 Iterator var7 = this.iconMap.values().iterator(); AbstractWorldMapIcon var8; - while (var7.hasNext()) { // L: 663 - var8 = (AbstractWorldMapIcon)var7.next(); // L: 664 - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 666 - var6.add(var8); // L: 667 + while (var7.hasNext()) { // L: 737 + var8 = (AbstractWorldMapIcon)var7.next(); // L: 738 + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 740 + var6.add(var8); // L: 741 } } - var7 = this.icon0List.iterator(); // L: 671 + var7 = this.icon0List.iterator(); // L: 745 while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); // L: 672 - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 674 - var6.add(var8); // L: 675 + var8 = (AbstractWorldMapIcon)var7.next(); // L: 746 + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 748 + var6.add(var8); // L: 749 } } - return var6; // L: 679 + return var6; // L: 753 } else { - return var6; // L: 670 + return var6; // L: 744 } } else { return var6; } } - @ObfuscatedName("at") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(I)Ljava/util/List;", - garbageValue = "1649195814" + garbageValue = "621020876" ) @Export("icons") List icons() { - LinkedList var1 = new LinkedList(); // L: 683 - var1.addAll(this.icon0List); // L: 684 - var1.addAll(this.iconMap.values()); // L: 685 - return var1; // L: 686 + LinkedList var1 = new LinkedList(); // L: 757 + var1.addAll(this.icon0List); // L: 758 + var1.addAll(this.iconMap.values()); // L: 759 + return var1; // L: 760 } - @ObfuscatedName("an") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "2107740024" + garbageValue = "1095602630" ) - void method4071(int var1, int var2, int var3, int var4) { - var3 %= 4; // L: 690 - if (var3 == 0) { // L: 691 + void method4571(int var1, int var2, int var3, int var4) { + var3 %= 4; // L: 764 + if (var3 == 0) { // L: 765 Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 1) { // L: 692 + if (var3 == 1) { // L: 766 Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 2) { // L: 693 + if (var3 == 2) { // L: 767 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: 694 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 768 } - } // L: 695 + } // L: 769 + + @ObfuscatedName("fn") + @ObfuscatedSignature( + descriptor = "(IZZZI)Lle;", + garbageValue = "-1474520480" + ) + @Export("newArchive") + static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { + ArchiveDisk var4 = null; // L: 2071 + if (JagexCache.JagexCache_dat2File != null) { // L: 2072 + var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idxFiles[var0], 1000000); + } + + return new Archive(var4, class135.masterDisk, var0, var1, var2, var3); // L: 2073 + } + + @ObfuscatedName("ji") + @ObfuscatedSignature( + descriptor = "([Lki;IIIIIIIB)V", + garbageValue = "72" + ) + @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: 11210 + Widget var9 = var0[var8]; // L: 11211 + if (var9 != null && var9.parentId == var1 && (var9.method5448() || UrlRequester.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent)) { // L: 11212 11213 11214 + if (var9.isIf3) { // L: 11215 + if (class434.isComponentHidden(var9)) { // L: 11216 + continue; + } + } else if (var9.type == 0 && var9 != class144.mousedOverWidgetIf1 && class434.isComponentHidden(var9)) { // L: 11219 + continue; + } + + if (var9.type == 11 && var9.method5517(UserComparator7.urlRequester)) { // L: 11221 11222 + if (var9.method5498()) { // L: 11223 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var9); // L: 11224 + UserComparator8.revalidateWidgetScroll(var9.children, var9, true); // L: 11225 + } + + if (var9.field3460 != null) { // L: 11227 + ScriptEvent var10 = new ScriptEvent(); // L: 11228 + var10.widget = var9; // L: 11229 + var10.args = var9.field3460; // L: 11230 + Client.scriptEvents.addFirst(var10); // L: 11231 + } + } + + int var26 = var9.x + var6; // L: 11235 + int var11 = var7 + var9.y; // L: 11236 + int var12; + int var13; + int var14; + int var15; + int var17; + int var18; + if (var9.type == 2) { // L: 11241 + var12 = var2; // L: 11242 + var13 = var3; // L: 11243 + var14 = var4; // L: 11244 + var15 = var5; // L: 11245 + } else { + int var16; + if (var9.type == 9) { // L: 11247 + var16 = var26; // L: 11248 + var17 = var11; // L: 11249 + var18 = var26 + var9.width; // L: 11250 + int var19 = var11 + var9.height; // L: 11251 + if (var18 < var26) { // L: 11252 + var16 = var18; // L: 11254 + var18 = var26; // L: 11255 + } + + if (var19 < var11) { // L: 11257 + var17 = var19; // L: 11259 + var19 = var11; // L: 11260 + } + + ++var18; // L: 11262 + ++var19; // L: 11263 + var12 = var16 > var2 ? var16 : var2; // L: 11264 + var13 = var17 > var3 ? var17 : var3; // L: 11265 + var14 = var18 < var4 ? var18 : var4; // L: 11266 + var15 = var19 < var5 ? var19 : var5; // L: 11267 + } else { + var16 = var26 + var9.width; // L: 11270 + var17 = var11 + var9.height; // L: 11271 + var12 = var26 > var2 ? var26 : var2; // L: 11272 + var13 = var11 > var3 ? var11 : var3; // L: 11273 + var14 = var16 < var4 ? var16 : var4; // L: 11274 + var15 = var17 < var5 ? var17 : var5; // L: 11275 + } + } + + if (var9 == Client.clickedWidget) { // L: 11277 + Client.field675 = true; // L: 11278 + Client.field653 = var26; // L: 11279 + Client.field612 = var11; // L: 11280 + } + + boolean var34 = false; // L: 11282 + if (var9.field3473) { // L: 11283 + switch(Client.field487) { // L: 11284 + case 0: + var34 = true; // L: 11296 + case 1: + default: + break; + case 2: + if (Client.field657 == var9.id >>> 16) { // L: 11286 + var34 = true; // L: 11287 + } + break; + case 3: + if (var9.id == Client.field657) { // L: 11291 + var34 = true; // L: 11292 + } + } + } + + if (var34 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 11300 + if (var9.isIf3) { // L: 11301 + ScriptEvent var27; + if (var9.noClickThrough) { // L: 11302 + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11303 + for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11304 + if (var27.isMouseInputEvent) { // L: 11305 + var27.remove(); // L: 11306 + var27.widget.containsMouse = false; // L: 11307 + } + } + + if (SoundSystem.widgetDragDuration == 0) { // L: 11310 + Client.clickedWidget = null; // L: 11311 + Client.clickedWidgetParent = null; // L: 11312 + } + + if (!Client.isMenuOpen) { // L: 11314 + class20.addCancelMenuEntry(); // L: 11315 + } + } + } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11319 11320 + for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11321 + if (var27.isMouseInputEvent && var27.widget.onScroll == var27.args) { // L: 11322 + var27.remove(); // L: 11323 + } + } + } + } + + var17 = MouseHandler.MouseHandler_x; // L: 11329 + var18 = MouseHandler.MouseHandler_y; // L: 11330 + if (MouseHandler.MouseHandler_lastButton != 0) { // L: 11331 + var17 = MouseHandler.MouseHandler_lastPressedX; // L: 11332 + var18 = MouseHandler.MouseHandler_lastPressedY; // L: 11333 + } + + boolean var35 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 11335 + if (var9.contentType == 1337) { // L: 11336 + if (!Client.isLoading && !Client.isMenuOpen && var35) { // L: 11337 + WorldMapEvent.addSceneMenuOptions(var17, var18, var12, var13); + } + } else if (var9.contentType == 1338) { // L: 11340 + class129.checkIfMinimapClicked(var9, var26, var11); // L: 11341 + } else { + if (var9.contentType == 1400) { // L: 11344 + ServerPacket.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var35, var26, var11, var9.width, var9.height); // L: 11345 + } + + if (!Client.isMenuOpen && var35) { // L: 11347 + if (var9.contentType == 1400) { // L: 11348 + ServerPacket.worldMap.addElementMenuOptions(var26, var11, var9.width, var9.height, var17, var18); // L: 11349 + } else { + class160.Widget_addToMenu(var9, var17 - var26, var18 - var11); // L: 11352 + } + } + + boolean var21; + int var29; + if (var34) { // L: 11355 + for (int var20 = 0; var20 < var9.field3474.length; ++var20) { // L: 11356 + var21 = false; // L: 11357 + boolean var28 = false; // L: 11358 + if (!var21 && var9.field3474[var20] != null) { // L: 11359 + for (var29 = 0; var29 < var9.field3474[var20].length; ++var29) { // L: 11360 + boolean var24 = false; // L: 11361 + if (var9.field3527 != null) { // L: 11362 + var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3474[var20][var29]]; // L: 11363 + } + + if (class145.method2991(var9.field3474[var20][var29]) || var24) { // L: 11365 + var21 = true; // L: 11366 + if (var9.field3527 != null && var9.field3527[var20] > Client.cycle) { // L: 11367 + break; + } + + byte var33 = var9.field3419[var20][var29]; // L: 11368 + if (var33 == 0 || ((var33 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var33 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var33 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var33 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 11369 11370 11371 11372 11373 + var28 = true; // L: 11375 + break; // L: 11376 + } + } + } + } + + if (var28) { // L: 11381 + if (var20 < 10) { // L: 11382 + TaskHandler.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); + } else if (var20 == 10) { // L: 11383 + MusicPatchNode2.Widget_runOnTargetLeave(); // L: 11384 + class93.selectSpell(var9.id, var9.childIndex, WorldMapSection1.Widget_unpackTargetMask(UrlRequester.getWidgetFlags(var9)), var9.itemId); // L: 11385 + Client.selectedSpellActionName = TriBool.Widget_getSpellActionName(var9); // L: 11386 + if (Client.selectedSpellActionName == null) { // L: 11387 + Client.selectedSpellActionName = "null"; + } + + Client.selectedSpellName = var9.dataText + class166.colorStartTag(16777215); // L: 11388 + } + + var29 = var9.field3476[var20]; // L: 11390 + if (var9.field3527 == null) { // L: 11391 + var9.field3527 = new int[var9.field3474.length]; + } + + if (var9.field3481 == null) { // L: 11392 + var9.field3481 = new int[var9.field3474.length]; + } + + if (var29 != 0) { // L: 11393 + if (var9.field3527[var20] == 0) { // L: 11394 + var9.field3527[var20] = var29 + Client.cycle + var9.field3481[var20]; + } else { + var9.field3527[var20] = var29 + Client.cycle; // L: 11395 + } + } else { + var9.field3527[var20] = Integer.MAX_VALUE; // L: 11397 + } + } + + if (!var21 && var9.field3527 != null) { // L: 11399 11400 + var9.field3527[var20] = 0; + } + } + } + + if (var9.isIf3) { // L: 11404 + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11405 + var35 = true; + } else { + var35 = false; // L: 11406 + } + + boolean var36 = false; // L: 11407 + if ((MouseHandler.MouseHandler_currentButton == 1 || !Login.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var35) { // L: 11408 + var36 = true; + } + + var21 = false; // L: 11409 + if ((MouseHandler.MouseHandler_lastButton == 1 || !Login.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 11410 + var21 = true; + } + + int[] var22; + if (var21) { // L: 11411 + class10.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var26, MouseHandler.MouseHandler_lastPressedY - var11); // L: 11412 + if (var9.type == 11 && var9.method5474(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY, var6, var7)) { // L: 11413 + switch(var9.method5457()) { // L: 11414 + case 0: + ScriptEvent.openURL(var9.method5480(), true, false); // L: 11416 + break; + case 1: + if (class152.method3039(UrlRequester.getWidgetFlags(var9))) { // L: 11419 + var22 = var9.method5460(); // L: 11420 + if (var22 != null) { // L: 11421 + PacketBufferNode var23 = WallDecoration.getPacketBufferNode(ClientPacket.field3000, Client.packetWriter.isaacCipher); // L: 11422 + var23.packetBuffer.writeInt(var22[2]); // L: 11423 + var23.packetBuffer.writeIntME(var9.id); // L: 11424 + var23.packetBuffer.method7550(var9.childIndex); // L: 11425 + var23.packetBuffer.writeIntME(var22[1]); // L: 11426 + var23.packetBuffer.writeIntME(var22[0]); // L: 11427 + var23.packetBuffer.writeInt(var9.method5458()); // L: 11428 + Client.packetWriter.addNode(var23); // L: 11429 + } + } + } + } + } + + if (var9.contentType == 1400) { // L: 11436 + ServerPacket.worldMap.method7025(var17, var18, var35 & var36, var35 & var21); // L: 11437 + } + + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var35 && class229.method4727(UrlRequester.getWidgetFlags(var9))) { // L: 11439 + Client.draggedOnWidget = var9; + } + + if (var9 == Client.clickedWidgetParent) { // L: 11440 + Client.field574 = true; // L: 11441 + Client.field747 = var26; // L: 11442 + Client.field674 = var11; // L: 11443 + } + + if (var9.hasListener) { // L: 11445 + ScriptEvent var37; + if (var35 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 11446 + var37 = new ScriptEvent(); // L: 11447 + var37.isMouseInputEvent = true; // L: 11448 + var37.widget = var9; // L: 11449 + var37.mouseY = Client.mouseWheelRotation; // L: 11450 + var37.args = var9.onScroll; // L: 11451 + Client.scriptEvents.addFirst(var37); // L: 11452 + } + + if (Client.clickedWidget != null || Canvas.dragInventoryWidget != null || Client.isMenuOpen) { // L: 11454 + var21 = false; // L: 11455 + var36 = false; // L: 11456 + var35 = false; // L: 11457 + } + + if (!var9.isClicked && var21) { // L: 11459 + var9.isClicked = true; // L: 11460 + if (var9.onClick != null) { // L: 11461 + var37 = new ScriptEvent(); // L: 11462 + var37.isMouseInputEvent = true; // L: 11463 + var37.widget = var9; // L: 11464 + var37.mouseX = MouseHandler.MouseHandler_lastPressedX - var26; // L: 11465 + var37.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 11466 + var37.args = var9.onClick; // L: 11467 + Client.scriptEvents.addFirst(var37); // L: 11468 + } + } + + if (var9.isClicked && var36 && var9.onClickRepeat != null) { // L: 11471 11472 + var37 = new ScriptEvent(); // L: 11473 + var37.isMouseInputEvent = true; // L: 11474 + var37.widget = var9; // L: 11475 + var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11476 + var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11477 + var37.args = var9.onClickRepeat; // L: 11478 + Client.scriptEvents.addFirst(var37); // L: 11479 + } + + if (var9.isClicked && !var36) { // L: 11482 + var9.isClicked = false; // L: 11483 + if (var9.onRelease != null) { // L: 11484 + var37 = new ScriptEvent(); // L: 11485 + var37.isMouseInputEvent = true; // L: 11486 + var37.widget = var9; // L: 11487 + var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11488 + var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11489 + var37.args = var9.onRelease; // L: 11490 + Client.field701.addFirst(var37); // L: 11491 + } + } + + if (var36 && var9.onHold != null) { // L: 11494 11495 + var37 = new ScriptEvent(); // L: 11496 + var37.isMouseInputEvent = true; // L: 11497 + var37.widget = var9; // L: 11498 + var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11499 + var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11500 + var37.args = var9.onHold; // L: 11501 + Client.scriptEvents.addFirst(var37); // L: 11502 + } + + if (!var9.containsMouse && var35) { // L: 11505 + var9.containsMouse = true; // L: 11506 + if (var9.onMouseOver != null) { // L: 11507 + var37 = new ScriptEvent(); // L: 11508 + var37.isMouseInputEvent = true; // L: 11509 + var37.widget = var9; // L: 11510 + var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11511 + var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11512 + var37.args = var9.onMouseOver; // L: 11513 + Client.scriptEvents.addFirst(var37); // L: 11514 + } + } + + if (var9.containsMouse && var35 && var9.onMouseRepeat != null) { // L: 11517 11518 + var37 = new ScriptEvent(); // L: 11519 + var37.isMouseInputEvent = true; // L: 11520 + var37.widget = var9; // L: 11521 + var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11522 + var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11523 + var37.args = var9.onMouseRepeat; // L: 11524 + Client.scriptEvents.addFirst(var37); // L: 11525 + } + + if (var9.containsMouse && !var35) { // L: 11528 + var9.containsMouse = false; // L: 11529 + if (var9.onMouseLeave != null) { // L: 11530 + var37 = new ScriptEvent(); // L: 11531 + var37.isMouseInputEvent = true; // L: 11532 + var37.widget = var9; // L: 11533 + var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11534 + var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11535 + var37.args = var9.onMouseLeave; // L: 11536 + Client.field701.addFirst(var37); // L: 11537 + } + } + + if (var9.onTimer != null) { // L: 11540 + var37 = new ScriptEvent(); // L: 11541 + var37.widget = var9; // L: 11542 + var37.args = var9.onTimer; // L: 11543 + Client.field698.addFirst(var37); // L: 11544 + } + + ScriptEvent var25; + int var39; + int var40; + if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3538) { // L: 11546 + if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3538 <= 32) { // L: 11547 + label825: + for (var40 = var9.field3538; var40 < Client.changedVarpCount; ++var40) { // L: 11554 + var29 = Client.changedVarps[var40 & 31]; // L: 11555 + + for (var39 = 0; var39 < var9.varTransmitTriggers.length; ++var39) { // L: 11556 + if (var29 == var9.varTransmitTriggers[var39]) { // L: 11557 + var25 = new ScriptEvent(); // L: 11558 + var25.widget = var9; // L: 11559 + var25.args = var9.onVarTransmit; // L: 11560 + Client.scriptEvents.addFirst(var25); // L: 11561 + break label825; // L: 11562 + } + } + } + } else { + var37 = new ScriptEvent(); // L: 11548 + var37.widget = var9; // L: 11549 + var37.args = var9.onVarTransmit; // L: 11550 + Client.scriptEvents.addFirst(var37); // L: 11551 + } + + var9.field3538 = Client.changedVarpCount; // L: 11567 + } + + if (var9.onInvTransmit != null && Client.field683 > var9.field3539) { // L: 11569 + if (var9.invTransmitTriggers != null && Client.field683 - var9.field3539 <= 32) { // L: 11570 + label801: + for (var40 = var9.field3539; var40 < Client.field683; ++var40) { // L: 11577 + var29 = Client.changedItemContainers[var40 & 31]; // L: 11578 + + for (var39 = 0; var39 < var9.invTransmitTriggers.length; ++var39) { // L: 11579 + if (var29 == var9.invTransmitTriggers[var39]) { // L: 11580 + var25 = new ScriptEvent(); // L: 11581 + var25.widget = var9; // L: 11582 + var25.args = var9.onInvTransmit; // L: 11583 + Client.scriptEvents.addFirst(var25); // L: 11584 + break label801; // L: 11585 + } + } + } + } else { + var37 = new ScriptEvent(); // L: 11571 + var37.widget = var9; // L: 11572 + var37.args = var9.onInvTransmit; // L: 11573 + Client.scriptEvents.addFirst(var37); // L: 11574 + } + + var9.field3539 = Client.field683; // L: 11590 + } + + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3540) { // L: 11592 + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3540 <= 32) { // L: 11593 + label777: + for (var40 = var9.field3540; var40 < Client.changedSkillsCount; ++var40) { // L: 11600 + var29 = Client.changedSkills[var40 & 31]; // L: 11601 + + for (var39 = 0; var39 < var9.statTransmitTriggers.length; ++var39) { // L: 11602 + if (var29 == var9.statTransmitTriggers[var39]) { // L: 11603 + var25 = new ScriptEvent(); // L: 11604 + var25.widget = var9; // L: 11605 + var25.args = var9.onStatTransmit; // L: 11606 + Client.scriptEvents.addFirst(var25); // L: 11607 + break label777; // L: 11608 + } + } + } + } else { + var37 = new ScriptEvent(); // L: 11594 + var37.widget = var9; // L: 11595 + var37.args = var9.onStatTransmit; // L: 11596 + Client.scriptEvents.addFirst(var37); // L: 11597 + } + + var9.field3540 = Client.changedSkillsCount; // L: 11613 + } + + if (Client.chatCycle > var9.field3524 && var9.onChatTransmit != null) { // L: 11615 + var37 = new ScriptEvent(); // L: 11616 + var37.widget = var9; // L: 11617 + var37.args = var9.onChatTransmit; // L: 11618 + Client.scriptEvents.addFirst(var37); // L: 11619 + } + + if (Client.field689 > var9.field3524 && var9.onFriendTransmit != null) { // L: 11621 + var37 = new ScriptEvent(); // L: 11622 + var37.widget = var9; // L: 11623 + var37.args = var9.onFriendTransmit; // L: 11624 + Client.scriptEvents.addFirst(var37); // L: 11625 + } + + if (Client.field690 > var9.field3524 && var9.onClanTransmit != null) { // L: 11627 + var37 = new ScriptEvent(); // L: 11628 + var37.widget = var9; // L: 11629 + var37.args = var9.onClanTransmit; // L: 11630 + Client.scriptEvents.addFirst(var37); // L: 11631 + } + + if (Client.field691 > var9.field3524 && var9.field3513 != null) { // L: 11633 + var37 = new ScriptEvent(); // L: 11634 + var37.widget = var9; // L: 11635 + var37.args = var9.field3513; // L: 11636 + Client.scriptEvents.addFirst(var37); // L: 11637 + } + + if (Client.field692 > var9.field3524 && var9.field3456 != null) { // L: 11639 + var37 = new ScriptEvent(); // L: 11640 + var37.widget = var9; // L: 11641 + var37.args = var9.field3456; // L: 11642 + Client.scriptEvents.addFirst(var37); // L: 11643 + } + + if (Client.field762 > var9.field3524 && var9.onStockTransmit != null) { // L: 11645 + var37 = new ScriptEvent(); // L: 11646 + var37.widget = var9; // L: 11647 + var37.args = var9.onStockTransmit; // L: 11648 + Client.scriptEvents.addFirst(var37); // L: 11649 + } + + if (Client.field512 > var9.field3524 && var9.field3520 != null) { // L: 11651 + var37 = new ScriptEvent(); // L: 11652 + var37.widget = var9; // L: 11653 + var37.args = var9.field3520; // L: 11654 + Client.scriptEvents.addFirst(var37); // L: 11655 + } + + if (Client.field695 > var9.field3524 && var9.onMiscTransmit != null) { // L: 11657 + var37 = new ScriptEvent(); // L: 11658 + var37.widget = var9; // L: 11659 + var37.args = var9.onMiscTransmit; // L: 11660 + Client.scriptEvents.addFirst(var37); // L: 11661 + } + + var9.field3524 = Client.cycleCntr; // L: 11663 + if (var9.onKey != null) { // L: 11664 + for (var40 = 0; var40 < Client.field719; ++var40) { // L: 11665 + ScriptEvent var38 = new ScriptEvent(); // L: 11666 + var38.widget = var9; // L: 11667 + var38.keyTyped = Client.field721[var40]; // L: 11668 + var38.keyPressed = Client.field720[var40]; // L: 11669 + var38.args = var9.onKey; // L: 11670 + Client.scriptEvents.addFirst(var38); // L: 11671 + } + } + + ScriptEvent var32; + if (var9.field3443 != null) { // L: 11674 + var22 = InterfaceParent.method2071(); // L: 11675 + + for (var29 = 0; var29 < var22.length; ++var29) { // L: 11676 + var32 = new ScriptEvent(); // L: 11677 + var32.widget = var9; // L: 11678 + var32.keyTyped = var22[var29]; // L: 11679 + var32.args = var9.field3443; // L: 11680 + Client.scriptEvents.addFirst(var32); // L: 11681 + } + } + + if (var9.field3510 != null) { // L: 11684 + var22 = ServerPacket.method5020(); // L: 11685 + + for (var29 = 0; var29 < var22.length; ++var29) { // L: 11686 + var32 = new ScriptEvent(); // L: 11687 + var32.widget = var9; // L: 11688 + var32.keyTyped = var22[var29]; // L: 11689 + var32.args = var9.field3510; // L: 11690 + Client.scriptEvents.addFirst(var32); // L: 11691 + } + } + } + } + + if (!var9.isIf3) { // L: 11696 + if (Client.clickedWidget != null || Canvas.dragInventoryWidget != null || Client.isMenuOpen) { // L: 11697 + 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: 11698 + if (var9.mouseOverRedirect >= 0) { // L: 11699 + class144.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + } else { + class144.mousedOverWidgetIf1 = var9; // L: 11700 + } + } + + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11702 + class113.field1422 = var9; // L: 11703 + } + + if (var9.scrollHeight > var9.height) { // L: 11705 + FileSystem.method3168(var9, var26 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); + } + } + + if (var9.type == 0) { // L: 11707 + updateInterface(var0, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); // L: 11708 + if (var9.children != null) { // L: 11709 + updateInterface(var9.children, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); + } + + InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); // L: 11710 + if (var30 != null) { // L: 11711 + if (var30.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 11712 + for (ScriptEvent var31 = (ScriptEvent)Client.scriptEvents.last(); var31 != null; var31 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11713 + if (var31.isMouseInputEvent) { // L: 11714 + var31.remove(); // L: 11715 + var31.widget.containsMouse = false; // L: 11716 + } + } + + if (SoundSystem.widgetDragDuration == 0) { // L: 11719 + Client.clickedWidget = null; // L: 11720 + Client.clickedWidgetParent = null; // L: 11721 + } + + if (!Client.isMenuOpen) { // L: 11723 + class20.addCancelMenuEntry(); // L: 11724 + } + } + + class4.updateRootInterface(var30.group, var12, var13, var14, var15, var26, var11); // L: 11727 + } + } + } + } + } + } + + } // L: 11731 } diff --git a/runescape-client/src/main/java/WorldMapScaleHandler.java b/runescape-client/src/main/java/WorldMapScaleHandler.java index 4597c0d344..5a4972185d 100644 --- a/runescape-client/src/main/java/WorldMapScaleHandler.java +++ b/runescape-client/src/main/java/WorldMapScaleHandler.java @@ -4,16 +4,16 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hx") +@ObfuscatedName("ii") @Implements("WorldMapScaleHandler") public class WorldMapScaleHandler { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1151407941 + intValue = 1483330645 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("tileTemplates") byte[][][] tileTemplates; @@ -21,25 +21,25 @@ public class WorldMapScaleHandler { this.pixelsPerTile = var1; // L: 10 } // L: 11 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IIIIIIIII)V", - garbageValue = "344755963" + garbageValue = "-1818081190" ) - void method4461(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + void method4889(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.method4462(var8, var7); // L: 15 - var7 = this.method4501(var7); // L: 16 + var8 = this.method4890(var8, var7); // L: 15 + var7 = this.method4891(var7); // L: 16 Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); // L: 17 } } // L: 18 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "672085434" + descriptor = "(IIB)I", + garbageValue = "96" ) - int method4462(int var1, int var2) { + int method4890(int var1, int var2) { if (var2 == 9) { // L: 21 var1 = var1 + 1 & 3; } @@ -55,12 +55,12 @@ public class WorldMapScaleHandler { return var1; // L: 24 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-134477259" + descriptor = "(IS)I", + garbageValue = "-17656" ) - int method4501(int var1) { + int method4891(int var1) { if (var1 != 9 && var1 != 10) { // L: 28 return var1 == 11 ? 8 : var1; // L: 29 } else { @@ -68,10 +68,10 @@ public class WorldMapScaleHandler { } } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "2" + descriptor = "(I)V", + garbageValue = "-1137561741" ) @Export("init") void init() { @@ -88,10 +88,10 @@ public class WorldMapScaleHandler { } } // L: 35 46 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-919476586" + garbageValue = "1927655821" ) @Export("init0") void init0() { @@ -116,8 +116,8 @@ public class WorldMapScaleHandler { for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 60 for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 61 - if (var4 <= var3) { // L: 62 - var1[var2] = -1; + if (var4 <= var3) { + var1[var2] = -1; // L: 62 } ++var2; // L: 63 @@ -155,10 +155,10 @@ public class WorldMapScaleHandler { this.tileTemplates[0][3] = var1; // L: 84 } // L: 85 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-548231611" + garbageValue = "1464832295" ) @Export("init1") void init1() { @@ -226,10 +226,10 @@ public class WorldMapScaleHandler { this.tileTemplates[1][3] = var1; // L: 127 } // L: 128 - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "146729374" + garbageValue = "-374640342" ) @Export("init2") void init2() { @@ -293,10 +293,10 @@ public class WorldMapScaleHandler { this.tileTemplates[2][3] = var1; // L: 166 } // L: 167 - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-31" + descriptor = "(I)V", + garbageValue = "-1850363637" ) @Export("init3") void init3() { @@ -360,10 +360,10 @@ public class WorldMapScaleHandler { this.tileTemplates[3][3] = var1; // L: 205 } // L: 206 - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "3447" + descriptor = "(I)V", + garbageValue = "-1633438908" ) @Export("init4") void init4() { @@ -427,10 +427,10 @@ public class WorldMapScaleHandler { this.tileTemplates[4][3] = var1; // L: 244 } // L: 245 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "4210752" + garbageValue = "2103912678" ) @Export("init5") void init5() { @@ -496,10 +496,10 @@ public class WorldMapScaleHandler { this.tileTemplates[5][3] = var1; // L: 285 } // L: 286 - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "356151267" + garbageValue = "70400689" ) @Export("init6") void init6() { @@ -565,10 +565,10 @@ public class WorldMapScaleHandler { this.tileTemplates[6][3] = var1; // L: 326 } // L: 327 - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-894345580" + garbageValue = "-1644297836" ) @Export("init7") void init7() { @@ -609,8 +609,8 @@ public class WorldMapScaleHandler { for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 352 for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 353 - if (var4 >= var3 - this.pixelsPerTile / 2) { - var1[var5] = -1; // L: 354 + if (var4 >= var3 - this.pixelsPerTile / 2) { // L: 354 + var1[var5] = -1; } ++var5; // L: 355 @@ -633,4 +633,16 @@ public class WorldMapScaleHandler { this.tileTemplates[7][3] = var1; // L: 367 } // L: 368 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1410661486" + ) + static void method4927() { + Login.worldSelectOpen = false; // L: 1957 + UserComparator6.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1958 + SecureRandomCallable.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1959 + Clock.logoSprite.drawAt(Login.xPadding + 382 - Clock.logoSprite.subWidth / 2, 18); // L: 1960 + } // L: 1961 } diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index 44eaa68de7..97cdd0ec32 100644 --- a/runescape-client/src/main/java/WorldMapSection.java +++ b/runescape-client/src/main/java/WorldMapSection.java @@ -3,53 +3,53 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hs") +@ObfuscatedName("ie") @Implements("WorldMapSection") public interface WorldMapSection { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lgu;I)V", - garbageValue = "964088357" + descriptor = "(Lhm;I)V", + garbageValue = "-1792723155" ) @Export("expandBounds") void expandBounds(WorldMapArea var1); - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-1337137401" + descriptor = "(IIIB)Z", + garbageValue = "1" ) @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1769831605" + descriptor = "(IIB)Z", + garbageValue = "2" ) @Export("containsPosition") boolean containsPosition(int var1, int var2); - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "1941144122" + garbageValue = "-41287528" ) @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(III)Lks;", - garbageValue = "-670243838" + descriptor = "(III)Lkd;", + garbageValue = "289851355" ) @Export("coord") Coord coord(int var1, int var2); - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-860121653" + descriptor = "(Lpx;I)V", + garbageValue = "-113194936" ) @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 acff6a796d..8f8600315b 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -4,90 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gk") +@ObfuscatedName("ha") @Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -2145116039 + intValue = -1921370827 ) @Export("oldZ") int oldZ; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1492900833 + intValue = -1948863841 ) @Export("newZ") int newZ; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1446835647 + intValue = -1923971 ) @Export("oldX") int oldX; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -900342197 + intValue = -834083351 ) @Export("oldY") int oldY; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1517609517 + intValue = -151067067 ) @Export("newX") int newX; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -643341675 + intValue = -993548849 ) @Export("newY") int newY; - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 838630171 + intValue = -1130243685 ) @Export("oldChunkXLow") int oldChunkXLow; - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2088226529 + intValue = -1666808285 ) @Export("oldChunkYLow") int oldChunkYLow; - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1613017713 + intValue = -912507685 ) @Export("oldChunkXHigh") int oldChunkXHigh; - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 917626923 + intValue = -1336425609 ) @Export("oldChunkYHigh") int oldChunkYHigh; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -492614719 + intValue = -834426157 ) @Export("newChunkXLow") int newChunkXLow; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 935129113 + intValue = -1730040283 ) @Export("newChunkYLow") int newChunkYLow; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -2057232245 + intValue = -1327937655 ) @Export("newChunkXHigh") int newChunkXHigh; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1809947597 + intValue = -1666490665 ) @Export("newChunkYHigh") int newChunkYHigh; @@ -95,180 +95,116 @@ public class WorldMapSection0 implements WorldMapSection { WorldMapSection0() { } // L: 22 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lgu;I)V", - garbageValue = "964088357" + descriptor = "(Lhm;I)V", + garbageValue = "-1792723155" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.newX) { // L: 25 + if (var1.regionLowX > this.newX) { // L: 26 var1.regionLowX = this.newX; } if (var1.regionHighX < this.newX) { - var1.regionHighX = this.newX; // L: 26 + var1.regionHighX = this.newX; // L: 27 } - if (var1.regionLowY > this.newY) { // L: 27 + if (var1.regionLowY > this.newY) { // L: 28 var1.regionLowY = this.newY; } - if (var1.regionHighY < this.newY) { // L: 28 + if (var1.regionHighY < this.newY) { // L: 29 var1.regionHighY = this.newY; } - } // L: 29 + } // L: 30 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-1337137401" + descriptor = "(IIIB)Z", + garbageValue = "1" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.oldZ && var1 < this.newZ + this.oldZ) { // 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) { // L: 34 + 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: 37 } else { - return false; // L: 33 + return false; // L: 35 } } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1769831605" + descriptor = "(IIB)Z", + garbageValue = "2" ) @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 + 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: 42 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "1941144122" + garbageValue = "-41287528" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { // L: 43 - return null; // L: 44 + if (!this.containsCoord(var1, var2, var3)) { // L: 47 + return null; // L: 48 } 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 - return var4; // L: 49 + 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: 50 51 52 + return var4; // L: 53 } } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(III)Lks;", - garbageValue = "-670243838" + descriptor = "(III)Lkd;", + garbageValue = "289851355" ) @Export("coord") public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { // L: 53 - return null; // L: 54 + if (!this.containsPosition(var1, var2)) { // L: 58 + return null; // L: 59 } else { - int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; // L: 56 - int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); // L: 57 - return new Coord(this.oldZ, var3, var4); // L: 58 + int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; // L: 61 + int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); // L: 62 + return new Coord(this.oldZ, var3, var4); // L: 63 } } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-860121653" + descriptor = "(Lpx;I)V", + garbageValue = "-113194936" ) @Export("read") public void read(Buffer var1) { - this.oldZ = var1.readUnsignedByte(); - this.newZ = var1.readUnsignedByte(); // L: 63 - this.oldX = var1.readUnsignedShort(); - this.oldChunkXLow = var1.readUnsignedByte(); - this.oldChunkXHigh = var1.readUnsignedByte(); - this.oldY = var1.readUnsignedShort(); // L: 67 - this.oldChunkYLow = var1.readUnsignedByte(); - this.oldChunkYHigh = var1.readUnsignedByte(); - this.newX = var1.readUnsignedShort(); // L: 70 - this.newChunkXLow = var1.readUnsignedByte(); // L: 71 - this.newChunkXHigh = var1.readUnsignedByte(); // L: 72 - this.newY = var1.readUnsignedShort(); // L: 73 - this.newChunkYLow = var1.readUnsignedByte(); // L: 74 - this.newChunkYHigh = var1.readUnsignedByte(); - this.postRead(); // L: 76 - } // L: 77 + this.oldZ = var1.readUnsignedByte(); // L: 68 + this.newZ = var1.readUnsignedByte(); // L: 69 + this.oldX = var1.readUnsignedShort(); // L: 70 + this.oldChunkXLow = var1.readUnsignedByte(); // L: 71 + this.oldChunkXHigh = var1.readUnsignedByte(); // L: 72 + this.oldY = var1.readUnsignedShort(); // L: 73 + this.oldChunkYLow = var1.readUnsignedByte(); // L: 74 + this.oldChunkYHigh = var1.readUnsignedByte(); // L: 75 + this.newX = var1.readUnsignedShort(); // L: 76 + this.newChunkXLow = var1.readUnsignedByte(); // L: 77 + this.newChunkXHigh = var1.readUnsignedByte(); // L: 78 + this.newY = var1.readUnsignedShort(); // L: 79 + this.newChunkYLow = var1.readUnsignedByte(); // L: 80 + this.newChunkYHigh = var1.readUnsignedByte(); // L: 81 + this.postRead(); // L: 82 + } // L: 83 - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1290063965" + descriptor = "(S)V", + garbageValue = "-6373" ) @Export("postRead") void postRead() { - } // L: 79 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-1330681104" - ) - public static boolean method4303(char var0) { - if (var0 >= ' ' && var0 < 127 || var0 > 127 && var0 < 160 || var0 > 160 && var0 <= 255) { // L: 61 - return true; - } else { - if (var0 != 0) { // L: 62 - char[] var1 = class345.cp1252AsciiExtension; // L: 64 - - 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 - } - } - } - - return false; // L: 75 - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "91" - ) - static final void method4283() { - if (!ViewportMouse.ViewportMouse_false0) { // L: 88 - int var0 = Scene.Scene_cameraPitchSine; // L: 89 - int var1 = Scene.Scene_cameraPitchCosine; // L: 90 - int var2 = Scene.Scene_cameraYawSine; // L: 91 - int var3 = Scene.Scene_cameraYawCosine; // L: 92 - byte var4 = 50; // L: 93 - short var5 = 3500; // L: 94 - int var6 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var4 / Rasterizer3D.Rasterizer3D_zoom; // L: 95 - int var7 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var4 / Rasterizer3D.Rasterizer3D_zoom; // L: 96 - int var8 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var5 / Rasterizer3D.Rasterizer3D_zoom; // L: 97 - int var9 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var5 / Rasterizer3D.Rasterizer3D_zoom; // L: 98 - int var10 = Rasterizer3D.method4656(var7, var4, var1, var0); // L: 100 - int var11 = Rasterizer3D.method4630(var7, var4, var1, var0); // L: 101 - var7 = var10; // L: 102 - var10 = Rasterizer3D.method4656(var9, var5, var1, var0); // L: 103 - int var12 = Rasterizer3D.method4630(var9, var5, var1, var0); // L: 104 - var9 = var10; // L: 105 - var10 = Rasterizer3D.method4627(var6, var11, var3, var2); // L: 106 - var11 = Rasterizer3D.method4628(var6, var11, var3, var2); // L: 107 - var6 = var10; // L: 108 - var10 = Rasterizer3D.method4627(var8, var12, var3, var2); // L: 109 - var12 = Rasterizer3D.method4628(var8, var12, var3, var2); // L: 110 - FaceNormal.field2664 = (var10 + var6) / 2; // L: 112 - ItemComposition.field2076 = (var7 + var9) / 2; // L: 113 - ViewportMouse.field2802 = (var11 + var12) / 2; // L: 114 - ViewportMouse.field2805 = (var10 - var6) / 2; // L: 115 - ViewportMouse.field2804 = (var9 - var7) / 2; // L: 116 - class18.field95 = (var12 - var11) / 2; // L: 117 - class9.field35 = Math.abs(ViewportMouse.field2805); // L: 118 - ViewportMouse.field2808 = Math.abs(ViewportMouse.field2804); // L: 119 - class196.field2204 = Math.abs(class18.field95); // L: 120 - } - } // L: 121 + } // L: 85 } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index be5a78d641..1d817f6932 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -1,59 +1,51 @@ -import java.awt.FontMetrics; -import java.util.concurrent.ScheduledExecutorService; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("hd") +@ObfuscatedName("in") @Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { - @ObfuscatedName("l") - @Export("soundSystemExecutor") - static ScheduledExecutorService soundSystemExecutor; - @ObfuscatedName("m") + @ObfuscatedName("sj") @ObfuscatedGetter( - intValue = -1670816889 + intValue = 1030373785 ) - @Export("cacheGamebuild") - static int cacheGamebuild; - @ObfuscatedName("ak") - @Export("loginScreenFontMetrics") - static FontMetrics loginScreenFontMetrics; - @ObfuscatedName("v") + static int field2898; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -660682519 + intValue = -1054024445 ) @Export("minPlane") int minPlane; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1314045431 + intValue = 268591679 ) @Export("planes") int planes; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 911829811 + intValue = 1612610403 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1785911481 + intValue = -462292543 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 587301171 + intValue = -1693287799 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1342465229 + intValue = 1403534241 ) @Export("regionEndY") int regionEndY; @@ -61,343 +53,167 @@ public class WorldMapSection1 implements WorldMapSection { WorldMapSection1() { } // L: 14 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lgu;I)V", - garbageValue = "964088357" + descriptor = "(Lhm;I)V", + garbageValue = "-1792723155" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.regionEndX) { // L: 17 + if (var1.regionLowX > this.regionEndX) { // L: 18 var1.regionLowX = this.regionEndX; } if (var1.regionHighX < this.regionEndX) { - var1.regionHighX = this.regionEndX; // L: 18 + var1.regionHighX = this.regionEndX; // L: 19 } - if (var1.regionLowY > this.regionEndY) { // L: 19 + if (var1.regionLowY > this.regionEndY) { // L: 20 var1.regionLowY = this.regionEndY; } - if (var1.regionHighY < this.regionEndY) { // L: 20 + if (var1.regionHighY < this.regionEndY) { // L: 21 var1.regionHighY = this.regionEndY; } - } // L: 21 + } // L: 22 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-1337137401" + descriptor = "(IIIB)Z", + garbageValue = "1" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { // L: 24 - return var2 >> 6 == this.regionStartX && var3 >> 6 == this.regionStartY; // L: 27 + if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { // L: 26 + return var2 >> 6 == this.regionStartX && var3 >> 6 == this.regionStartY; // L: 29 } else { - return false; // L: 25 + return false; // L: 27 } } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1769831605" + descriptor = "(IIB)Z", + garbageValue = "2" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; // L: 31 + return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; // L: 34 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "1941144122" + garbageValue = "-41287528" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { // L: 35 - return null; // L: 36 + if (!this.containsCoord(var1, var2, var3)) { // L: 39 + return null; // L: 40 } else { - 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 + int[] var4 = new int[]{var2 + (this.regionEndX * 64 - this.regionStartX * 64), var3 + (this.regionEndY * 64 - this.regionStartY * 64)}; // L: 42 43 44 + return var4; // L: 45 } } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(III)Lks;", - garbageValue = "-670243838" + descriptor = "(III)Lkd;", + garbageValue = "289851355" ) @Export("coord") public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { // L: 45 - return null; // L: 46 + if (!this.containsPosition(var1, var2)) { // L: 50 + return null; // L: 51 } else { - int var3 = this.regionStartX * 64 - this.regionEndX * 64 + var1; // L: 48 - int var4 = var2 + (this.regionStartY * 64 - this.regionEndY * 64); // L: 49 - return new Coord(this.minPlane, var3, var4); // L: 50 + int var3 = this.regionStartX * 64 - this.regionEndX * 64 + var1; // L: 53 + int var4 = var2 + (this.regionStartY * 64 - this.regionEndY * 64); // L: 54 + return new Coord(this.minPlane, var3, var4); // L: 55 } } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-860121653" + descriptor = "(Lpx;I)V", + garbageValue = "-113194936" ) @Export("read") public void read(Buffer var1) { - this.minPlane = var1.readUnsignedByte(); // L: 54 - this.planes = var1.readUnsignedByte(); // L: 55 - this.regionStartX = var1.readUnsignedShort(); // L: 56 - this.regionStartY = var1.readUnsignedShort(); // L: 57 - this.regionEndX = var1.readUnsignedShort(); // L: 58 - this.regionEndY = var1.readUnsignedShort(); // L: 59 - this.postRead(); // L: 60 - } // L: 61 + this.minPlane = var1.readUnsignedByte(); // L: 60 + this.planes = var1.readUnsignedByte(); // L: 61 + this.regionStartX = var1.readUnsignedShort(); // L: 62 + this.regionStartY = var1.readUnsignedShort(); // L: 63 + this.regionEndX = var1.readUnsignedShort(); // L: 64 + this.regionEndY = var1.readUnsignedShort(); // L: 65 + this.postRead(); // L: 66 + } // L: 67 - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1338654039" + descriptor = "(B)V", + garbageValue = "38" ) @Export("postRead") void postRead() { - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "40" - ) - @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 - } - - } } // L: 69 - @ObfuscatedName("ix") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(ZLpz;B)V", - garbageValue = "71" + descriptor = "(II)I", + garbageValue = "1032077651" ) - @Export("updateNpcs") - static final void updateNpcs(boolean var0, PacketBuffer var1) { - Client.field626 = 0; // L: 8045 - Client.field547 = 0; // L: 8046 - PacketBuffer var2 = Client.packetWriter.packetBuffer; // L: 8048 - var2.importIndex(); // L: 8049 - int var3 = var2.readBits(8); // L: 8050 - int var4; - if (var3 < Client.npcCount) { // L: 8051 - for (var4 = var3; var4 < Client.npcCount; ++var4) { // L: 8052 - Client.field627[++Client.field626 - 1] = Client.npcIndices[var4]; - } - } + @Export("Widget_unpackTargetMask") + public static int Widget_unpackTargetMask(int var0) { + return var0 >> 11 & 63; // L: 13 + } - if (var3 > Client.npcCount) { // L: 8054 - throw new RuntimeException(""); + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Ljava/lang/Class;", + garbageValue = "53" + ) + @Export("loadClassFromDescriptor") + static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { + if (var0.equals("B")) { // L: 212 + return Byte.TYPE; + } else if (var0.equals("I")) { // L: 213 + return Integer.TYPE; + } else if (var0.equals("S")) { // L: 214 + return Short.TYPE; + } else if (var0.equals("J")) { // L: 215 + return Long.TYPE; + } else if (var0.equals("Z")) { // L: 216 + return Boolean.TYPE; + } else if (var0.equals("F")) { // L: 217 + return Float.TYPE; + } else if (var0.equals("D")) { // L: 218 + return Double.TYPE; + } else if (var0.equals("C")) { // L: 219 + return Character.TYPE; } else { - Client.npcCount = 0; // L: 8055 - - int var5; - int var7; - int var8; - int var10; - for (var4 = 0; var4 < var3; ++var4) { // L: 8056 - var5 = Client.npcIndices[var4]; // L: 8057 - NPC var13 = Client.npcs[var5]; // L: 8058 - var7 = var2.readBits(1); // L: 8059 - if (var7 == 0) { // L: 8060 - Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8061 - var13.npcCycle = Client.cycle; // L: 8062 - } else { - var8 = var2.readBits(2); // L: 8065 - if (var8 == 0) { // L: 8066 - Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8067 - var13.npcCycle = Client.cycle; // L: 8068 - Client.field548[++Client.field547 - 1] = var5; // L: 8069 - } else { - int var9; - if (var8 == 1) { // L: 8072 - Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8073 - var13.npcCycle = Client.cycle; // L: 8074 - var9 = var2.readBits(3); // L: 8075 - var13.method2347(var9, class193.field2185); // L: 8076 - var10 = var2.readBits(1); // L: 8077 - if (var10 == 1) { // L: 8078 - Client.field548[++Client.field547 - 1] = var5; - } - } else if (var8 == 2) { // L: 8081 - Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8082 - var13.npcCycle = Client.cycle; // L: 8083 - if (var2.readBits(1) == 1) { // L: 8084 - var9 = var2.readBits(3); // L: 8085 - var13.method2347(var9, class193.field2187); // L: 8086 - var10 = var2.readBits(3); // L: 8087 - var13.method2347(var10, class193.field2187); // L: 8088 - } else { - var9 = var2.readBits(3); // L: 8091 - var13.method2347(var9, class193.field2184); // L: 8092 - } - - var9 = var2.readBits(1); // L: 8094 - if (var9 == 1) { // L: 8095 - Client.field548[++Client.field547 - 1] = var5; - } - } else if (var8 == 3) { // L: 8098 - Client.field627[++Client.field626 - 1] = var5; // L: 8099 - } - } - } - } - - int var11; - while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 8106 - var11 = var1.readBits(15); // L: 8107 - if (var11 == 32767) { // L: 8108 - break; - } - - boolean var14 = false; // L: 8109 - if (Client.npcs[var11] == null) { // L: 8110 - Client.npcs[var11] = new NPC(); // L: 8111 - var14 = true; // L: 8112 - } - - NPC var12 = Client.npcs[var11]; // L: 8114 - Client.npcIndices[++Client.npcCount - 1] = var11; // L: 8115 - var12.npcCycle = Client.cycle; // L: 8116 - int var6; - boolean var15; - if (class431.field4602) { // L: 8120 - if (var0) { // L: 8121 - var6 = var1.readBits(8); // L: 8122 - if (var6 > 127) { // L: 8123 - var6 -= 256; - } - } else { - var6 = var1.readBits(5); // L: 8126 - if (var6 > 15) { // L: 8127 - var6 -= 32; - } - } - - var5 = var1.readBits(1); // L: 8129 - var8 = Client.defaultRotations[var1.readBits(3)]; // L: 8130 - if (var14) { // L: 8131 - var12.orientation = var12.rotation = var8; - } - - var12.definition = KeyHandler.getNpcDefinition(var1.readBits(14)); // L: 8132 - if (var0) { // L: 8133 - var7 = var1.readBits(8); // L: 8134 - if (var7 > 127) { // L: 8135 - var7 -= 256; - } - } else { - var7 = var1.readBits(5); // L: 8138 - if (var7 > 15) { // L: 8139 - var7 -= 32; - } - } - - var15 = var1.readBits(1) == 1; // L: 8141 - if (var15) { // L: 8142 - var1.readBits(32); // L: 8143 - } - - var10 = var1.readBits(1); // L: 8145 - if (var10 == 1) { // L: 8146 - Client.field548[++Client.field547 - 1] = var11; - } - } else { - var5 = var1.readBits(1); // L: 8149 - var8 = var1.readBits(1); // L: 8150 - if (var8 == 1) { // L: 8151 - Client.field548[++Client.field547 - 1] = var11; - } - - if (var0) { // L: 8152 - var7 = var1.readBits(8); // L: 8153 - if (var7 > 127) { // L: 8154 - var7 -= 256; - } - } else { - var7 = var1.readBits(5); // L: 8157 - if (var7 > 15) { // L: 8158 - var7 -= 32; - } - } - - var15 = var1.readBits(1) == 1; // L: 8160 - if (var15) { // L: 8161 - var1.readBits(32); // L: 8162 - } - - if (var0) { // L: 8164 - var6 = var1.readBits(8); // L: 8165 - if (var6 > 127) { // L: 8166 - var6 -= 256; - } - } else { - var6 = var1.readBits(5); // L: 8169 - if (var6 > 15) { // L: 8170 - var6 -= 32; - } - } - - var12.definition = KeyHandler.getNpcDefinition(var1.readBits(14)); // L: 8172 - var10 = Client.defaultRotations[var1.readBits(3)]; // L: 8173 - if (var14) { // L: 8174 - var12.orientation = var12.rotation = var10; - } - } - - var12.field1150 = var12.definition.size; // L: 8176 - var12.field1175 = var12.definition.rotation; // L: 8177 - if (var12.field1175 == 0) { // L: 8178 - var12.rotation = 0; - } - - var12.walkSequence = var12.definition.walkSequence; // L: 8179 - var12.walkBackSequence = var12.definition.walkBackSequence; // L: 8180 - var12.walkLeftSequence = var12.definition.walkLeftSequence; // L: 8181 - var12.walkRightSequence = var12.definition.walkRightSequence; // L: 8182 - var12.idleSequence = var12.definition.idleSequence; // L: 8183 - var12.turnLeftSequence = var12.definition.turnLeftSequence; // L: 8184 - var12.turnRightSequence = var12.definition.turnRightSequence; // L: 8185 - var12.method2348(GrandExchangeEvents.localPlayer.pathX[0] + var6, GrandExchangeEvents.localPlayer.pathY[0] + var7, var5 == 1); // L: 8186 - } - - var1.exportIndex(); // L: 8188 - MouseHandler.method593(var1); // L: 8190 - - for (var11 = 0; var11 < Client.field626; ++var11) { // L: 8191 - var3 = Client.field627[var11]; // L: 8192 - if (Client.npcs[var3].npcCycle != Client.cycle) { // L: 8193 - Client.npcs[var3].definition = null; // L: 8194 - Client.npcs[var3] = null; // L: 8195 - } - } - - if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 8198 - throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); - } else { - for (var11 = 0; var11 < Client.npcCount; ++var11) { // L: 8199 - if (Client.npcs[Client.npcIndices[var11]] == null) { // L: 8200 - throw new RuntimeException(var11 + "," + Client.npcCount); // L: 8201 - } - } - - } + return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 220 221 } - } // L: 8204 + } + + @ObfuscatedName("gv") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "20733" + ) + static final void method4839() { + if (Decimator.ClanChat_inClanChat) { // L: 3827 + if (PcmPlayer.friendsChat != null) { // L: 3828 + PcmPlayer.friendsChat.sort(); // L: 3829 + } + + for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 3832 + Player var1 = Client.players[Players.Players_indices[var0]]; // L: 3833 + var1.clearIsInFriendsChat(); // L: 3834 + } + + Decimator.ClanChat_inClanChat = false; // L: 3837 + } + + } // L: 3839 } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index ae1edf5371..7e9996b0b4 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -4,210 +4,175 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ga") +@ObfuscatedName("ho") @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lqq;" - ) - @Export("options_buttons_0Sprite") - static IndexedSprite options_buttons_0Sprite; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -2086357139 + intValue = 1506776431 ) @Export("minPlane") int minPlane; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 891943535 + intValue = 424127313 ) @Export("planes") int planes; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 72025167 + intValue = 1432871815 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 456925677 + intValue = -1348644299 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 620959139 + intValue = -1690940403 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1044341743 + intValue = 1797936433 ) @Export("regionEndY") int regionEndY; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 868620289 + ) + int field2723; @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1229812531 + intValue = -979796665 ) - int field2233; - @ObfuscatedName("l") + int field2730; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1125733411 + intValue = 1754400747 ) - int field2234; - @ObfuscatedName("q") + int field2732; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1336777703 + intValue = -1520058109 ) - int field2230; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -980729145 - ) - int field2232; + int field2729; WorldMapSection2() { } // L: 18 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lgu;I)V", - garbageValue = "964088357" + descriptor = "(Lhm;I)V", + garbageValue = "-1792723155" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field2233) { // L: 21 - var1.regionLowX = this.field2233; + if (var1.regionLowX > this.field2723) { // L: 22 + var1.regionLowX = this.field2723; } - if (var1.regionHighX < this.field2230) { - var1.regionHighX = this.field2230; // L: 22 + if (var1.regionHighX < this.field2732) { + var1.regionHighX = this.field2732; // L: 23 } - if (var1.regionLowY > this.field2234) { // L: 23 - var1.regionLowY = this.field2234; + if (var1.regionLowY > this.field2730) { // L: 24 + var1.regionLowY = this.field2730; } - if (var1.regionHighY < this.field2232) { // L: 24 - var1.regionHighY = this.field2232; + if (var1.regionHighY < this.field2729) { // L: 25 + var1.regionHighY = this.field2729; } - } + } // L: 26 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-1337137401" + descriptor = "(IIIB)Z", + garbageValue = "1" ) @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 && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; + if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { // L: 30 + return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; // L: 33 } else { - return false; + return false; // L: 31 } } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1769831605" + descriptor = "(IIB)Z", + garbageValue = "2" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field2233 && var1 >> 6 <= this.field2230 && var2 >> 6 >= this.field2234 && var2 >> 6 <= this.field2232; + return var1 >> 6 >= this.field2723 && var1 >> 6 <= this.field2732 && var2 >> 6 >= this.field2730 && var2 >> 6 <= this.field2729; // L: 38 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "1941144122" + garbageValue = "-41287528" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { - return null; // L: 40 + if (!this.containsCoord(var1, var2, var3)) { // L: 43 + return null; // L: 44 } else { - int[] var4 = new int[]{var2 + (this.field2233 * 64 - this.regionStartX * 64), var3 + (this.field2234 * 64 - this.regionStartY * 64)}; // L: 42 44 - return var4; // L: 45 + int[] var4 = new int[]{var2 + (this.field2723 * 64 - this.regionStartX * 64), var3 + (this.field2730 * 64 - this.regionStartY * 64)}; // L: 46 47 48 + return var4; // L: 49 } } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(III)Lks;", - garbageValue = "-670243838" + descriptor = "(III)Lkd;", + garbageValue = "289851355" ) @Export("coord") public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { // L: 49 - return null; // L: 50 + if (!this.containsPosition(var1, var2)) { // L: 54 + return null; // L: 55 } else { - int var3 = this.regionStartX * 64 - this.field2233 * 64 + var1; // L: 52 - int var4 = var2 + (this.regionStartY * 64 - this.field2234 * 64); // L: 53 - return new Coord(this.minPlane, var3, var4); // L: 54 + int var3 = this.regionStartX * 64 - this.field2723 * 64 + var1; // L: 57 + int var4 = var2 + (this.regionStartY * 64 - this.field2730 * 64); // L: 58 + return new Coord(this.minPlane, var3, var4); // L: 59 } } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-860121653" + descriptor = "(Lpx;I)V", + garbageValue = "-113194936" ) @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.field2233 = var1.readUnsignedShort(); // L: 64 - this.field2234 = var1.readUnsignedShort(); // L: 65 - this.field2230 = var1.readUnsignedShort(); // L: 66 - this.field2232 = var1.readUnsignedShort(); // L: 67 - this.postRead(); // L: 68 - } // L: 69 + this.minPlane = var1.readUnsignedByte(); // L: 64 + this.planes = var1.readUnsignedByte(); // L: 65 + this.regionStartX = var1.readUnsignedShort(); // L: 66 + this.regionStartY = var1.readUnsignedShort(); // L: 67 + this.regionEndX = var1.readUnsignedShort(); // L: 68 + this.regionEndY = var1.readUnsignedShort(); // L: 69 + this.field2723 = var1.readUnsignedShort(); // L: 70 + this.field2730 = var1.readUnsignedShort(); // L: 71 + this.field2732 = var1.readUnsignedShort(); // L: 72 + this.field2729 = var1.readUnsignedShort(); // L: 73 + this.postRead(); // L: 74 + } // L: 75 - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "255" + descriptor = "(B)V", + garbageValue = "-80" ) @Export("postRead") void postRead() { - } // L: 71 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-16" - ) - static void method3959() { - class326.field4041 = new int[2000]; // L: 25 - int var0 = 0; // L: 26 - int var1 = 240; // L: 27 - - int var3; - for (byte var2 = 12; var0 < 16; var1 -= var2) { // L: 28 - var3 = class163.method3320((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)(0.075F + 0.425F * (float)var0 / 16.0F)); // L: 30 - class326.field4041[var0] = var3; // L: 31 - ++var0; // L: 29 - } - - var1 = 48; // L: 33 - - for (int var5 = var1 / 6; var0 < class326.field4041.length; var1 -= var5) { // L: 34 35 41 - var3 = var0 * 2; // L: 36 - - for (int var4 = class163.method3320((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < class326.field4041.length; ++var0) { // L: 37 38 - class326.field4041[var0] = var4; // L: 39 - } - } - - } // L: 43 + } // L: 77 } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index 5696ce4cb4..3e02435494 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -1,487 +1,88 @@ -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLConnection; -import java.util.Random; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("he") +@ObfuscatedName("hn") @Implements("WorldMapSectionType") public enum WorldMapSectionType implements MouseWheel { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhe;" + descriptor = "Lhn;" ) @Export("WORLDMAPSECTIONTYPE0") - WORLDMAPSECTIONTYPE0(3, (byte)0), - @ObfuscatedName("c") + WORLDMAPSECTIONTYPE0(1, (byte)0), + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lhe;" + descriptor = "Lhn;" ) @Export("WORLDMAPSECTIONTYPE1") - WORLDMAPSECTIONTYPE1(2, (byte)1), - @ObfuscatedName("i") + WORLDMAPSECTIONTYPE1(3, (byte)1), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhe;" + descriptor = "Lhn;" ) @Export("WORLDMAPSECTIONTYPE2") - WORLDMAPSECTIONTYPE2(1, (byte)2), - @ObfuscatedName("f") + WORLDMAPSECTIONTYPE2(0, (byte)2), + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lhe;" + descriptor = "Lhn;" ) @Export("WORLDMAPSECTIONTYPE3") - WORLDMAPSECTIONTYPE3(0, (byte)3); + WORLDMAPSECTIONTYPE3(2, (byte)3); - @ObfuscatedName("a") - @Export("Widget_loadedInterfaces") - public static boolean[] Widget_loadedInterfaces; - @ObfuscatedName("bl") + @ObfuscatedName("hg") @ObfuscatedGetter( - intValue = -2117760903 + intValue = -156777687 ) - static int field2321; - @ObfuscatedName("hy") - @Export("xteaKeys") - static int[][] xteaKeys; - @ObfuscatedName("b") + static int field2828; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1196340151 + intValue = -1514256887 ) @Export("type") final int type; - @ObfuscatedName("n") + @ObfuscatedName("m") @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("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 26 + return this.id; // L: 23 } - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(JLjava/lang/String;I)I", - garbageValue = "-23723856" + descriptor = "(II)Lfm;", + garbageValue = "-1177052487" ) - static final int method4312(long var0, String var2) { - Random var3 = new Random(); // L: 65 - Buffer var4 = new Buffer(128); // L: 66 - Buffer var5 = new Buffer(128); // L: 67 - int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; // L: 68 69 70 71 72 - var4.writeByte(10); - - int var7; - for (var7 = 0; var7 < 4; ++var7) { - var4.writeInt(var3.nextInt()); - } - - var4.writeInt(var6[0]); // L: 77 - var4.writeInt(var6[1]); // L: 78 - var4.writeLong(var0); // L: 79 - var4.writeLong(0L); // L: 80 - - for (var7 = 0; var7 < 4; ++var7) { // L: 81 - var4.writeInt(var3.nextInt()); // L: 82 - } - - var4.encryptRsa(class65.field863, class65.field864); // L: 84 - var5.writeByte(10); // L: 85 - - for (var7 = 0; var7 < 3; ++var7) { // L: 86 - var5.writeInt(var3.nextInt()); // L: 87 - } - - var5.writeLong(var3.nextLong()); // L: 89 - var5.writeLongMedium(var3.nextLong()); // L: 90 - if (Client.randomDatData != null) { // L: 92 - var5.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 93 + @Export("getNpcDefinition") + public static NPCComposition getNpcDefinition(int var0) { + NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); // L: 65 + if (var1 != null) { // L: 66 + return var1; } else { - byte[] var8 = new byte[24]; // L: 98 - - try { - JagexCache.JagexCache_randomDat.seek(0L); // L: 100 - JagexCache.JagexCache_randomDat.readFully(var8); // L: 101 - - int var9; - for (var9 = 0; var9 < 24 && var8[var9] == 0; ++var9) { // L: 102 103 104 - } - - if (var9 >= 24) { // L: 106 - throw new IOException(); - } - } catch (Exception var24) { - for (int var10 = 0; var10 < 24; ++var10) { // L: 109 - var8[var10] = -1; - } + byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); // L: 67 + var1 = new NPCComposition(); // L: 68 + var1.id = var0; // L: 69 + if (var2 != null) { // L: 70 + var1.decode(new Buffer(var2)); } - var5.writeBytes(var8, 0, var8.length); // L: 114 - } - - var5.writeLong(var3.nextLong()); // L: 116 - var5.encryptRsa(class65.field863, class65.field864); // L: 117 - var7 = class425.stringCp1252NullTerminatedByteSize(var2); // L: 118 - if (var7 % 8 != 0) { // L: 119 - var7 += 8 - var7 % 8; - } - - Buffer var25 = new Buffer(var7); // L: 120 - var25.writeStringCp1252NullTerminated(var2); // L: 121 - var25.offset = var7; // L: 122 - var25.xteaEncryptAll(var6); // L: 123 - Buffer var18 = new Buffer(var4.offset + var5.offset + var25.offset + 5); // L: 124 - var18.writeByte(2); // L: 125 - var18.writeByte(var4.offset); // L: 126 - var18.writeBytes(var4.array, 0, var4.offset); // L: 127 - var18.writeByte(var5.offset); // L: 128 - var18.writeBytes(var5.array, 0, var5.offset); // L: 129 - var18.writeShort(var25.offset); // L: 130 - var18.writeBytes(var25.array, 0, var25.offset); // L: 131 - String var20 = ApproximateRouteStrategy.method1125(var18.array); // L: 132 - - try { - URL var11 = new URL(ArchiveLoader.method2063("services", false) + "m=accountappeal/login.ws"); // L: 134 - URLConnection var12 = var11.openConnection(); // L: 135 - var12.setDoInput(true); // L: 136 - var12.setDoOutput(true); // L: 137 - var12.setConnectTimeout(5000); // L: 138 - OutputStreamWriter var13 = new OutputStreamWriter(var12.getOutputStream()); // L: 139 - var13.write("data2=" + class270.method5206(var20) + "&dest=" + class270.method5206("passwordchoice.ws")); // L: 140 - var13.flush(); // L: 141 - InputStream var14 = var12.getInputStream(); // L: 142 - var18 = new Buffer(new byte[1000]); // L: 143 - - do { - int var15 = var14.read(var18.array, var18.offset, 1000 - var18.offset); // L: 145 - if (var15 == -1) { // L: 146 - var13.close(); // L: 152 - var14.close(); // L: 153 - String var21 = new String(var18.array); // L: 154 - if (var21.startsWith("OFFLINE")) { // L: 155 - return 4; // L: 156 - } else if (var21.startsWith("WRONG")) { // L: 158 - return 7; // L: 159 - } else if (var21.startsWith("RELOAD")) { // L: 161 - return 3; // L: 162 - } else if (var21.startsWith("Not permitted for social network accounts.")) { // L: 164 - return 6; // L: 165 - } else { - var18.xteaDecryptAll(var6); // L: 167 - - while (var18.offset > 0 && var18.array[var18.offset - 1] == 0) { // L: 168 - --var18.offset; // L: 169 - } - - var21 = new String(var18.array, 0, var18.offset); // L: 171 - boolean var16; - if (var21 == null) { // L: 174 - var16 = false; // L: 175 - } else { - label106: { - try { - new URL(var21); - } catch (MalformedURLException var22) { // L: 181 - var16 = false; // L: 182 - break label106; // L: 183 - } - - var16 = true; // L: 185 - } - } - - if (var16) { // L: 187 - class391.openURL(var21, true, false); // L: 188 - return 2; // L: 189 - } else { - return 5; // L: 191 - } - } - } - - var18.offset += var15; // L: 147 - } while(var18.offset < 1000); // L: 148 - - return 5; // L: 149 - } catch (Throwable var23) { // L: 193 - var23.printStackTrace(); // L: 194 - return 5; // L: 195 + var1.postDecode(); // L: 71 + NPCComposition.NpcDefinition_cached.put(var1, (long)var0); // L: 72 + return var1; // L: 73 } } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)[Lhe;", - garbageValue = "-868172814" - ) - static WorldMapSectionType[] method4305() { - return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE3, WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE0}; // L: 17 - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1441766816" - ) - @Export("Messages_getLastChatID") - static int Messages_getLastChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 73 - if (var1 == null) { // L: 74 - return -1; - } else { - return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 75 76 - } - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-2088968249" - ) - static int method4310(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_LISTENED) { // L: 2710 - if (class154.guestClanSettings != null) { // L: 2711 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2712 - Calendar.field3269 = class154.guestClanSettings; // L: 2713 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2715 - } - - return 1; // L: 2716 - } else { - int var3; - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_AFFINED) { // L: 2718 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2719 - if (Client.currentClanSettings[var3] != null) { // L: 2720 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2721 - Calendar.field3269 = Client.currentClanSettings[var3]; // L: 2722 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2724 - } - - return 1; // L: 2725 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCLANNAME) { // L: 2727 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = Calendar.field3269.name; // L: 2728 - return 1; // L: 2729 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETALLOWUNAFFINED) { // L: 2731 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.allowGuests ? 1 : 0; // L: 2732 - return 1; // L: 2733 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKTALK) { // L: 2735 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.field1591; // L: 2736 - return 1; // L: 2737 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKKICK) { // L: 2739 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.field1592; // L: 2740 - return 1; // L: 2741 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKLOOTSHARE) { // L: 2743 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.field1593; // L: 2744 - return 1; // L: 2745 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCOINSHARE) { // L: 2747 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.field1606; // L: 2748 - return 1; // L: 2749 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDCOUNT) { // L: 2751 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.memberCount; // L: 2752 - return 1; // L: 2753 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME) { // L: 2755 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2756 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = Calendar.field3269.memberNames[var3]; // L: 2757 - return 1; // L: 2758 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDRANK) { // L: 2760 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2761 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.memberRanks[var3]; // L: 2762 - return 1; // L: 2763 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDCOUNT) { // L: 2765 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.bannedMemberCount; // L: 2766 - return 1; // L: 2767 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME) { // L: 2769 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2770 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = Calendar.field3269.bannedMemberNames[var3]; // L: 2771 - return 1; // L: 2772 - } else { - int var5; - int var6; - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO) { // L: 2774 - Interpreter.Interpreter_intStackSize -= 3; // L: 2775 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2776 - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2777 - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2778 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.method2956(var3, var6, var5); // L: 2779 - return 1; // L: 2780 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT) { // L: 2782 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.currentOwner; // L: 2783 - return 1; // L: 2784 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT) { // L: 2786 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.field1604; // L: 2787 - return 1; // L: 2788 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDSLOT) { // L: 2790 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.method2955(Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]); // L: 2791 - return 1; // L: 2792 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT) { // L: 2794 - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.getSortedMembers()[Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]]; // L: 2795 - return 1; // L: 2796 - } else if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL) { // L: 2798 - Interpreter.Interpreter_intStackSize -= 2; // L: 2799 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2800 - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2801 - class18.method264(var6, var3); // L: 2802 - return 1; // L: 2803 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY) { // L: 2805 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2806 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.field1600[var3]; // L: 2807 - return 1; // L: 2808 - } else { - if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL) { // L: 2810 - Interpreter.Interpreter_intStackSize -= 3; // L: 2811 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2812 - boolean var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 2813 - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2814 - ClanChannel.method3137(var5, var3, var4); // L: 2815 - } - - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDMUTED) { // L: 2817 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2818 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Calendar.field3269.field1601[var3] ? 1 : 0; // L: 2819 - return 1; // L: 2820 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_LISTENED) { // L: 2822 - if (class21.guestClanChannel != null) { // L: 2823 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2824 - FriendSystem.field808 = class21.guestClanChannel; // L: 2825 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2827 - } - - return 1; // L: 2828 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_AFFINED) { // L: 2830 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2831 - if (Client.currentClanChannels[var3] != null) { // L: 2832 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2833 - FriendSystem.field808 = Client.currentClanChannels[var3]; // L: 2834 - AttackOption.field1255 = var3; // L: 2835 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2837 - } - - return 1; // L: 2838 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETCLANNAME) { // L: 2840 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = FriendSystem.field808.name; // L: 2841 - return 1; // L: 2842 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKKICK) { // L: 2844 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FriendSystem.field808.field1659; // L: 2845 - return 1; // L: 2846 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKTALK) { // L: 2848 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FriendSystem.field808.field1654; // L: 2849 - return 1; // L: 2850 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERCOUNT) { // L: 2852 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FriendSystem.field808.method3119(); // L: 2853 - return 1; // L: 2854 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERDISPLAYNAME) { // L: 2856 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2857 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ((ClanChannelMember)FriendSystem.field808.members.get(var3)).username.getName(); // L: 2858 - return 1; // L: 2859 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERRANK) { // L: 2861 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2862 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((ClanChannelMember)FriendSystem.field808.members.get(var3)).rank; // L: 2863 - return 1; // L: 2864 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERWORLD) { // L: 2866 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2867 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((ClanChannelMember)FriendSystem.field808.members.get(var3)).world; // L: 2868 - return 1; // L: 2869 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_KICKUSER) { // L: 2871 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2872 - HealthBar.method2328(AttackOption.field1255, var3); // L: 2873 - return 1; // L: 2874 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERSLOT) { // L: 2876 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FriendSystem.field808.method3116(Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]); // L: 2877 - return 1; // L: 2878 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETSORTEDUSERSLOT) { // L: 2880 - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = FriendSystem.field808.getSortedMembers()[Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]]; // L: 2881 - return 1; // L: 2882 - } else if (var0 == ScriptOpcodes.CLANPROFILE_FIND) { // L: 2884 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = HorizontalAlignment.field1885 != null ? 1 : 0; // L: 2885 - return 1; // L: 2886 - } else { - return 2; // L: 2888 - } - } - } - } - } - - @ObfuscatedName("gj") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "815671875" - ) - static final void method4308(int var0, int var1) { - if (var0 < 128) { // L: 3756 - var0 = 128; - } - - if (var0 > 383) { // L: 3757 - var0 = 383; - } - - if (class147.cameraPitch < var0) { // L: 3758 - class147.cameraPitch = (var0 - class147.cameraPitch) * class386.field4337 / 1000 + class147.cameraPitch + NetFileRequest.field3960; // L: 3759 - if (class147.cameraPitch > var0) { // L: 3760 - class147.cameraPitch = var0; - } - } - - if (class147.cameraPitch > var0) { // L: 3762 - class147.cameraPitch -= (class147.cameraPitch - var0) * class386.field4337 / 1000 + NetFileRequest.field3960; // L: 3763 - if (class147.cameraPitch < var0) { // L: 3764 - class147.cameraPitch = var0; - } - } - - int var2 = var1 - class21.cameraYaw; // L: 3766 - if (var2 > 1024) { // L: 3767 - var2 -= 2048; - } - - if (var2 < -1024) { // L: 3768 - var2 += 2048; - } - - if (var2 > 0) { // L: 3769 - class21.cameraYaw = class21.cameraYaw + NetFileRequest.field3960 + var2 * class386.field4337 / 1000; // L: 3770 - class21.cameraYaw &= 2047; // L: 3771 - } - - if (var2 < 0) { // L: 3773 - class21.cameraYaw -= NetFileRequest.field3960 + -var2 * class386.field4337 / 1000; // L: 3774 - class21.cameraYaw &= 2047; // L: 3775 - } - - int var3 = var1 - class21.cameraYaw; // L: 3777 - if (var3 > 1024) { // L: 3778 - var3 -= 2048; - } - - if (var3 < -1024) { - var3 += 2048; // L: 3779 - } - - if (var3 < 0 && var2 > 0 || var3 > 0 && var2 < 0) { // L: 3780 - class21.cameraYaw = var1; - } - - } // L: 3781 } diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java index 72bae29690..4fdb02b9ea 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -1,13 +1,12 @@ -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("hn") +@ObfuscatedName("ix") @Implements("WorldMapSprite") public final class WorldMapSprite { - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("tileColors") final int[] tileColors; @@ -19,103 +18,28 @@ public final class WorldMapSprite { this.tileColors = var1; // L: 15 } // L: 16 - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "921646370" + descriptor = "(IIB)I", + garbageValue = "28" ) @Export("getTileColor") final int getTileColor(int var1, int var2) { - return this.tileColors[var2 * 64 + var1]; + return this.tileColors[var1 + var2 * 64]; // L: 19 } - @ObfuscatedName("v") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Ljl;Lqv;I)Ljd;", - garbageValue = "-2117269105" + descriptor = "(IZII)V", + garbageValue = "-952596159" ) - @Export("getPacketBufferNode") - public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { - PacketBufferNode var2; - if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 24 - var2 = new PacketBufferNode(); // L: 25 + public static final void method4809(int var0, boolean var1, int var2) { + if (var0 >= 8000 && var0 <= 48000) { // L: 45 + PcmPlayer.field300 = var0; // L: 46 + ArchiveDiskAction.PcmPlayer_stereo = var1; // L: 47 + class29.field172 = var2; // L: 48 } else { - var2 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 28 + throw new IllegalArgumentException(); } - - var2.clientPacket = var0; // L: 31 - var2.clientPacketLength = var0.length; // L: 32 - if (var2.clientPacketLength == -1) { - var2.packetBuffer = new PacketBuffer(260); // L: 33 - } else if (var2.clientPacketLength == -2) { // L: 34 - var2.packetBuffer = new PacketBuffer(10000); - } else if (var2.clientPacketLength <= 18) { - var2.packetBuffer = new PacketBuffer(20); // L: 35 - } else if (var2.clientPacketLength <= 98) { // L: 36 - var2.packetBuffer = new PacketBuffer(100); - } else { - var2.packetBuffer = new PacketBuffer(260); // L: 37 - } - - var2.packetBuffer.setIsaacCipher(var1); // L: 38 - var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 39 - var2.index = 0; // L: 40 - return var2; // L: 41 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-64" - ) - static void method4351() { - if (Login.clearLoginScreen) { // L: 249 - Login.titleboxSprite = null; // L: 250 - Login.titlebuttonSprite = null; // L: 251 - Login.runesSprite = null; // L: 252 - class17.leftTitleSprite = null; // L: 253 - ViewportMouse.rightTitleSprite = null; // L: 254 - Decimator.logoSprite = null; // L: 255 - class92.title_muteSprite = null; // L: 256 - WorldMapSection2.options_buttons_0Sprite = null; // L: 257 - class54.options_buttons_2Sprite = null; // L: 258 - class393.worldSelectBackSprites = null; // L: 259 - class400.worldSelectFlagSprites = null; // L: 260 - class126.worldSelectArrows = null; // L: 261 - TileItem.worldSelectStars = null; // L: 262 - class135.field1569 = null; // L: 263 - class341.loginScreenRunesAnimation.method2193(); // L: 264 - Actor.method2183(2); // L: 265 - if (NetCache.NetCache_socket != null) { // L: 267 - try { - Buffer var0 = new Buffer(4); // L: 269 - var0.writeByte(2); // L: 270 - var0.writeMedium(0); // L: 271 - NetCache.NetCache_socket.write(var0.array, 0, 4); // L: 272 - } catch (IOException var3) { - try { - NetCache.NetCache_socket.close(); // L: 276 - } catch (Exception var2) { // L: 278 - } - - ++NetCache.NetCache_ioExceptions; // L: 279 - NetCache.NetCache_socket = null; // L: 280 - } - } - - Login.clearLoginScreen = false; // L: 283 - } - } // L: 284 - - @ObfuscatedName("li") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1972677763" - ) - @Export("Clan_leaveChat") - static final void Clan_leaveChat() { - PacketBufferNode var0 = getPacketBufferNode(ClientPacket.field2986, Client.packetWriter.isaacCipher); // L: 12403 - var0.packetBuffer.writeByte(0); // L: 12404 - Client.packetWriter.addNode(var0); // L: 12405 - } // L: 12406 + } // L: 49 } diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java index 78f1a5d177..03b758aed7 100644 --- a/runescape-client/src/main/java/Wrapper.java +++ b/runescape-client/src/main/java/Wrapper.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("iz") +@ObfuscatedName("im") @Implements("Wrapper") public abstract class Wrapper extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("size") final int size; @@ -13,11 +13,11 @@ public abstract class Wrapper extends DualNode { this.size = var1; // L: 9 } // L: 10 - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("get") abstract Object get(); - @ObfuscatedName("c") + @ObfuscatedName("q") @Export("isSoft") abstract boolean isSoft(); } diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java index b374746e36..3c234e377f 100644 --- a/runescape-client/src/main/java/class0.java +++ b/runescape-client/src/main/java/class0.java @@ -1,30 +1,30 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("v") +@ObfuscatedName("o") public class class0 implements class3 { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;)Lpi;" + descriptor = "(Lpx;)Lpx;" ) - public Buffer vmethod12(Buffer var1) { - Buffer var2 = new Buffer(100); // L: 9 - this.method2(var1, var2); // L: 10 - return var2; // L: 11 + public Buffer vmethod19(Buffer var1) { + Buffer var2 = new Buffer(100); // L: 10 + this.method2(var1, var2); // L: 11 + return var2; // L: 12 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lpi;Lpi;)V" + descriptor = "(Lpx;Lpx;)V" ) void method2(Buffer var1, Buffer var2) { - class8 var3 = new class8(var1); // L: 15 - class5 var4 = new class5(var3); // L: 16 + class8 var3 = new class8(var1); // L: 16 + class5 var4 = new class5(var3); // L: 17 long var5; - for (var5 = 0L; !var4.method19(var3.method56(), var3.method61(), var5); ++var5) { // L: 17 18 19 + for (var5 = 0L; !var4.method36(var3.method58(), var3.method60(), var5); ++var5) { // L: 18 19 20 } - var2.writeLong(var5); // L: 21 - } // L: 22 + var2.writeLong(var5); // L: 22 + } // L: 23 } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 2b8edec254..2f60b2de20 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -1,125 +1,254 @@ -import java.awt.Image; import java.util.concurrent.Callable; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("c") +@ObfuscatedName("q") public class class1 implements Callable { - @ObfuscatedName("av") - static Image field3; - @ObfuscatedName("mt") - @ObfuscatedGetter( - intValue = -1311703195 - ) - @Export("menuY") - static int menuY; - @ObfuscatedName("v") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lpi;" + descriptor = "Llp;" ) - final Buffer field0; - @ObfuscatedName("c") + @Export("HitSplatDefinition_fontsArchive") + static AbstractArchive HitSplatDefinition_fontsArchive; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lf;" + descriptor = "Let;" ) - final class3 field1; + static ClanChannel field2; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lpx;" + ) + final Buffer field1; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lk;" + ) + final class3 field3; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ll;" + descriptor = "Ls;" ) final class7 this$0; @ObfuscatedSignature( - descriptor = "(Ll;Lpi;Lf;)V" + descriptor = "(Ls;Lpx;Lk;)V" ) class1(class7 var1, Buffer var2, class3 var3) { this.this$0 = var1; // L: 47 - this.field0 = var2; // L: 48 - this.field1 = var3; // L: 49 + this.field1 = var2; // L: 48 + this.field3 = var3; // L: 49 } // L: 50 public Object call() { - return this.field1.vmethod12(this.field0); // L: 53 + return this.field3.vmethod19(this.field1); // L: 54 } - @ObfuscatedName("f") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([BIIII[Lgv;I)V", - garbageValue = "1091665610" + descriptor = "(II)Lge;", + garbageValue = "1539440730" ) - static final void method9(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { + public static VarbitComposition method9(int var0) { + VarbitComposition var1 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 28 + if (var1 != null) { + return var1; + } else { + byte[] var2 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 30 + var1 = new VarbitComposition(); // L: 31 + if (var2 != null) { // L: 32 + var1.decode(new Buffer(var2)); + } + + VarbitComposition.VarbitDefinition_cached.put(var1, (long)var0); // L: 33 + return var1; // L: 34 + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Lpc;II)V", + garbageValue = "-285491852" + ) + @Export("updatePlayers") + 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; - int var8; - for (int var6 = 0; var6 < 4; ++var6) { // L: 93 - for (var7 = 0; var7 < 64; ++var7) { // L: 94 - for (var8 = 0; var8 < 64; ++var8) { // L: 95 - if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { // L: 96 - int[] var10000 = var5[var6].flags[var7 + var1]; - var10000[var8 + var2] &= -16777217; + for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 76 + var7 = Players.Players_indices[var4]; // L: 77 + if ((Players.field1301[var7] & 1) == 0) { // L: 78 + if (var3 > 0) { // L: 79 + --var3; // L: 80 + var10000 = Players.field1301; // L: 81 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + var6 = var0.readBits(1); // L: 84 + if (var6 == 0) { // L: 85 + var3 = class18.method249(var0); // L: 86 + var10000 = Players.field1301; // L: 87 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + class230.readPlayerUpdate(var0, var7); // L: 90 } } } } - Buffer var10 = new Buffer(var0); // L: 100 + var0.exportIndex(); // L: 93 + if (var3 != 0) { // L: 94 + throw new RuntimeException(); // L: 95 + } else { + var0.importIndex(); // L: 97 - for (var7 = 0; var7 < 4; ++var7) { // L: 101 - for (var8 = 0; var8 < 64; ++var8) { // L: 102 - for (int var9 = 0; var9 < 64; ++var9) { // L: 103 - class20.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); // L: 104 + for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 98 + var7 = Players.Players_indices[var4]; // L: 99 + if ((Players.field1301[var7] & 1) != 0) { // L: 100 + if (var3 > 0) { // L: 101 + --var3; // L: 102 + var10000 = Players.field1301; // L: 103 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + var6 = var0.readBits(1); // L: 106 + if (var6 == 0) { // L: 107 + var3 = class18.method249(var0); // L: 108 + var10000 = Players.field1301; // L: 109 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + class230.readPlayerUpdate(var0, var7); // L: 112 + } + } + } + } + + var0.exportIndex(); // L: 115 + if (var3 != 0) { // L: 116 + throw new RuntimeException(); // L: 117 + } else { + var0.importIndex(); // L: 119 + + for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 120 + var7 = Players.Players_emptyIndices[var4]; // L: 121 + if ((Players.field1301[var7] & 1) != 0) { // L: 122 + if (var3 > 0) { // L: 123 + --var3; // L: 124 + var10000 = Players.field1301; // L: 125 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + var6 = var0.readBits(1); // L: 128 + if (var6 == 0) { // L: 129 + var3 = class18.method249(var0); // L: 130 + var10000 = Players.field1301; // L: 131 + var10000[var7] = (byte)(var10000[var7] | 2); + } else if (FloorUnderlayDefinition.updateExternalPlayer(var0, var7)) { + var10000 = Players.field1301; // L: 134 + var10000[var7] = (byte)(var10000[var7] | 2); + } + } + } + } + + var0.exportIndex(); // L: 137 + if (var3 != 0) { // L: 138 + throw new RuntimeException(); // L: 139 + } else { + var0.importIndex(); // L: 141 + + for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 142 + var7 = Players.Players_emptyIndices[var4]; // L: 143 + if ((Players.field1301[var7] & 1) == 0) { // L: 144 + if (var3 > 0) { // L: 145 + --var3; // L: 146 + var10000 = Players.field1301; // L: 147 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + var6 = var0.readBits(1); // L: 150 + if (var6 == 0) { // L: 151 + var3 = class18.method249(var0); // L: 152 + var10000 = Players.field1301; // L: 153 + var10000[var7] = (byte)(var10000[var7] | 2); + } else if (FloorUnderlayDefinition.updateExternalPlayer(var0, var7)) { // L: 156 + var10000 = Players.field1301; + var10000[var7] = (byte)(var10000[var7] | 2); + } + } + } + } + + 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 + + Player var5; + for (var4 = 1; var4 < 2048; ++var4) { // L: 165 + var10000 = Players.field1301; // L: 166 + var10000[var4] = (byte)(var10000[var4] >> 1); + 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 + } + } + + for (var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { // L: 173 + var4 = Players.Players_pendingUpdateIndices[var3]; // L: 174 + var5 = Client.players[var4]; // L: 175 + var6 = var0.readUnsignedByte(); // L: 176 + if ((var6 & 2) != 0) { // L: 177 + var6 += var0.readUnsignedByte() << 8; + } + + GrandExchangeOfferNameComparator.method5786(var0, var4, var5, var6); // L: 178 + } + + if (var0.offset - var2 != var1) { // L: 181 + throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 182 + } + } } } } + } // L: 184 - } // L: 108 - - @ObfuscatedName("fu") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Llx;Ljava/lang/String;I)V", - garbageValue = "-1229961038" + descriptor = "(IIB)I", + garbageValue = "0" ) - static void method8(Archive var0, String var1) { - ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1452 - Client.archiveLoaders.add(var2); // L: 1453 - Client.field782 += var2.groupCount; // L: 1454 - } // L: 1455 - - @ObfuscatedName("kb") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-43" - ) - static final void method11(int var0) { - var0 = Math.min(Math.max(var0, 0), 255); // L: 12008 - if (var0 != class131.clientPreferences.method2321()) { // L: 12009 - if (class131.clientPreferences.method2321() == 0 && Client.currentTrackGroupId != -1) { // L: 12010 - class18.method266(class16.archive6, Client.currentTrackGroupId, 0, var0, false); // L: 12011 - Client.playingJingle = false; // L: 12012 - } else if (var0 == 0) { // L: 12014 - class273.midiPcmStream.clear(); // L: 12016 - class273.musicPlayerStatus = 1; // L: 12017 - class273.musicTrackArchive = null; // L: 12018 - Client.playingJingle = false; // L: 12020 - } else if (class273.musicPlayerStatus != 0) { // L: 12023 - class273.musicTrackVolume = var0; - } else { - class273.midiPcmStream.setPcmStreamVolume(var0); // L: 12024 - } - - class131.clientPreferences.method2241(var0); // L: 12026 - } - - } // L: 12028 - - @ObfuscatedName("le") - @ObfuscatedSignature( - descriptor = "(Lky;B)Z", - garbageValue = "-85" - ) - @Export("isComponentHidden") - static boolean isComponentHidden(Widget var0) { - return var0.isHidden; // L: 12463 + public static int method12(int var0, int var1) { + return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; // L: 29 } + + @ObfuscatedName("gq") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1026103514" + ) + static final void method11() { + int var0 = Players.field1317 * 128 + 64; // L: 3977 + int var1 = TileItem.field1292 * 128 + 64; // L: 3978 + int var2 = class202.getTileHeight(var0, var1, class128.Client_plane) - WorldMapSection1.field2898; // L: 3979 + class422.method7303(var0, var2, var1); // L: 3980 + var0 = class267.field3206 * 128 + 64; // L: 3981 + var1 = AbstractWorldMapData.field2851 * 128 + 64; // L: 3982 + var2 = class202.getTileHeight(var0, var1, class128.Client_plane) - ScriptFrame.field457; // L: 3983 + int var3 = var0 - class343.cameraX; // L: 3984 + int var4 = var2 - class295.cameraY; // L: 3985 + int var5 = var1 - FaceNormal.cameraZ; // L: 3986 + int var6 = (int)Math.sqrt((double)(var3 * var3 + var5 * var5)); // L: 3987 + int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.9490051269531D) & 2047; // L: 3988 + int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.9490051269531D) & 2047; // L: 3989 + class241.method4813(var7, var8); // L: 3990 + } // L: 3991 } diff --git a/runescape-client/src/main/java/class10.java b/runescape-client/src/main/java/class10.java index 07bfd5fe81..2c6c1a189f 100644 --- a/runescape-client/src/main/java/class10.java +++ b/runescape-client/src/main/java/class10.java @@ -15,99 +15,85 @@ 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("r") +@ObfuscatedName("y") public class class10 { - @ObfuscatedName("y") - @Export("operatingSystemName") - static String operatingSystemName; - @ObfuscatedName("em") - @ObfuscatedSignature( - descriptor = "Llx;" - ) - @Export("archive2") - static Archive archive2; - @ObfuscatedName("jz") - @ObfuscatedGetter( - intValue = -1267419989 - ) - @Export("oculusOrbFocalPointX") - static int oculusOrbFocalPointX; - @ObfuscatedName("v") - HttpsURLConnection field40; - @ObfuscatedName("c") - final Map field39; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lok;" - ) - class398 field41; - @ObfuscatedName("f") - Map field42; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lo;" - ) - final class9 field50; - @ObfuscatedName("n") - boolean field44; - @ObfuscatedName("s") - boolean field43; + @ObfuscatedName("o") + HttpsURLConnection field48; + @ObfuscatedName("q") + final Map field47; @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1184056315 + @ObfuscatedSignature( + descriptor = "Lot;" ) - int field46; + class399 field54; + @ObfuscatedName("k") + Map field50; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lv;" + ) + final class9 field51; + @ObfuscatedName("m") + boolean field52; + @ObfuscatedName("p") + boolean field53; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -387471539 + ) + int field49; @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;Lo;)V" + descriptor = "(Ljava/net/URL;Lv;)V" ) public class10(URL var1, class9 var2) throws IOException { - this.field44 = false; // L: 20 - this.field43 = false; - this.field46 = 300000; - if (!var2.method63()) { - throw new UnsupportedEncodingException("Unsupported request method used " + var2.method62()); + this.field52 = false; // L: 20 + this.field53 = false; // L: 21 + this.field49 = 300000; + if (!var2.method76()) { + throw new UnsupportedEncodingException("Unsupported request method used " + var2.method67()); } else { - this.field40 = (HttpsURLConnection)var1.openConnection(); // L: 26 - this.field40.setSSLSocketFactory(new class15()); - this.field50 = var2; - this.field39 = new HashMap(); - this.field42 = new HashMap(); // L: 30 + this.field48 = (HttpsURLConnection)var1.openConnection(); // L: 26 + this.field48.setSSLSocketFactory(new class15()); // L: 27 + this.field51 = var2; // L: 28 + this.field47 = new HashMap(); // L: 29 + this.field50 = new HashMap(); // L: 30 } - } + } // L: 31 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-1291882131" + descriptor = "(Ljava/lang/String;Ljava/lang/String;B)V", + garbageValue = "94" ) - public void method77(String var1, String var2) { - if (!this.field44) { - this.field39.put(var1, var2); // L: 35 + public void method78(String var1, String var2) { + if (!this.field52) { // L: 34 + this.field47.put(var1, var2); // L: 35 } - } + } // L: 36 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "2109426095" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "1" ) - String method78() { - ArrayList var1 = new ArrayList(this.field42.entrySet()); - Collections.sort(var1, new class18(this)); - StringBuilder var2 = new StringBuilder(); - Iterator var3 = var1.iterator(); + String method96() { + ArrayList var1 = new ArrayList(this.field50.entrySet()); // L: 39 + Collections.sort(var1, new class18(this)); // L: 40 + StringBuilder var2 = new StringBuilder(); // L: 53 + Iterator var3 = var1.iterator(); // L: 54 while (var3.hasNext()) { - Entry var4 = (Entry)var3.next(); - if (var2.length() > 0) { + Entry var4 = (Entry)var3.next(); // L: 55 + if (var2.length() > 0) { // L: 57 var2.append(","); } - var2.append(((class397)var4.getKey()).method7142()); + var2.append(((class398)var4.getKey()).method6940()); // L: 58 float var5 = (Float)var4.getValue(); // L: 59 - if (var5 < 1.0F) { + if (var5 < 1.0F) { // L: 60 String var6 = Float.toString(var5).substring(0, 4); // L: 61 var2.append(";q=" + var6); // L: 62 } @@ -116,267 +102,545 @@ public class class10 { return var2.toString(); // L: 66 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1987536399" + garbageValue = "-82433388" ) - void method79() throws ProtocolException { - if (!this.field44) { - this.field40.setRequestMethod(this.field50.method62()); - if (!this.field42.isEmpty()) { - this.field39.put("Accept", this.method78()); + void method80() throws ProtocolException { + if (!this.field52) { // L: 70 + this.field48.setRequestMethod(this.field51.method67()); // L: 71 + if (!this.field50.isEmpty()) { // L: 72 + this.field47.put("Accept", this.method96()); } - Iterator var1 = this.field39.entrySet().iterator(); + Iterator var1 = this.field47.entrySet().iterator(); // L: 73 while (var1.hasNext()) { - Entry var2 = (Entry)var1.next(); - this.field40.setRequestProperty((String)var2.getKey(), (String)var2.getValue()); + Entry var2 = (Entry)var1.next(); // L: 74 + this.field48.setRequestProperty((String)var2.getKey(), (String)var2.getValue()); // L: 76 } - if (this.field50.method66() && this.field41 != null) { - this.field40.setDoOutput(true); - ByteArrayOutputStream var13 = new ByteArrayOutputStream(); + if (this.field51.method68() && this.field54 != null) { // L: 79 + this.field48.setDoOutput(true); // L: 80 + ByteArrayOutputStream var13 = new ByteArrayOutputStream(); // L: 81 try { - var13.write(this.field41.vmethod7150()); // L: 83 - var13.writeTo(this.field40.getOutputStream()); // L: 84 - } catch (IOException var11) { - var11.printStackTrace(); + var13.write(this.field54.vmethod6962()); // L: 83 + var13.writeTo(this.field48.getOutputStream()); // L: 84 + } catch (IOException var11) { // L: 86 + var11.printStackTrace(); // L: 87 } finally { if (var13 != null) { // L: 90 try { - var13.close(); - } catch (IOException var10) { - var10.printStackTrace(); + var13.close(); // L: 92 + } catch (IOException var10) { // L: 94 + var10.printStackTrace(); // L: 95 } } } } - this.field40.setConnectTimeout(this.field46); - this.field40.setInstanceFollowRedirects(this.field43); - this.field44 = true; + this.field48.setConnectTimeout(this.field49); // L: 100 + this.field48.setInstanceFollowRedirects(this.field53); // L: 101 + this.field52 = true; // L: 102 } - } + } // L: 103 - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "216770945" + garbageValue = "-1448695521" ) - boolean method86() throws IOException, SocketTimeoutException { - if (!this.field44) { - this.method79(); + boolean method79() throws IOException, SocketTimeoutException { + if (!this.field52) { // L: 106 + this.method80(); } - this.field40.connect(); - return this.field40.getResponseCode() == -1; + this.field48.connect(); // L: 107 + return this.field48.getResponseCode() == -1; // L: 108 } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(B)Ly;", - garbageValue = "-63" + descriptor = "(B)Ld;", + garbageValue = "-1" ) - class21 method81() { + class21 method82() { try { - if (!this.field44 || this.field40.getResponseCode() == -1) { + if (!this.field52 || this.field48.getResponseCode() == -1) { return new class21("No REST response has been received yet."); } } catch (IOException var10) { - this.field40.disconnect(); - return new class21("Error decoding REST response code: " + var10.getMessage()); + this.field48.disconnect(); + return new class21("Error decoding REST response code: " + var10.getMessage()); // L: 118 } - class21 var1 = null; // L: 120 + class21 var1 = null; class21 var3; try { - var1 = new class21(this.field40); // L: 122 + var1 = new class21(this.field48); // L: 122 return var1; } catch (IOException var8) { var3 = new class21("Error decoding REST response: " + var8.getMessage()); // L: 125 } finally { - this.field40.disconnect(); + this.field48.disconnect(); } - return var3; // L: 128 + return var3; } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ldt;FI)F", - garbageValue = "1273799052" + descriptor = "(II)V", + garbageValue = "-1726838595" ) - static float method92(class117 var0, float var1) { - if (var0 != null && var0.method2715() != 0) { // L: 18 - if (var1 < (float)var0.field1411[0].field1373) { // L: 21 - return var0.field1409 == class116.field1403 ? var0.field1411[0].field1376 : UserComparator9.method2616(var0, var1, true); // L: 22 23 25 - } else if (var1 > (float)var0.field1411[var0.method2715() - 1].field1373) { // L: 27 - return var0.field1410 == class116.field1403 ? var0.field1411[var0.method2715() - 1].field1376 : UserComparator9.method2616(var0, var1, false); // L: 28 29 31 - } else if (var0.field1408) { // L: 33 - return var0.field1411[0].field1376; // L: 34 - } else { - class113 var2 = var0.method2736(var1); // L: 36 - boolean var3 = false; // L: 37 - boolean var4 = false; // L: 38 - if (var2 == null) { // L: 39 - return 0.0F; // L: 187 - } else { - float var7; - if (0.0D == (double)var2.field1369 && 0.0D == (double)var2.field1374) { // L: 40 - var3 = true; // L: 41 - } else if (Float.MAX_VALUE == var2.field1369 && var2.field1374 == Float.MAX_VALUE) { // L: 43 - var4 = true; // L: 44 - } else if (var2.field1375 != null) { // L: 46 - if (var0.field1407) { // L: 47 - float[] var5 = new float[4]; // L: 48 - float[] var6 = new float[4]; // L: 49 - var5[0] = (float)var2.field1373; // L: 50 - var6[0] = var2.field1376; // L: 51 - var5[1] = 0.33333334F * var2.field1369 + var5[0]; // L: 52 - var6[1] = var6[0] + var2.field1374 * 0.33333334F; // L: 53 - var5[3] = (float)var2.field1375.field1373; // L: 54 - var6[3] = var2.field1375.field1376; // L: 55 - var5[2] = var5[3] - 0.33333334F * var2.field1375.field1371; // L: 56 - var6[2] = var6[3] - var2.field1375.field1377 * 0.33333334F; // L: 57 - if (var0.field1413) { // L: 58 - if (var0 != null) { // L: 60 - var7 = var5[3] - var5[0]; // L: 63 - if (0.0D != (double)var7) { // L: 64 - float var8 = var5[1] - var5[0]; // L: 67 - float var9 = var5[2] - var5[0]; // L: 68 - Float var10 = var8 / var7; // L: 69 - Float var11 = var9 / var7; // L: 70 - var0.field1412 = var10 == 0.33333334F && var11 == 0.6666667F; // L: 71 - float var12 = var10; // L: 72 - float var13 = var11; // L: 73 - if ((double)var10 < 0.0D) { // L: 74 - var10 = 0.0F; - } + static void method87(int var0) { + GrandExchangeOfferAgeComparator.field4072 = var0; // L: 22 + class387.field4395 = new class387[var0]; // L: 23 + Frames.field2492 = 0; // L: 24 + } // L: 25 - if ((double)var11 > 1.0D) { // L: 75 - var11 = 1.0F; - } + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Lcr;IIB)V", + garbageValue = "-15" + ) + @Export("runScript") + static void runScript(ScriptEvent var0, int var1, int var2) { + Object[] var3 = var0.args; // L: 112 + Script var4; + int var20; + if (class137.isWorldMapEvent(var0.type)) { // L: 114 + class9.worldMapEvent = (WorldMapEvent)var3[0]; // L: 115 + WorldMapElement var5 = class120.WorldMapElement_get(class9.worldMapEvent.mapElement); // L: 116 + var4 = GameObject.getWorldMapScript(var0.type, var5.objectId, var5.category); // L: 117 + } else { + var20 = (Integer)var3[0]; // L: 120 + var4 = class301.getScript(var20); // L: 121 + } - if ((double)var10 > 1.0D || var11 < -1.0F) { // L: 76 - class290.method5558(var10, var11); // L: 77 - } + if (var4 != null) { // L: 123 + class12.Interpreter_intStackSize = 0; // L: 126 + class9.Interpreter_stringStackSize = 0; // L: 127 + var20 = -1; // L: 128 + int[] var6 = var4.opcodes; // L: 129 + int[] var7 = var4.intOperands; // L: 130 + byte var8 = -1; // L: 131 + Interpreter.Interpreter_frameDepth = 0; // L: 132 + Interpreter.field835 = false; // L: 133 + boolean var9 = false; // L: 134 + int var10 = 0; // L: 135 + boolean var30 = false; - if (var10 != var12) { // L: 79 - var5[1] = var5[0] + var10 * var7; // L: 80 - if ((double)var12 != 0.0D) { // L: 81 - var6[1] = var6[0] + (var6[1] - var6[0]) * var10 / var12; // L: 82 + label955: { + label956: { + try { + int var13; + try { + var30 = true; // L: 137 + class21.Interpreter_intLocals = new int[var4.localIntCount]; // L: 138 + int var11 = 0; // L: 139 + class268.Interpreter_stringLocals = new String[var4.localStringCount]; // L: 140 + int var12 = 0; + + int var14; + String var21; + for (var13 = 1; var13 < var3.length; ++var13) { // L: 141 + if (var3[var13] instanceof Integer) { // L: 142 + var14 = (Integer)var3[var13]; // L: 143 + if (var14 == -2147483647) { // L: 144 + var14 = var0.mouseX; + } + + if (var14 == -2147483646) { // L: 145 + var14 = var0.mouseY; + } + + if (var14 == -2147483645) { // L: 146 + var14 = var0.widget != null ? var0.widget.id * 1115174973 * -203153643 : -1; + } + + if (var14 == -2147483644) { // L: 147 + var14 = var0.opIndex; + } + + if (var14 == -2147483643) { // L: 148 + var14 = var0.widget != null ? var0.widget.childIndex * -776270713 * -224921289 : -1; + } + + if (var14 == -2147483642) { // L: 149 + var14 = var0.dragTarget != null ? var0.dragTarget.id * 1115174973 * -203153643 : -1; + } + + if (var14 == -2147483641) { // L: 150 + var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * -776270713 * -224921289 : -1; + } + + if (var14 == -2147483640) { // L: 151 + var14 = var0.keyTyped; + } + + if (var14 == -2147483639) { // L: 152 + var14 = var0.keyPressed; + } + + class21.Interpreter_intLocals[var11++] = var14; // L: 153 + } else if (var3[var13] instanceof String) { // L: 155 + var21 = (String)var3[var13]; // L: 156 + if (var21.equals("event_opbase")) { // L: 157 + var21 = var0.targetName; + } + + class268.Interpreter_stringLocals[var12++] = var21; // L: 158 + } + } + + Interpreter.field823 = var0.field1054; // L: 162 + + while (true) { + ++var10; // L: 164 + if (var10 > var1) { // L: 165 + throw new RuntimeException(); + } + + ++var20; // L: 166 + int var33 = var6[var20]; + if (var33 >= 100) { // L: 167 + boolean var35; + if (var4.intOperands[var20] == 1) { // L: 385 + var35 = true; + } else { + var35 = false; // L: 386 + } + + var14 = KeyHandler.method329(var33, var4, var35); // L: 387 + switch(var14) { // L: 388 + case 0: + var30 = false; + break label955; + case 1: + default: + break; + case 2: + throw new IllegalStateException(); // L: 395 + } + } else if (var33 == ScriptOpcodes.ICONST) { // L: 168 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7[var20]; // L: 169 + } else if (var33 == ScriptOpcodes.GET_VARP) { // L: 172 + var13 = var7[var20]; // L: 173 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; // L: 174 + } else if (var33 == ScriptOpcodes.SET_VARP) { // L: 177 + var13 = var7[var20]; // L: 178 + Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 179 + class321.changeGameOptions(var13); // L: 180 + } else if (var33 == ScriptOpcodes.SCONST) { // L: 183 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.stringOperands[var20]; // L: 184 + } else if (var33 == ScriptOpcodes.JUMP) { // L: 187 + var20 += var7[var20]; // L: 188 + } else if (var33 == ScriptOpcodes.IF_ICMPNE) { // L: 191 + class12.Interpreter_intStackSize -= 2; // L: 192 + if (Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]) { // L: 193 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPEQ) { // L: 196 + class12.Interpreter_intStackSize -= 2; // L: 197 + if (Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]) { // L: 198 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPLT) { // L: 201 + class12.Interpreter_intStackSize -= 2; // L: 202 + if (Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]) { // L: 203 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPGT) { // L: 206 + class12.Interpreter_intStackSize -= 2; // L: 207 + if (Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]) { // L: 208 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.RETURN) { // L: 211 + if (Interpreter.Interpreter_frameDepth == 0) { + var30 = false; + break label956; + } + + ScriptFrame var40 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; // L: 213 + var4 = var40.script; // L: 214 + var6 = var4.opcodes; // L: 215 + var7 = var4.intOperands; // L: 216 + var20 = var40.pc; // L: 217 + class21.Interpreter_intLocals = var40.intLocals; // L: 218 + class268.Interpreter_stringLocals = var40.stringLocals; // L: 219 + } else if (var33 == ScriptOpcodes.GET_VARBIT) { // L: 222 + var13 = var7[var20]; // L: 223 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class18.getVarbit(var13); // L: 224 + } else if (var33 == ScriptOpcodes.SET_VARBIT) { // L: 227 + var13 = var7[var20]; // L: 228 + class92.method2372(var13, Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 229 + } else if (var33 == ScriptOpcodes.IF_ICMPLE) { // L: 232 + class12.Interpreter_intStackSize -= 2; // L: 233 + if (Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]) { // L: 234 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPGE) { // L: 237 + class12.Interpreter_intStackSize -= 2; // L: 238 + if (Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]) { // L: 239 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.ILOAD) { // L: 242 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class21.Interpreter_intLocals[var7[var20]]; // L: 243 + } else if (var33 == ScriptOpcodes.ISTORE) { // L: 246 + class21.Interpreter_intLocals[var7[var20]] = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 247 + } else if (var33 == ScriptOpcodes.SLOAD) { // L: 250 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = class268.Interpreter_stringLocals[var7[var20]]; // L: 251 + } else if (var33 == ScriptOpcodes.SSTORE) { // L: 254 + class268.Interpreter_stringLocals[var7[var20]] = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 255 + } else if (var33 == ScriptOpcodes.JOIN_STRING) { // L: 258 + var13 = var7[var20]; // L: 259 + class9.Interpreter_stringStackSize -= var13; // L: 260 + var21 = StructComposition.method3524(Interpreter.Interpreter_stringStack, class9.Interpreter_stringStackSize, var13); // L: 261 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var21; // L: 262 + } else if (var33 == ScriptOpcodes.POP_INT) { // L: 265 + --class12.Interpreter_intStackSize; // L: 266 + } else if (var33 == ScriptOpcodes.POP_STRING) { // L: 269 + --class9.Interpreter_stringStackSize; // L: 270 + } else { + int var17; + if (var33 != ScriptOpcodes.INVOKE) { // L: 273 + if (var33 == ScriptOpcodes.GET_VARC_INT) { // L: 296 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class125.varcs.getInt(var7[var20]); // L: 297 + } else if (var33 == ScriptOpcodes.SET_VARC_INT) { // L: 300 + class125.varcs.setInt(var7[var20], Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 301 + } else if (var33 == ScriptOpcodes.DEFINE_ARRAY) { // L: 304 + var13 = var7[var20] >> 16; // L: 305 + var14 = var7[var20] & 65535; // L: 306 + int var24 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 307 + if (var24 < 0 || var24 > 5000) { // L: 308 + throw new RuntimeException(); // L: 309 + } + + Interpreter.Interpreter_arrayLengths[var13] = var24; // L: 311 + byte var25 = -1; // L: 312 + if (var14 == 105) { // L: 313 + var25 = 0; + } + + for (var17 = 0; var17 < var24; ++var17) { // L: 314 + Interpreter.Interpreter_arrays[var13][var17] = var25; + } + } else if (var33 == ScriptOpcodes.GET_ARRAY_INT) { // L: 317 + var13 = var7[var20]; // L: 318 + var14 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 319 + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 320 + throw new RuntimeException(); // L: 321 + } + + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; // L: 323 + } else if (var33 == ScriptOpcodes.SET_ARRAY_INT) { // L: 326 + var13 = var7[var20]; // L: 327 + class12.Interpreter_intStackSize -= 2; // L: 328 + var14 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 329 + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 330 + throw new RuntimeException(); // L: 331 + } + + Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 333 + } else { + String var22; + if (var33 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 336 + var22 = class125.varcs.getStringOld(var7[var20]); // L: 337 + if (var22 == null) { // L: 338 + var22 = "null"; + } + + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var22; // L: 339 + } else if (var33 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 342 + class125.varcs.setStringOld(var7[var20], Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]); // L: 343 + } else if (var33 == ScriptOpcodes.GET_VARC_STRING) { // L: 346 + var22 = class125.varcs.getString(var7[var20]); // L: 347 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var22; // L: 348 + } else if (var33 == ScriptOpcodes.SET_VARC_STRING) { // L: 351 + class125.varcs.setString(var7[var20], Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]); // L: 352 + } else if (var33 == ScriptOpcodes.SWITCH) { // L: 355 + IterableNodeHashTable var38 = var4.switches[var7[var20]]; // L: 356 + IntegerNode var37 = (IntegerNode)var38.get((long)Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 357 + if (var37 != null) { // L: 358 + var20 += var37.integer; + } + } else { + Integer var39; + if (var33 == ScriptOpcodes.GET_VARCLANSETTING) { // L: 361 + var39 = FontName.field4583.getTitleGroupValue(var7[var20]); // L: 362 + if (var39 == null) { // L: 363 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 364 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var39; // L: 367 + } + } else { + if (var33 != ScriptOpcodes.GET_VARCLAN) { // L: 371 + throw new IllegalStateException(); // L: 381 + } + + var39 = UserComparator8.field1378.method6905(var7[var20]); // L: 372 + if (var39 == null) { // L: 373 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 374 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var39; // L: 377 + } + } } } + } else { + var13 = var7[var20]; // L: 274 + Script var36 = class301.getScript(var13); // L: 275 + int[] var15 = new int[var36.localIntCount]; // L: 276 + String[] var16 = new String[var36.localStringCount]; // L: 277 - if (var11 != var13) { // L: 85 - var5[2] = var5[0] + var11 * var7; // L: 86 - if (1.0D != (double)var13) { // L: 87 - var6[2] = (float)((double)var6[3] - (double)(var6[3] - var6[2]) * (1.0D - (double)var11) / (1.0D - (double)var13)); // L: 88 - } + for (var17 = 0; var17 < var36.intArgumentCount; ++var17) { // L: 278 + var15[var17] = Interpreter.Interpreter_intStack[var17 + (class12.Interpreter_intStackSize - var36.intArgumentCount)]; } - var0.field1422 = var5[0]; // L: 91 - var0.field1414 = var5[3]; // L: 92 - float var14 = var10; // L: 93 - float var15 = var11; // L: 94 - float[] var16 = var0.field1415; // L: 95 - float var17 = var14 - 0.0F; // L: 97 - float var18 = var15 - var14; // L: 98 - float var19 = 1.0F - var15; // L: 99 - float var20 = var18 - var17; // L: 100 - var16[3] = var19 - var18 - var20; // L: 101 - var16[2] = var20 + var20 + var20; // L: 102 - var16[1] = var17 + var17 + var17; // L: 103 - var16[0] = 0.0F; // L: 104 - var17 = var6[0]; // L: 106 - var18 = var6[1]; // L: 107 - var19 = var6[2]; // L: 108 - var20 = var6[3]; // L: 109 - float[] var21 = var0.field1416; // L: 110 - float var22 = var18 - var17; // L: 112 - float var23 = var19 - var18; // L: 113 - float var24 = var20 - var19; // L: 114 - float var25 = var23 - var22; // L: 115 - var21[3] = var24 - var23 - var25; // L: 116 - var21[2] = var25 + var25 + var25; // L: 117 - var21[1] = var22 + var22 + var22; // L: 118 - var21[0] = var17; // L: 119 + for (var17 = 0; var17 < var36.stringArgumentCount; ++var17) { // L: 279 + var16[var17] = Interpreter.Interpreter_stringStack[var17 + (class9.Interpreter_stringStackSize - var36.stringArgumentCount)]; + } + + class12.Interpreter_intStackSize -= var36.intArgumentCount; // L: 280 + class9.Interpreter_stringStackSize -= var36.stringArgumentCount; // L: 281 + ScriptFrame var23 = new ScriptFrame(); // L: 282 + var23.script = var4; // L: 283 + var23.pc = var20; // L: 284 + var23.intLocals = class21.Interpreter_intLocals; // L: 285 + var23.stringLocals = class268.Interpreter_stringLocals; // L: 286 + Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var23; // L: 287 + var4 = var36; // L: 288 + var6 = var36.opcodes; // L: 289 + var7 = var36.intOperands; // L: 290 + var20 = -1; // L: 291 + class21.Interpreter_intLocals = var15; // L: 292 + class268.Interpreter_stringLocals = var16; // L: 293 } } - } else { - UserComparator8.method2574(var0, var5, var6); // L: 124 } + } catch (Exception var31) { // L: 401 + var9 = true; // L: 402 + StringBuilder var27 = new StringBuilder(30); // L: 404 + var27.append("").append(var4.key).append(" "); // L: 405 + var13 = Interpreter.Interpreter_frameDepth - 1; // L: 406 - var0.field1407 = false; // L: 126 - } - } else { - var3 = true; // L: 130 - } - - if (var3) { // L: 132 - return var2.field1376; // L: 133 - } else if (var4) { // L: 135 - return (float)var2.field1373 != var1 && var2.field1375 != null ? var2.field1375.field1376 : var2.field1376; // L: 136 137 140 - } else if (var0.field1413) { // L: 143 - float var30; - if (var0 == null) { // L: 146 - var30 = 0.0F; // L: 147 - } else { - float var26; - if (var0.field1422 == var1) { // L: 151 - var26 = 0.0F; // L: 152 - } else if (var0.field1414 == var1) { // L: 154 - var26 = 1.0F; // L: 155 - } else { - var26 = (var1 - var0.field1422) / (var0.field1414 - var0.field1422); // L: 158 - } - - if (var0.field1412) { // L: 161 - var7 = var26; // L: 162 - } else { - float[] var27 = new float[]{var0.field1415[0] - var26, var0.field1415[1], var0.field1415[2], var0.field1415[3]}; // L: 165 166 167 168 169 - float[] var28 = new float[5]; // L: 170 - int var29 = class132.method2888(var27, 3, 0.0F, true, 1.0F, true, var28); // L: 171 - if (var29 == 1) { // L: 172 - var7 = var28[0]; // L: 173 - } else { - var7 = 0.0F; // L: 176 + while (true) { + if (var13 < 0) { + var27.append("").append(var8); // L: 407 + ArchiveDiskActionHandler.RunException_sendStackTrace(var27.toString(), var31); // L: 408 + var30 = false; + break; } + + var27.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" "); + --var13; + } + } + } finally { + if (var30) { + while (Interpreter.field821.size() > 0) { + class93 var19 = (class93)Interpreter.field821.remove(0); // L: 413 + TaskHandler.widgetDefaultMenuAction(var19.method2379(), var19.method2380(), var19.method2389(), var19.method2382(), ""); + } + + if (Interpreter.field835) { // L: 416 + Interpreter.field835 = false; // L: 417 + Varps.method5366(); // L: 418 + } + + if (!var9 && var2 > 0 && var10 >= var2) { + ArchiveDiskActionHandler.RunException_sendStackTrace("Warning: Script " + var4.field949 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); } - var30 = var0.field1416[0] + (var0.field1416[1] + var7 * (var7 * var0.field1416[3] + var0.field1416[2])) * var7; // L: 179 } - - return var30; // L: 181 - } else { - return class147.method3106(var0, var1); // L: 184 } + + while (Interpreter.field821.size() > 0) { // L: 412 + class93 var26 = (class93)Interpreter.field821.remove(0); + TaskHandler.widgetDefaultMenuAction(var26.method2379(), var26.method2380(), var26.method2389(), var26.method2382(), ""); + } + + if (Interpreter.field835) { + Interpreter.field835 = false; + Varps.method5366(); + } + + if (!var9 && var2 > 0 && var10 >= var2) { + ArchiveDiskActionHandler.RunException_sendStackTrace("Warning: Script " + var4.field949 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } + + return; // L: 424 } + + while (Interpreter.field821.size() > 0) { + class93 var41 = (class93)Interpreter.field821.remove(0); + TaskHandler.widgetDefaultMenuAction(var41.method2379(), var41.method2380(), var41.method2389(), var41.method2382(), ""); + } + + if (Interpreter.field835) { + Interpreter.field835 = false; + Varps.method5366(); + } + + if (!var9 && var2 > 0 && var10 >= var2) { + ArchiveDiskActionHandler.RunException_sendStackTrace("Warning: Script " + var4.field949 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } + + return; // L: 212 } - } else { - return 0.0F; // L: 19 + + while (Interpreter.field821.size() > 0) { + class93 var34 = (class93)Interpreter.field821.remove(0); + TaskHandler.widgetDefaultMenuAction(var34.method2379(), var34.method2380(), var34.method2389(), var34.method2382(), ""); // L: 414 + } + + if (Interpreter.field835) { + Interpreter.field835 = false; + Varps.method5366(); + } + + if (!var9 && var2 > 0 && var10 >= var2) { // L: 420 + ArchiveDiskActionHandler.RunException_sendStackTrace("Warning: Script " + var4.field949 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); // L: 421 + } + } + } // L: 124 390 + + @ObfuscatedName("fl") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1044379624" + ) + static int method94(int var0) { + return var0 * 3 + 600; // L: 1500 } - @ObfuscatedName("ax") + @ObfuscatedName("jc") @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "-3" + descriptor = "(Lki;IIS)V", + garbageValue = "138" ) - static int method87(int var0, Script var1, boolean var2) { - if (var0 == 6900) { // L: 4535 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 4536 - return 1; // L: 4537 - } else if (var0 == 6950) { // L: 4539 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4540 - return 1; // L: 4541 - } else { - return 2; // L: 4543 + @Export("clickWidget") + static final void clickWidget(Widget var0, int var1, int var2) { + if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 11776 + if (var0 != null && class146.method2992(var0) != null) { // L: 11777 + Client.clickedWidget = var0; // L: 11778 + Client.clickedWidgetParent = class146.method2992(var0); // L: 11779 + Client.widgetClickX = var1; // L: 11780 + Client.widgetClickY = var2; // L: 11781 + SoundSystem.widgetDragDuration = 0; // L: 11782 + Client.isDraggingWidget = false; // L: 11783 + int var3 = Client.menuOptionsCount - 1; // L: 11786 + if (var3 != -1) { // L: 11789 + Players.method2426(var3); + } + + } } - } + } // L: 11790 } diff --git a/runescape-client/src/main/java/class101.java b/runescape-client/src/main/java/class101.java index 9bc7df8ed1..102e3de80c 100644 --- a/runescape-client/src/main/java/class101.java +++ b/runescape-client/src/main/java/class101.java @@ -6,142 +6,130 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cd") +@ObfuscatedName("cj") public class class101 extends UrlRequester { - @ObfuscatedName("v") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lcw;I)V", - garbageValue = "1977687936" + descriptor = "Lqd;" ) - void vmethod2546(UrlRequest var1) throws IOException { - URLConnection var2 = null; // L: 11 + @Export("options_buttons_2Sprite") + static IndexedSprite options_buttons_2Sprite; + @ObfuscatedName("eg") + @ObfuscatedSignature( + descriptor = "Lle;" + ) + @Export("archive14") + static Archive archive14; + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lcb;I)V", + garbageValue = "717056983" + ) + void vmethod2544(UrlRequest var1) throws IOException { + URLConnection var2 = null; // L: 12 try { try { - String var3 = var1.url.getProtocol(); // L: 13 - if (var3.equals("http")) { // L: 14 - var2 = this.method2539(var1); // L: 15 + String var3 = var1.url.getProtocol(); // L: 14 + if (var3.equals("http")) { // L: 15 + var2 = this.method2542(var1); // L: 16 } else { - if (!var3.equals("https")) { // L: 17 - var1.isDone0 = true; // L: 21 - return; + if (!var3.equals("https")) { // L: 18 + var1.isDone0 = true; // L: 22 + return; // L: 23 } - var2 = this.method2541(var1); // L: 18 + var2 = this.method2545(var1); // L: 19 } - this.method2518(var2, var1); // L: 24 - } catch (IOException var7) { // L: 26 + this.method2518(var2, var1); // L: 25 + } catch (IOException var7) { } } finally { - var1.isDone0 = true; // L: 28 - if (var2 != null) { // L: 29 - if (var2 instanceof HttpURLConnection) { // L: 30 - ((HttpURLConnection)var2).disconnect(); // L: 31 - } else if (var2 instanceof HttpsURLConnection) { // L: 33 - ((HttpsURLConnection)var2).disconnect(); // L: 34 + var1.isDone0 = true; // L: 29 + if (var2 != null) { // L: 30 + if (var2 instanceof HttpURLConnection) { // L: 31 + ((HttpURLConnection)var2).disconnect(); // L: 32 + } else if (var2 instanceof HttpsURLConnection) { // L: 34 + ((HttpsURLConnection)var2).disconnect(); // L: 35 } } } - } // L: 38 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Lcw;I)Ljava/net/URLConnection;", - garbageValue = "443987385" - ) - URLConnection method2539(UrlRequest var1) throws IOException { - URLConnection var2 = var1.url.openConnection(); // L: 41 - this.method2517(var2); // L: 42 - return var2; // L: 43 - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Lcw;B)Ljava/net/URLConnection;", - garbageValue = "48" - ) - URLConnection method2541(UrlRequest var1) throws IOException { - HttpsURLConnection var2 = (HttpsURLConnection)var1.url.openConnection(); // L: 47 - var2.setSSLSocketFactory(new class15()); // L: 48 - this.method2517(var2); // L: 49 - return var2; // L: 50 - } + } // L: 39 @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;II[BII)I", - garbageValue = "-264358279" + descriptor = "(Lcb;B)Ljava/net/URLConnection;", + garbageValue = "18" ) - @Export("encodeStringCp1252") - public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { - int var5 = var2 - var1; // L: 95 + URLConnection method2542(UrlRequest var1) throws IOException { + URLConnection var2 = var1.url.openConnection(); // L: 42 + this.method2517(var2); // L: 43 + return var2; // L: 44 + } - for (int var6 = 0; var6 < var5; ++var6) { // L: 96 - char var7 = var0.charAt(var6 + var1); // L: 97 - if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 98 - var3[var6 + var4] = (byte)var7; - } else if (var7 == 8364) { // L: 99 - var3[var6 + var4] = -128; - } else if (var7 == 8218) { // L: 100 - var3[var6 + var4] = -126; - } else if (var7 == 402) { // L: 101 - var3[var6 + var4] = -125; - } else if (var7 == 8222) { // L: 102 - var3[var6 + var4] = -124; - } else if (var7 == 8230) { // L: 103 - var3[var6 + var4] = -123; - } else if (var7 == 8224) { // L: 104 - var3[var6 + var4] = -122; - } else if (var7 == 8225) { // L: 105 - var3[var6 + var4] = -121; - } else if (var7 == 710) { - var3[var6 + var4] = -120; // L: 106 - } else if (var7 == 8240) { // L: 107 - var3[var6 + var4] = -119; - } else if (var7 == 352) { // L: 108 - var3[var6 + var4] = -118; - } else if (var7 == 8249) { // L: 109 - var3[var6 + var4] = -117; - } else if (var7 == 338) { // L: 110 - var3[var6 + var4] = -116; - } else if (var7 == 381) { // L: 111 - var3[var6 + var4] = -114; - } else if (var7 == 8216) { // L: 112 - var3[var6 + var4] = -111; - } else if (var7 == 8217) { // L: 113 - var3[var6 + var4] = -110; - } else if (var7 == 8220) { // L: 114 - var3[var6 + var4] = -109; - } else if (var7 == 8221) { // L: 115 - var3[var6 + var4] = -108; - } else if (var7 == 8226) { // L: 116 - var3[var6 + var4] = -107; - } else if (var7 == 8211) { // L: 117 - var3[var6 + var4] = -106; - } else if (var7 == 8212) { - var3[var6 + var4] = -105; // L: 118 - } else if (var7 == 732) { // L: 119 - var3[var6 + var4] = -104; - } else if (var7 == 8482) { // L: 120 - var3[var6 + var4] = -103; - } else if (var7 == 353) { // L: 121 - var3[var6 + var4] = -102; - } else if (var7 == 8250) { // L: 122 - var3[var6 + var4] = -101; - } else if (var7 == 339) { // L: 123 - var3[var6 + var4] = -100; - } else if (var7 == 382) { // L: 124 - var3[var6 + var4] = -98; - } else if (var7 == 376) { // L: 125 - var3[var6 + var4] = -97; - } else { - var3[var6 + var4] = 63; // L: 126 + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Lcb;I)Ljava/net/URLConnection;", + garbageValue = "2078171719" + ) + URLConnection method2545(UrlRequest var1) throws IOException { + HttpsURLConnection var2 = (HttpsURLConnection)var1.url.openConnection(); // L: 48 + var2.setSSLSocketFactory(new class15()); // L: 49 + this.method2517(var2); // L: 50 + return var2; // L: 51 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;B)I", + garbageValue = "64" + ) + @Export("hashString") + public static int hashString(CharSequence var0) { + int var1 = var0.length(); // L: 132 + int var2 = 0; // L: 133 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 134 + var2 = (var2 << 5) - var2 + UserComparator5.charToByteCp1252(var0.charAt(var3)); + } + + return var2; // L: 135 + } + + @ObfuscatedName("gx") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "13" + ) + static final int method2551() { + if (class12.clientPreferences.method2222()) { // L: 5001 + return class128.Client_plane; + } else { + int var0 = class202.getTileHeight(class343.cameraX, FaceNormal.cameraZ, class128.Client_plane); // L: 5002 + return var0 - class295.cameraY < 800 && (Tiles.Tiles_renderFlags[class128.Client_plane][class343.cameraX >> 7][FaceNormal.cameraZ >> 7] & 4) != 0 ? class128.Client_plane : 3; // L: 5003 5004 + } + } + + @ObfuscatedName("lz") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "85689367" + ) + static void method2552() { + if (class127.field1570 != null) { // L: 12698 + Client.field767 = Client.cycle; // L: 12699 + class127.field1570.method5851(); // L: 12700 + + for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 12701 + if (Client.players[var0] != null) { // L: 12702 + class127.field1570.method5848((Client.players[var0].x >> 7) + SecureRandomCallable.baseX, (Client.players[var0].y >> 7) + GrandExchangeOfferOwnWorldComparator.baseY); // L: 12703 + } } } - return var5; // L: 128 - } + } // L: 12707 } diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java index d50b8d8545..79ce792ace 100644 --- a/runescape-client/src/main/java/class11.java +++ b/runescape-client/src/main/java/class11.java @@ -7,425 +7,50 @@ 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; import org.bouncycastle.crypto.tls.Certificate; import org.bouncycastle.crypto.tls.CertificateRequest; import org.bouncycastle.crypto.tls.TlsAuthentication; import org.bouncycastle.crypto.tls.TlsCredentials; -@ObfuscatedName("p") +@ObfuscatedName("c") class class11 implements TlsAuthentication { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - @Export("VarbitDefinition_archive") - public static AbstractArchive VarbitDefinition_archive; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - @Export("SequenceDefinition_archive") - static AbstractArchive SequenceDefinition_archive; - @ObfuscatedName("fx") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -2100133853 + intValue = 824355601 ) - static int field54; - @ObfuscatedName("iv") - @ObfuscatedSignature( - descriptor = "[Lqi;" - ) - @Export("crossSprites") - static SpritePixels[] crossSprites; + @Export("cacheGamebuild") + static int cacheGamebuild; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lk;" + descriptor = "Lb;" ) final class13 this$2; @ObfuscatedSignature( - descriptor = "(Lk;)V" + descriptor = "(Lb;)V" ) class11(class13 var1) { - this.this$2 = var1; // L: 246 + this.this$2 = var1; // L: 303 } public void notifyServerCertificate(Certificate var1) throws IOException { try { - CertificateFactory var2 = CertificateFactory.getInstance("X.509"); // L: 249 - LinkedList var3 = new LinkedList(); // L: 250 - org.bouncycastle.asn1.x509.Certificate[] var4 = var1.getCertificateList(); // L: 252 + CertificateFactory var2 = CertificateFactory.getInstance("X.509"); // L: 307 + LinkedList var3 = new LinkedList(); // L: 308 + org.bouncycastle.asn1.x509.Certificate[] var4 = var1.getCertificateList(); // L: 310 - for (int var5 = 0; var5 < var4.length; ++var5) { // L: 253 - org.bouncycastle.asn1.x509.Certificate var6 = var4[var5]; // L: 254 - var3.add(var2.generateCertificate(new ByteArrayInputStream(var6.getEncoded()))); // L: 256 + for (int var5 = 0; var5 < var4.length; ++var5) { // L: 311 + org.bouncycastle.asn1.x509.Certificate var6 = var4[var5]; // L: 312 + var3.add(var2.generateCertificate(new ByteArrayInputStream(var6.getEncoded()))); // L: 314 } - this.this$2.this$1.field62 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); // L: 260 - } catch (CertificateException var7) { // L: 262 - throw new IOException(var7); // L: 263 + this.this$2.this$1.field63 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); // L: 318 + } catch (CertificateException var7) { // L: 320 + throw new IOException(var7); // L: 321 } - } // L: 265 + } // L: 323 public TlsCredentials getClientCredentials(CertificateRequest var1) throws IOException { - return null; // L: 268 - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-513388138" - ) - static int method100(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 6600) { // L: 4118 - var3 = class18.Client_plane; // L: 4119 - int var15 = (GrandExchangeEvents.localPlayer.x >> 7) + GrandExchangeOfferOwnWorldComparator.baseX; // L: 4120 - int var8 = (GrandExchangeEvents.localPlayer.y >> 7) + VarcInt.baseY; // L: 4121 - class21.getWorldMap().method7327(var3, var15, var8, true); // L: 4122 - return 1; // L: 4123 - } else { - WorldMapArea var9; - if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 4125 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4126 - String var16 = ""; // L: 4127 - var9 = class21.getWorldMap().getMapArea(var3); // L: 4128 - if (var9 != null) { // L: 4129 - var16 = var9.getExternalName(); // L: 4130 - } - - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var16; // L: 4132 - return 1; // L: 4133 - } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 4135 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4136 - class21.getWorldMap().setCurrentMapAreaId(var3); // L: 4137 - return 1; // L: 4138 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 4140 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.getWorldMap().getZoomLevel(); // L: 4141 - return 1; // L: 4142 - } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 4144 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4145 - class21.getWorldMap().setZoomPercentage(var3); // L: 4146 - return 1; // L: 4147 - } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 4149 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 4150 - return 1; // L: 4151 - } else { - Coord var14; - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 4153 - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4154 - class21.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 4155 - return 1; // L: 4156 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 4158 - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4159 - class21.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 4160 - return 1; // L: 4161 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 4163 - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4164 - class21.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 4165 - return 1; // L: 4166 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 4168 - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4169 - class21.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 4170 - return 1; // L: 4171 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 4173 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.getWorldMap().getDisplayX(); // L: 4174 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.getWorldMap().getDisplayY(); // L: 4175 - return 1; // L: 4176 - } else { - WorldMapArea var11; - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 4178 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4179 - var11 = class21.getWorldMap().getMapArea(var3); // L: 4180 - if (var11 == null) { // L: 4181 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4182 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 4185 - } - - return 1; // L: 4187 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 4189 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4190 - var11 = class21.getWorldMap().getMapArea(var3); // L: 4191 - if (var11 == null) { // L: 4192 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4193 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4194 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 4197 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 4198 - } - - return 1; // L: 4200 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 4202 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4203 - var11 = class21.getWorldMap().getMapArea(var3); // L: 4204 - if (var11 == null) { // L: 4205 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4206 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4207 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4208 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4209 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 4212 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 4213 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 4214 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 4215 - } - - return 1; // L: 4217 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 4219 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4220 - var11 = class21.getWorldMap().getMapArea(var3); // L: 4221 - if (var11 == null) { // L: 4222 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4223 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 4226 - } - - return 1; // L: 4228 - } else if (var0 == 6615) { // L: 4230 - var14 = class21.getWorldMap().getDisplayCoord(); // L: 4231 - if (var14 == null) { // L: 4232 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4233 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4234 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.x; // L: 4237 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.y; // L: 4238 - } - - return 1; // L: 4240 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 4242 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.getWorldMap().currentMapAreaId(); // L: 4243 - return 1; // L: 4244 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 4246 - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4247 - var11 = class21.getWorldMap().getCurrentMapArea(); // L: 4248 - if (var11 == null) { // L: 4249 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4250 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4251 - return 1; // L: 4252 - } else { - int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 4254 - if (var12 == null) { // L: 4255 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4256 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4257 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12[0]; // L: 4260 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12[1]; // L: 4261 - } - - return 1; // L: 4263 - } - } else { - Coord var5; - if (var0 == 6618) { // L: 4265 - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4266 - var11 = class21.getWorldMap().getCurrentMapArea(); // L: 4267 - if (var11 == null) { // L: 4268 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4269 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4270 - return 1; // L: 4271 - } else { - var5 = var11.coord(var14.x, var14.y); // L: 4273 - if (var5 == null) { // L: 4274 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4275 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.packed(); // L: 4278 - } - - return 1; // L: 4280 - } - } else { - Coord var10; - if (var0 == 6619) { // L: 4282 - Interpreter.Interpreter_intStackSize -= 2; // L: 4283 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4284 - var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 4285 - GameEngine.method570(var3, var10, false); // L: 4286 - return 1; // L: 4287 - } else if (var0 == 6620) { // L: 4289 - Interpreter.Interpreter_intStackSize -= 2; // L: 4290 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4291 - var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 4292 - GameEngine.method570(var3, var10, true); // L: 4293 - return 1; // L: 4294 - } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 4296 - Interpreter.Interpreter_intStackSize -= 2; // L: 4297 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4298 - var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 4299 - var9 = class21.getWorldMap().getMapArea(var3); // L: 4300 - if (var9 == null) { // L: 4301 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4302 - return 1; // L: 4303 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 4305 - return 1; // L: 4306 - } - } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 4308 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.getWorldMap().getDisplayWith(); // L: 4309 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.getWorldMap().getDisplayHeight(); // L: 4310 - return 1; // L: 4311 - } else if (var0 == 6623) { // L: 4313 - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4314 - var11 = class21.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 4315 - if (var11 == null) { // L: 4316 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4317 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getId(); // L: 4320 - } - - return 1; // L: 4322 - } else if (var0 == 6624) { // L: 4324 - class21.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4325 - return 1; // L: 4326 - } else if (var0 == 6625) { // L: 4328 - class21.getWorldMap().resetMaxFlashCount(); // L: 4329 - return 1; // L: 4330 - } else if (var0 == 6626) { // L: 4332 - class21.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4333 - return 1; // L: 4334 - } else if (var0 == 6627) { // L: 4336 - class21.getWorldMap().resetCyclesPerFlash(); // L: 4337 - return 1; // L: 4338 - } else { - boolean var13; - if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 4340 - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 4341 - class21.getWorldMap().setPerpetualFlash(var13); // L: 4342 - return 1; // L: 4343 - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 4345 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4346 - class21.getWorldMap().flashElement(var3); // L: 4347 - return 1; // L: 4348 - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 4350 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4351 - class21.getWorldMap().flashCategory(var3); // L: 4352 - return 1; // L: 4353 - } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 4355 - class21.getWorldMap().stopCurrentFlashes(); // L: 4356 - return 1; // L: 4357 - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 4359 - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 4360 - class21.getWorldMap().setElementsDisabled(var13); // L: 4361 - return 1; // L: 4362 - } else { - boolean var7; - if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 4364 - Interpreter.Interpreter_intStackSize -= 2; // L: 4365 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4366 - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 4367 - class21.getWorldMap().disableElement(var3, var7); // L: 4368 - return 1; // L: 4369 - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 4371 - Interpreter.Interpreter_intStackSize -= 2; // L: 4372 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4373 - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 4374 - class21.getWorldMap().setCategoryDisabled(var3, var7); // L: 4375 - return 1; // L: 4376 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 4378 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 4379 - return 1; // L: 4380 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 4382 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4383 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 4384 - return 1; // L: 4385 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 4387 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4388 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class21.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 4389 - return 1; // L: 4390 - } else if (var0 == 6638) { // L: 4392 - Interpreter.Interpreter_intStackSize -= 2; // L: 4393 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4394 - var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 4395 - var5 = class21.getWorldMap().method7269(var3, var10); // L: 4396 - if (var5 == null) { // L: 4397 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4398 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.packed(); // L: 4401 - } - - return 1; // L: 4403 - } else { - AbstractWorldMapIcon var6; - if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 4405 - var6 = class21.getWorldMap().iconStart(); // L: 4406 - if (var6 == null) { // L: 4407 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4408 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4409 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4412 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4413 - } - - return 1; // L: 4415 - } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 4417 - var6 = class21.getWorldMap().iconNext(); // L: 4418 - if (var6 == null) { // L: 4419 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4420 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4421 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4424 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4425 - } - - return 1; // L: 4427 - } else { - WorldMapElement var4; - if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 4429 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4430 - var4 = UserComparator7.WorldMapElement_get(var3); // L: 4431 - if (var4.name == null) { // L: 4432 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 4433 - } else { - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.name; // L: 4436 - } - - return 1; // L: 4438 - } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 4440 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4441 - var4 = UserComparator7.WorldMapElement_get(var3); // L: 4442 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.textSize; // L: 4443 - return 1; // L: 4444 - } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 4446 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4447 - var4 = UserComparator7.WorldMapElement_get(var3); // L: 4448 - if (var4 == null) { // L: 4449 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4450 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.category; // L: 4453 - } - - return 1; // L: 4455 - } else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 4457 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4458 - var4 = UserComparator7.WorldMapElement_get(var3); // L: 4459 - if (var4 == null) { // L: 4460 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4461 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.sprite1; // L: 4464 - } - - return 1; // L: 4466 - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 4468 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.worldMapEvent.mapElement; // L: 4469 - return 1; // L: 4470 - } else if (var0 == 6698) { // L: 4472 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.worldMapEvent.coord1.packed(); // L: 4473 - return 1; // L: 4474 - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 4476 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpotAnimationDefinition.worldMapEvent.coord2.packed(); // L: 4477 - return 1; // L: 4478 - } else { - return 2; // L: 4480 - } - } - } - } - } - } - } - } - } - } + return null; // L: 327 } } diff --git a/runescape-client/src/main/java/class112.java b/runescape-client/src/main/java/class112.java index 147982d06e..75af493975 100644 --- a/runescape-client/src/main/java/class112.java +++ b/runescape-client/src/main/java/class112.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("dc") +@ObfuscatedName("do") public interface class112 { } diff --git a/runescape-client/src/main/java/class113.java b/runescape-client/src/main/java/class113.java index ee422b0707..e88ca527e1 100644 --- a/runescape-client/src/main/java/class113.java +++ b/runescape-client/src/main/java/class113.java @@ -3,81 +3,119 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dm") +@ObfuscatedName("di") public class class113 { - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lnm;" - ) - static Bounds field1378; - @ObfuscatedName("fv") - static String field1372; - @ObfuscatedName("gr") - @ObfuscatedSignature( - descriptor = "Lmd;" - ) - @Export("fontPlain11") - static Font fontPlain11; - @ObfuscatedName("v") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1540502007 + intValue = -1838363621 ) - int field1373; - @ObfuscatedName("c") - float field1376; - @ObfuscatedName("i") - float field1371; - @ObfuscatedName("f") - float field1377; - @ObfuscatedName("b") - float field1369; - @ObfuscatedName("n") - float field1374; - @ObfuscatedName("s") + static int field1421; + @ObfuscatedName("ns") @ObfuscatedSignature( - descriptor = "Ldm;" + descriptor = "Lki;" ) - class113 field1375; + static Widget field1422; + @ObfuscatedName("ne") + @ObfuscatedGetter( + intValue = 1983455525 + ) + @Export("selectedSpellFlags") + static int selectedSpellFlags; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -272617605 + ) + int field1430; + @ObfuscatedName("q") + float field1428; + @ObfuscatedName("l") + float field1423; + @ObfuscatedName("k") + float field1424; + @ObfuscatedName("a") + float field1425; + @ObfuscatedName("m") + float field1426; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Ldi;" + ) + class113 field1427; class113() { - this.field1371 = Float.MAX_VALUE; // L: 8 - this.field1377 = Float.MAX_VALUE; // L: 9 - this.field1369 = Float.MAX_VALUE; // L: 10 - this.field1374 = Float.MAX_VALUE; // L: 11 - } // L: 14 + this.field1423 = Float.MAX_VALUE; // L: 8 + this.field1424 = Float.MAX_VALUE; // L: 9 + this.field1425 = Float.MAX_VALUE; // L: 10 + this.field1426 = Float.MAX_VALUE; // L: 11 + } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;IB)V", - garbageValue = "51" + descriptor = "(Lpx;II)V", + garbageValue = "-1602426305" ) - void method2647(Buffer var1, int var2) { - this.field1373 = var1.readShort(); // L: 17 - this.field1376 = var1.method7681(); // L: 18 - this.field1371 = var1.method7681(); // L: 19 - this.field1377 = var1.method7681(); // L: 20 - this.field1369 = var1.method7681(); // L: 21 - this.field1374 = var1.method7681(); // L: 22 + void method2621(Buffer var1, int var2) { + this.field1430 = var1.readShort(); // L: 17 + this.field1428 = var1.method7570(); + this.field1423 = var1.method7570(); + this.field1424 = var1.method7570(); // L: 20 + this.field1425 = var1.method7570(); // L: 21 + this.field1426 = var1.method7570(); // L: 22 } // L: 23 - @ObfuscatedName("kw") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2120622991" + descriptor = "(I)J", + garbageValue = "1202809250" ) - static final void method2650(int var0) { - var0 = Math.max(Math.min(var0, 100), 0); // L: 11987 - var0 = 100 - var0; // L: 11988 - float var1 = (float)var0 / 200.0F + 0.5F; // L: 11989 - KitDefinition.method3453((double)var1); // L: 11990 - } // L: 11991 + public static final synchronized long method2624() { + long var0 = System.currentTimeMillis(); // L: 14 + if (var0 < class269.field3215) { // L: 15 + class269.field3217 += class269.field3215 - var0; // L: 16 + } - @ObfuscatedName("lt") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1995001878" - ) - public static boolean method2651() { - return Client.staffModLevel >= 2; // L: 12599 + class269.field3215 = var0; // L: 18 + return class269.field3217 + var0; // L: 19 } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[II)V", + garbageValue = "-530991411" + ) + public static void method2625(String[] var0, int[] var1) { + InterfaceParent.method2072(var0, var1, 0, var0.length - 1); // L: 39 + } // L: 40 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ldz;[F[FB)V", + garbageValue = "-37" + ) + static void method2623(class117 var0, float[] var1, float[] var2) { + if (var0 != null) { // L: 295 + var0.field1478 = var1[0]; // L: 298 + float var3 = var1[3] - var1[0]; // L: 299 + float var4 = var2[3] - var2[0]; // L: 300 + float var5 = var1[1] - var1[0]; // L: 301 + float var6 = 0.0F; // L: 302 + float var7 = 0.0F; // L: 303 + if (0.0D != (double)var5) { // L: 304 + var6 = (var2[1] - var2[0]) / var5; // L: 305 + } + + var5 = var1[3] - var1[2]; // L: 307 + if ((double)var5 != 0.0D) { // L: 308 + var7 = (var2[3] - var2[2]) / var5; // L: 309 + } + + float var8 = 1.0F / (var3 * var3); // L: 311 + float var9 = var6 * var3; // L: 312 + float var10 = var3 * var7; // L: 313 + var0.field1473[0] = (var9 + var10 - var4 - var4) * var8 / var3; // L: 314 + var0.field1473[1] = (var4 + var4 + var4 - var9 - var9 - var10) * var8; // L: 315 + var0.field1473[2] = var6; // L: 316 + var0.field1473[3] = var2[0]; // L: 317 + } + } // L: 296 318 } diff --git a/runescape-client/src/main/java/class114.java b/runescape-client/src/main/java/class114.java index 18a65a650a..97d31a09db 100644 --- a/runescape-client/src/main/java/class114.java +++ b/runescape-client/src/main/java/class114.java @@ -1,24 +1,92 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dv") +@ObfuscatedName("de") public class class114 { - @ObfuscatedName("f") - public static final float field1382; - @ObfuscatedName("b") - public static final float field1380; + @ObfuscatedName("k") + public static final float field1435; + @ObfuscatedName("a") + public static final float field1436; + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "[Lqd;" + ) + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; + @ObfuscatedName("ep") + @ObfuscatedSignature( + descriptor = "Lle;" + ) + @Export("archive17") + static Archive archive17; static { - field1382 = Math.ulp(1.0F); // L: 10 - field1380 = 2.0F * field1382; // L: 11 + field1435 = Math.ulp(1.0F); // L: 10 + field1436 = 2.0F * field1435; // L: 11 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)[Ljp;", - garbageValue = "-1344733039" + descriptor = "(Ljava/lang/CharSequence;I)J", + garbageValue = "-1342157785" ) - public static class263[] method2662() { - return new class263[]{class263.field3006, class263.field3005, class263.field3015, class263.field3007, class263.field3008, class263.field3009, class263.field3004, class263.field3011, class263.field3012, class263.field3013}; // L: 17 + public static long method2626(CharSequence var0) { + long var1 = 0L; // L: 16 + int var3 = var0.length(); // L: 17 + + for (int var4 = 0; var4 < var3; ++var4) { // L: 18 + var1 *= 37L; // L: 19 + char var5 = var0.charAt(var4); // L: 20 + if (var5 >= 'A' && var5 <= 'Z') { // L: 21 + var1 += (long)(var5 + 1 - 65); + } else if (var5 >= 'a' && var5 <= 'z') { // L: 22 + var1 += (long)(var5 + 1 - 97); + } else if (var5 >= '0' && var5 <= '9') { + var1 += (long)(var5 + 27 - 48); // L: 23 + } + + if (var1 >= 177917621779460413L) { // L: 24 + break; + } + } + + while (0L == var1 % 37L && var1 != 0L) { // L: 26 + var1 /= 37L; + } + + return var1; // L: 27 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)Lgq;", + garbageValue = "111011513" + ) + @Export("SequenceDefinition_get") + public static SequenceDefinition SequenceDefinition_get(int var0) { + SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); // L: 46 + if (var1 != null) { // L: 47 + return var1; + } else { + byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); // L: 48 + var1 = new SequenceDefinition(); // L: 49 + if (var2 != null) { // L: 50 + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); // L: 51 + SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); // L: 52 + return var1; // L: 53 + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "809732836" + ) + public static int method2637() { + return ViewportMouse.ViewportMouse_entityCount; // L: 44 } } diff --git a/runescape-client/src/main/java/class115.java b/runescape-client/src/main/java/class115.java index 43d6fdb992..1ef876d753 100644 --- a/runescape-client/src/main/java/class115.java +++ b/runescape-client/src/main/java/class115.java @@ -1,297 +1,448 @@ +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Locale; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("da") +@ObfuscatedName("db") public class class115 { - @ObfuscatedName("d") + @ObfuscatedName("ee") @ObfuscatedSignature( - descriptor = "[Lpb;" + descriptor = "Lle;" ) - @Export("JagexCache_idxFiles") - public static BufferedFile[] JagexCache_idxFiles; - @ObfuscatedName("v") + @Export("archive12") + static Archive archive12; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -671595341 + intValue = 1981912443 ) - public final int field1395; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lda;" - ) - public class115 field1388; - @ObfuscatedName("i") - float[][] field1385; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "[Lnt;" - ) - final class387[] field1386; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "[Lnt;" - ) - class387[] field1387; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "[Lnt;" - ) - class387[] field1383; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lnt;" - ) - class387 field1389; - @ObfuscatedName("l") - boolean field1392; + public final int field1455; @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lnt;" + descriptor = "Ldb;" ) - class387 field1384; - @ObfuscatedName("o") - boolean field1391; + public class115 field1447; + @ObfuscatedName("l") + float[][] field1446; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "[Lnw;" + ) + final class388[] field1449; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "[Lnw;" + ) + class388[] field1452; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "[Lnw;" + ) + class388[] field1451; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lnw;" + ) + class388 field1459; + @ObfuscatedName("s") + boolean field1450; @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lnt;" + descriptor = "Lnw;" ) - class387 field1393; - @ObfuscatedName("p") - float[][] field1394; + class388 field1453; + @ObfuscatedName("v") + boolean field1454; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lnw;" + ) + class388 field1456; + @ObfuscatedName("c") + float[][] field1457; @ObfuscatedName("w") - float[][] field1390; - @ObfuscatedName("k") - float[][] field1396; + float[][] field1458; + @ObfuscatedName("b") + float[][] field1448; @ObfuscatedSignature( - descriptor = "(ILpi;Z)V" + descriptor = "(ILpx;Z)V" ) public class115(int var1, Buffer var2, boolean var3) { - this.field1389 = new class387(); // L: 13 - this.field1392 = true; // L: 14 - this.field1384 = new class387(); // L: 15 - this.field1391 = true; // L: 16 - this.field1393 = new class387(); // L: 17 - this.field1395 = var2.readShort(); // L: 23 - this.field1386 = new class387[var1]; // L: 24 - this.field1387 = new class387[this.field1386.length]; // L: 25 - this.field1383 = new class387[this.field1386.length]; // L: 26 - this.field1385 = new float[this.field1386.length][3]; // L: 27 + this.field1459 = new class388(); // L: 13 + this.field1450 = true; // L: 14 + this.field1453 = new class388(); // L: 15 + this.field1454 = true; // L: 16 + this.field1456 = new class388(); // L: 17 + this.field1455 = var2.readShort(); // L: 23 + this.field1449 = new class388[var1]; // L: 24 + this.field1452 = new class388[this.field1449.length]; // L: 25 + this.field1451 = new class388[this.field1449.length]; // L: 26 + this.field1446 = new float[this.field1449.length][3]; // L: 27 - for (int var4 = 0; var4 < this.field1386.length; ++var4) { // L: 28 - this.field1386[var4] = new class387(var2, var3); // L: 29 - this.field1385[var4][0] = var2.method7681(); // L: 30 - this.field1385[var4][1] = var2.method7681(); // L: 31 - this.field1385[var4][2] = var2.method7681(); // L: 32 + for (int var4 = 0; var4 < this.field1449.length; ++var4) { // L: 28 + this.field1449[var4] = new class388(var2, var3); // L: 29 + this.field1446[var4][0] = var2.method7570(); // L: 30 + this.field1446[var4][1] = var2.method7570(); // L: 31 + this.field1446[var4][2] = var2.method7570(); // L: 32 } - this.method2664(); // L: 34 + this.method2677(); // L: 34 } // L: 35 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-23" - ) - void method2664() { - this.field1394 = new float[this.field1386.length][3]; // L: 38 - this.field1390 = new float[this.field1386.length][3]; // L: 39 - this.field1396 = new float[this.field1386.length][3]; // L: 40 - class387 var1; - synchronized(class387.field4346) { // L: 43 - if (class387.field4347 == 0) { // L: 44 - var1 = new class387(); - } else { - class387.field4346[--class387.field4347].method7011(); // L: 46 - var1 = class387.field4346[class387.field4347]; // L: 47 - } - } - - class387 var2 = var1; // L: 51 - - for (int var5 = 0; var5 < this.field1386.length; ++var5) { // L: 52 - class387 var4 = this.method2665(var5); // L: 53 - var2.method7032(var4); // L: 54 - var2.method7021(); // L: 55 - this.field1394[var5] = var2.method7010(); // L: 56 - this.field1390[var5][0] = var4.field4348[12]; // L: 57 - this.field1390[var5][1] = var4.field4348[13]; // L: 58 - this.field1390[var5][2] = var4.field4348[14]; // L: 59 - this.field1396[var5] = var4.method7023(); // L: 60 - } - - var2.method7029(); // L: 62 - } // L: 63 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)Lnt;", - garbageValue = "1022205323" - ) - class387 method2665(int var1) { - return this.field1386[var1]; // L: 66 - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(IB)Lnt;", - garbageValue = "85" - ) - class387 method2666(int var1) { - if (this.field1387[var1] == null) { // L: 70 - this.field1387[var1] = new class387(this.method2665(var1)); // L: 71 - if (this.field1388 != null) { // L: 72 - this.field1387[var1].method7017(this.field1388.method2666(var1)); // L: 73 - } else { - this.field1387[var1].method7017(class387.field4345); // L: 76 - } - } - - return this.field1387[var1]; // L: 79 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(II)Lnt;", - garbageValue = "-1203957232" - ) - class387 method2667(int var1) { - if (this.field1383[var1] == null) { // L: 83 - this.field1383[var1] = new class387(this.method2666(var1)); // L: 84 - this.field1383[var1].method7021(); // L: 85 - } - - return this.field1383[var1]; // L: 87 - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "2046672010" - ) - void method2676(class387 var1) { - this.field1389.method7032(var1); // L: 91 - this.field1392 = true; // L: 92 - this.field1391 = true; // L: 93 - } // L: 94 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(B)Lnt;", garbageValue = "54" ) - class387 method2678() { - return this.field1389; // L: 97 - } + void method2677() { + this.field1457 = new float[this.field1449.length][3]; // L: 38 + this.field1458 = new float[this.field1449.length][3]; // L: 39 + this.field1448 = new float[this.field1449.length][3]; // L: 40 + class388 var1 = Tile.method3904(); // L: 41 - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(B)Lnt;", - garbageValue = "-12" - ) - class387 method2669() { - if (this.field1392) { // L: 101 - this.field1384.method7032(this.method2678()); // L: 102 - if (this.field1388 != null) { // L: 103 - this.field1384.method7017(this.field1388.method2669()); // L: 104 - } - - this.field1392 = false; // L: 106 + for (int var2 = 0; var2 < this.field1449.length; ++var2) { // L: 42 + class388 var3 = this.method2640(var2); // L: 43 + var1.method6868(var3); // L: 44 + var1.method6820(); // L: 45 + this.field1457[var2] = var1.method6810(); // L: 46 + this.field1458[var2][0] = var3.field4400[12]; // L: 47 + this.field1458[var2][1] = var3.field4400[13]; // L: 48 + this.field1458[var2][2] = var3.field4400[14]; // L: 49 + this.field1448[var2] = var3.method6821(); // L: 50 } - return this.field1384; // L: 108 + var1.method6865(); // L: 52 + } // L: 53 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(II)Lnw;", + garbageValue = "2055144288" + ) + class388 method2640(int var1) { + return this.field1449[var1]; // L: 56 } @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IB)Lnt;", - garbageValue = "-47" + descriptor = "(IB)Lnw;", + garbageValue = "-82" ) - public class387 method2671(int var1) { - if (this.field1391) { // L: 112 - this.field1393.method7032(this.method2667(var1)); // L: 113 - this.field1393.method7017(this.method2669()); // L: 114 - this.field1391 = false; // L: 115 + class388 method2641(int var1) { + if (this.field1452[var1] == null) { // L: 60 + this.field1452[var1] = new class388(this.method2640(var1)); // L: 61 + if (this.field1447 != null) { // L: 62 + this.field1452[var1].method6816(this.field1447.method2641(var1)); // L: 63 + } else { + this.field1452[var1].method6816(class388.field4403); // L: 66 + } } - return this.field1393; // L: 117 - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(II)[F", - garbageValue = "-101383971" - ) - float[] method2672(int var1) { - return this.field1394[var1]; // L: 121 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)[F", - garbageValue = "-748184127" - ) - float[] method2673(int var1) { - return this.field1390[var1]; // L: 125 - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(IB)[F", - garbageValue = "9" - ) - float[] method2674(int var1) { - return this.field1396[var1]; // L: 129 + return this.field1452[var1]; // L: 69 } @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)Lim;", - garbageValue = "1491781541" + descriptor = "(II)Lnw;", + garbageValue = "543774546" ) - @Export("getFrames") - static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 322 - if (var1 != null) { // L: 323 - return var1; - } else { - var1 = HealthBarUpdate.method2185(SequenceDefinition.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); // L: 324 - if (var1 != null) { // L: 325 - SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); - } - - return var1; // L: 326 + class388 method2642(int var1) { + if (this.field1451[var1] == null) { // L: 73 + this.field1451[var1] = new class388(this.method2641(var1)); // L: 74 + this.field1451[var1].method6820(); // L: 75 } + + return this.field1451[var1]; // L: 77 } - @ObfuscatedName("ky") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "246529128" + descriptor = "(Lnw;I)V", + garbageValue = "1597711527" ) - static final void method2680(int var0) { - if (class155.loadInterface(var0)) { // L: 11936 - class119.drawModelComponents(Widget.Widget_interfaceComponents[var0], -1); // L: 11937 + void method2645(class388 var1) { + this.field1459.method6868(var1); // L: 81 + this.field1450 = true; // L: 82 + this.field1454 = true; // L: 83 + } // L: 84 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I)Lnw;", + garbageValue = "-1889892168" + ) + class388 method2672() { + return this.field1459; // L: 87 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)Lnw;", + garbageValue = "-1532476889" + ) + class388 method2652() { + if (this.field1450) { // L: 91 + this.field1453.method6868(this.method2672()); // L: 92 + if (this.field1447 != null) { // L: 93 + this.field1453.method6816(this.field1447.method2652()); // L: 94 + } + + this.field1450 = false; // L: 96 } - } // L: 11938 - @ObfuscatedName("mq") + return this.field1453; // L: 98 + } + + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2141464292" + descriptor = "(II)Lnw;", + garbageValue = "1098148128" ) - static void method2684() { - if (VarcInt.field1841 != null) { // L: 12649 - Client.field779 = Client.cycle; // L: 12650 - VarcInt.field1841.method6057(); // L: 12651 + public class388 method2666(int var1) { + if (this.field1454) { // L: 102 + this.field1456.method6868(this.method2642(var1)); // L: 103 + this.field1456.method6816(this.method2652()); // L: 104 + this.field1454 = false; // L: 105 + } - for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 12652 - if (Client.players[var0] != null) { // L: 12653 - VarcInt.field1841.method6044((Client.players[var0].x >> 7) + GrandExchangeOfferOwnWorldComparator.baseX, (Client.players[var0].y >> 7) + VarcInt.baseY); // L: 12654 + return this.field1456; // L: 107 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IS)[F", + garbageValue = "15889" + ) + float[] method2647(int var1) { + return this.field1457[var1]; // L: 111 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(II)[F", + garbageValue = "-2138262360" + ) + float[] method2655(int var1) { + return this.field1458[var1]; // L: 115 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(IB)[F", + garbageValue = "0" + ) + float[] method2649(int var1) { + return this.field1448[var1]; // L: 119 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(B)Ljava/util/Date;", + garbageValue = "12" + ) + static Date method2679() throws ParseException { + SimpleDateFormat var0 = new SimpleDateFormat("ddMMyyyyHH", Locale.ENGLISH); // L: 1011 + var0.setLenient(false); // L: 1012 + StringBuilder var1 = new StringBuilder(); // L: 1013 + String[] var2 = Login.field876; // L: 1015 + + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 1016 + String var4 = var2[var3]; // L: 1017 + if (var4 == null) { // L: 1019 + class126.method2799(7); // L: 1021 + class345.setLoginResponseString("Date not valid.", "Please ensure all characters are populated.", ""); // L: 1022 + return null; // L: 1024 + } + + var1.append(var4); // L: 1026 + } + + var1.append("12"); // L: 1030 + return var0.parse(var1.toString()); // L: 1031 + } + + @ObfuscatedName("gw") + @ObfuscatedSignature( + descriptor = "(Lcx;I)V", + garbageValue = "641789779" + ) + static final void method2680(Actor var0) { + var0.movementSequence = var0.idleSequence; // L: 4211 + if (var0.pathLength == 0) { // L: 4212 + var0.field1194 = 0; // L: 4213 + } else { + if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4216 + SequenceDefinition var1 = class114.SequenceDefinition_get(var0.sequence); // L: 4217 + if (var0.field1200 > 0 && var1.field2224 == 0) { // L: 4218 + ++var0.field1194; // L: 4219 + return; // L: 4220 + } + + if (var0.field1200 <= 0 && var1.field2206 == 0) { // L: 4222 + ++var0.field1194; // L: 4223 + return; // L: 4224 } } - } - } // L: 12658 + int var10 = var0.x; // L: 4227 + int var2 = var0.y; // L: 4228 + int var3 = var0.field1167 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 4229 + int var4 = var0.field1167 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 4230 + if (var10 < var3) { // L: 4231 + if (var2 < var4) { // L: 4232 + var0.orientation = 1280; + } else if (var2 > var4) { // L: 4233 + var0.orientation = 1792; + } else { + var0.orientation = 1536; // L: 4234 + } + } else if (var10 > var3) { // L: 4236 + if (var2 < var4) { // L: 4237 + var0.orientation = 768; + } else if (var2 > var4) { // L: 4238 + var0.orientation = 256; + } else { + var0.orientation = 512; // L: 4239 + } + } else if (var2 < var4) { // L: 4241 + var0.orientation = 1024; + } else if (var2 > var4) { // L: 4242 + var0.orientation = 0; + } + + class193 var5 = var0.pathTraversed[var0.pathLength - 1]; // L: 4243 + if (var3 - var10 <= 256 && var3 - var10 >= -256 && var4 - var2 <= 256 && var4 - var2 >= -256) { // L: 4244 + int var6 = var0.orientation - var0.rotation & 2047; // L: 4251 + if (var6 > 1024) { // L: 4252 + var6 -= 2048; + } + + int var7 = var0.walkBackSequence; // L: 4253 + if (var6 >= -256 && var6 <= 256) { // L: 4254 + var7 = var0.walkSequence; + } else if (var6 >= 256 && var6 < 768) { // L: 4255 + var7 = var0.walkRightSequence; + } else if (var6 >= -768 && var6 <= -256) { // L: 4256 + var7 = var0.walkLeftSequence; + } + + if (var7 == -1) { // L: 4257 + var7 = var0.walkSequence; + } + + var0.movementSequence = var7; // L: 4258 + int var8 = 4; // L: 4259 + boolean var9 = true; // L: 4260 + if (var0 instanceof NPC) { // L: 4261 + var9 = ((NPC)var0).definition.isClickable; + } + + if (var9) { // L: 4262 + if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1204 != 0) { // L: 4263 + var8 = 2; + } + + if (var0.pathLength > 2) { // L: 4264 + var8 = 6; + } + + if (var0.pathLength > 3) { // L: 4265 + var8 = 8; + } + + if (var0.field1194 > 0 && var0.pathLength > 1) { // L: 4266 + var8 = 8; // L: 4267 + --var0.field1194; // L: 4268 + } + } else { + if (var0.pathLength > 1) { // L: 4272 + var8 = 6; + } + + if (var0.pathLength > 2) { // L: 4273 + var8 = 8; + } + + if (var0.field1194 > 0 && var0.pathLength > 1) { // L: 4274 + var8 = 8; // L: 4275 + --var0.field1194; // L: 4276 + } + } + + if (var5 == class193.field2248) { // L: 4279 + var8 <<= 1; + } else if (var5 == class193.field2249) { // L: 4280 + var8 >>= 1; + } + + if (var8 >= 8) { // L: 4281 + if (var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { // L: 4282 + var0.movementSequence = var0.runSequence; + } else if (var0.movementSequence == var0.walkBackSequence && var0.field1150 != -1) { // L: 4283 + var0.movementSequence = var0.field1150; + } else if (var0.walkLeftSequence == var0.movementSequence && var0.field1183 != -1) { // L: 4284 + var0.movementSequence = var0.field1183; + } else if (var0.walkRightSequence == var0.movementSequence && var0.field1152 != -1) { // L: 4285 + var0.movementSequence = var0.field1152; + } + } else if (var8 <= 1) { // L: 4287 + if (var0.walkSequence == var0.movementSequence && var0.field1160 != -1) { // L: 4288 + var0.movementSequence = var0.field1160; + } else if (var0.movementSequence == var0.walkBackSequence && var0.field1154 != -1) { // L: 4289 + var0.movementSequence = var0.field1154; + } else if (var0.movementSequence == var0.walkLeftSequence && var0.field1155 != -1) { // L: 4290 + var0.movementSequence = var0.field1155; + } else if (var0.walkRightSequence == var0.movementSequence && var0.field1156 != -1) { // L: 4291 + var0.movementSequence = var0.field1156; + } + } + + if (var10 != var3 || var2 != var4) { // L: 4293 + if (var10 < var3) { // L: 4294 + var0.x += var8; // L: 4295 + if (var0.x > var3) { // L: 4296 + var0.x = var3; + } + } else if (var10 > var3) { // L: 4298 + var0.x -= var8; // L: 4299 + if (var0.x < var3) { // L: 4300 + var0.x = var3; + } + } + + if (var2 < var4) { // L: 4302 + var0.y += var8; // L: 4303 + if (var0.y > var4) { // L: 4304 + var0.y = var4; + } + } else if (var2 > var4) { // L: 4306 + var0.y -= var8; // L: 4307 + if (var0.y < var4) { // L: 4308 + var0.y = var4; + } + } + } + + if (var3 == var0.x && var4 == var0.y) { // L: 4311 + --var0.pathLength; // L: 4312 + if (var0.field1200 > 0) { // L: 4313 + --var0.field1200; + } + } + + } else { + var0.x = var3; // L: 4245 + var0.y = var4; // L: 4246 + --var0.pathLength; // L: 4247 + if (var0.field1200 > 0) { // L: 4248 + --var0.field1200; + } + + } + } + } // L: 4214 4249 4315 } diff --git a/runescape-client/src/main/java/class116.java b/runescape-client/src/main/java/class116.java index 69498d0f9a..952553dd16 100644 --- a/runescape-client/src/main/java/class116.java +++ b/runescape-client/src/main/java/class116.java @@ -3,91 +3,101 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("di") +@ObfuscatedName("dn") public enum class116 implements MouseWheel { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ldi;" + descriptor = "Ldn;" ) - field1403(0, 0), - @ObfuscatedName("c") + field1470(0, 0), + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Ldi;" + descriptor = "Ldn;" ) - field1399(1, 1), - @ObfuscatedName("i") + field1465(1, 1), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ldi;" + descriptor = "Ldn;" ) - field1400(2, 2), - @ObfuscatedName("f") + field1464(2, 2), + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ldi;" + descriptor = "Ldn;" ) - field1406(3, 3), - @ObfuscatedName("b") + field1466(3, 3), + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Ldi;" + descriptor = "Ldn;" ) - field1401(4, 4); + field1468(4, 4); - @ObfuscatedName("r") - @Export("Tiles_saturation") - static int[] Tiles_saturation; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 322402379 + @ObfuscatedName("nl") + @ObfuscatedSignature( + descriptor = "Lbv;" ) - final int field1398; - @ObfuscatedName("s") + @Export("tempMenuAction") + static MenuAction tempMenuAction; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -314756427 + intValue = -611288391 ) - final int field1404; + final int field1469; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 79441713 + ) + final int field1467; class116(int var3, int var4) { - this.field1398 = var3; // L: 134 - this.field1404 = var4; // L: 135 - } // L: 136 + this.field1469 = var3; // L: 137 + this.field1467 = var4; // L: 138 + } // L: 139 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1404; // L: 139 + return this.field1467; // L: 142 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1031484167" + descriptor = "(II)Lqb;", + garbageValue = "650575371" ) - public static void method2705() { - if (MouseHandler.MouseHandler_instance != null) { // L: 37 - synchronized(MouseHandler.MouseHandler_instance) { // L: 38 - MouseHandler.MouseHandler_instance = null; // L: 39 - } // L: 40 + public static PrivateChatMode method2686(int var0) { + PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field4794, PrivateChatMode.field4793, PrivateChatMode.field4795}; // L: 18 + PrivateChatMode[] var2 = var1; // L: 20 + + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 21 + PrivateChatMode var4 = var2[var3]; // L: 22 + if (var0 == var4.field4796) { // L: 24 + return var4; + } } - } // L: 42 + return null; // L: 28 + } - @ObfuscatedName("fz") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2133644638" + descriptor = "(IB)[B", + garbageValue = "20" ) - @Export("playPcmPlayers") - static final void playPcmPlayers() { - if (ViewportMouse.pcmPlayer1 != null) { // L: 3488 - ViewportMouse.pcmPlayer1.run(); - } + @Export("ByteArrayPool_getArray") + public static synchronized byte[] ByteArrayPool_getArray(int var0) { + return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 112 + } - if (KeyHandler.pcmPlayer0 != null) { // L: 3489 - KeyHandler.pcmPlayer0.run(); - } - - } // L: 3490 + @ObfuscatedName("gt") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1727484940" + ) + static boolean method2685() { + return (Client.drawPlayerNames & 2) != 0; // L: 5012 + } } diff --git a/runescape-client/src/main/java/class117.java b/runescape-client/src/main/java/class117.java index 0ddb770cc6..dd67696d0a 100644 --- a/runescape-client/src/main/java/class117.java +++ b/runescape-client/src/main/java/class117.java @@ -1,274 +1,254 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dt") +@ObfuscatedName("dz") public class class117 { - @ObfuscatedName("v") - boolean field1413; - @ObfuscatedName("c") - boolean field1408; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Ldi;" - ) - class116 field1409; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Ldi;" - ) - class116 field1410; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "[Ldm;" - ) - class113[] field1411; - @ObfuscatedName("n") - boolean field1412; - @ObfuscatedName("s") - float field1422; - @ObfuscatedName("l") - float field1414; - @ObfuscatedName("q") - float[] field1415; @ObfuscatedName("o") - float[] field1416; - @ObfuscatedName("r") - boolean field1407; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 1038794237 + boolean field1477; + @ObfuscatedName("q") + boolean field1487; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Ldn;" ) - int field1418; - @ObfuscatedName("w") - float[] field1419; + class116 field1472; @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -297304491 + @ObfuscatedSignature( + descriptor = "Ldn;" ) - int field1417; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -1891962511 + class116 field1475; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "[Ldi;" ) - int field1421; + class113[] field1476; @ObfuscatedName("m") - float field1425; - @ObfuscatedName("u") - float field1423; + boolean field1480; + @ObfuscatedName("p") + float field1478; + @ObfuscatedName("s") + float field1479; + @ObfuscatedName("r") + float[] field1473; + @ObfuscatedName("v") + float[] field1481; + @ObfuscatedName("y") + boolean field1482; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 2107172617 + ) + int field1483; + @ObfuscatedName("w") + float[] field1484; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1297196187 + ) + int field1474; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1886403005 + ) + int field1486; + @ObfuscatedName("g") + float field1485; + @ObfuscatedName("x") + float field1488; class117() { - this.field1415 = new float[4]; - this.field1416 = new float[4]; - this.field1407 = true; - this.field1418 = 0; + this.field1473 = new float[4]; // L: 16 + this.field1481 = new float[4]; + this.field1482 = true; + this.field1483 = 0; } // L: 26 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;IB)I", - garbageValue = "-14" + descriptor = "(Lpx;II)I", + garbageValue = "548491592" ) - int method2708(Buffer var1, int var2) { - int var3 = var1.readUnsignedShort(); - int var4 = var1.readUnsignedByte(); - class123 var5 = (class123)MusicPatchPcmStream.findEnumerated(class385.method6974(), var4); - if (var5 == null) { - var5 = class123.field1489; - } - - int var6 = var1.readUnsignedByte(); - class116 var7 = (class116)MusicPatchPcmStream.findEnumerated(class140.method3045(), var6); // L: 38 + int method2688(Buffer var1, int var2) { + int var3 = var1.readUnsignedShort(); // L: 29 + class295.method5560(var1.readUnsignedByte()); // L: 30 + int var5 = var1.readUnsignedByte(); // L: 32 + class116[] var6 = new class116[]{class116.field1470, class116.field1465, class116.field1464, class116.field1466, class116.field1468}; // L: 36 + class116 var7 = (class116)class291.findEnumerated(var6, var5); // L: 38 if (var7 == null) { // L: 39 - var7 = class116.field1403; + var7 = class116.field1470; } - this.field1409 = var7; // L: 42 - int var8 = var1.readUnsignedByte(); // L: 44 - class116 var9 = (class116)MusicPatchPcmStream.findEnumerated(class140.method3045(), var8); // L: 46 - if (var9 == null) { // L: 47 - var9 = class116.field1403; + this.field1472 = var7; // L: 42 + int var11 = var1.readUnsignedByte(); // L: 44 + class116[] var8 = new class116[]{class116.field1470, class116.field1465, class116.field1464, class116.field1466, class116.field1468}; // L: 48 + class116 var9 = (class116)class291.findEnumerated(var8, var11); // L: 50 + if (var9 == null) { // L: 51 + var9 = class116.field1470; } - this.field1410 = var9; // L: 50 - this.field1413 = var1.readUnsignedByte() != 0; // L: 51 - this.field1411 = new class113[var3]; // L: 52 - class113 var12 = null; // L: 53 + this.field1475 = var9; // L: 54 + this.field1477 = var1.readUnsignedByte() != 0; // L: 55 + this.field1476 = new class113[var3]; // L: 56 + class113 var13 = null; // L: 57 - int var10; - for (var10 = 0; var10 < var3; ++var10) { // L: 54 - class113 var11 = new class113(); // L: 55 - var11.method2647(var1, var2); // L: 56 - this.field1411[var10] = var11; // L: 57 - if (var12 != null) { // L: 58 - var12.field1375 = var11; // L: 59 + int var12; + for (var12 = 0; var12 < var3; ++var12) { // L: 58 + class113 var10 = new class113(); // L: 59 + var10.method2621(var1, var2); // L: 60 + this.field1476[var12] = var10; // L: 61 + if (var13 != null) { // L: 62 + var13.field1427 = var10; // L: 63 } - var12 = var11; // L: 61 + var13 = var10; // L: 65 } - this.field1417 = this.field1411[0].field1373; // L: 63 - this.field1421 = this.field1411[this.method2715() - 1].field1373; // L: 64 - this.field1419 = new float[this.method2712() + 1]; // L: 66 + this.field1474 = this.field1476[0].field1430; // L: 67 + this.field1486 = this.field1476[this.method2695() - 1].field1430; // L: 68 + this.field1484 = new float[this.method2692() + 1]; // L: 70 - for (var10 = this.method2714(); var10 <= this.method2711(); ++var10) { // L: 67 - this.field1419[var10 - this.method2714()] = class10.method92(this, (float)var10); // L: 68 + for (var12 = this.method2690(); var12 <= this.method2691(); ++var12) { // L: 71 + this.field1484[var12 - this.method2690()] = MusicPatchNode.method5315(this, (float)var12); // L: 72 } - this.field1411 = null; // L: 70 - this.field1425 = class10.method92(this, (float)(this.method2714() - 1)); // L: 72 - this.field1423 = class10.method92(this, (float)(this.method2711() + 1)); // L: 73 - return var3; // L: 74 + this.field1476 = null; // L: 74 + this.field1485 = MusicPatchNode.method5315(this, (float)(this.method2690() - 1)); // L: 76 + this.field1488 = MusicPatchNode.method5315(this, (float)(this.method2691() + 1)); // L: 77 + return var3; // L: 78 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(II)F", - garbageValue = "937027636" + garbageValue = "1078920947" ) - public float method2709(int var1) { - if (var1 < this.method2714()) { // L: 79 - return this.field1425; // L: 80 + public float method2689(int var1) { + if (var1 < this.method2690()) { // L: 83 + return this.field1485; // L: 84 } else { - return var1 > this.method2711() ? this.field1423 : this.field1419[var1 - this.method2714()]; // L: 82 83 85 + return var1 > this.method2691() ? this.field1488 : this.field1484[var1 - this.method2690()]; // L: 86 87 89 } } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-43" + garbageValue = "56" ) - int method2714() { - return this.field1417; // L: 90 + int method2690() { + return this.field1474; // L: 94 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-589047321" + garbageValue = "-529211546" ) - int method2711() { - return this.field1421; // L: 94 + int method2691() { + return this.field1486; // L: 98 } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "32" + garbageValue = "-2" ) - int method2712() { - return this.method2711() - this.method2714(); // L: 98 + int method2692() { + return this.method2691() - this.method2690(); // L: 102 } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(FI)I", - garbageValue = "-1858768246" + descriptor = "(FS)I", + garbageValue = "-12024" ) - int method2713(float var1) { - if (this.field1418 < 0 || (float)this.field1411[this.field1418].field1373 > var1 || this.field1411[this.field1418].field1375 != null && (float)this.field1411[this.field1418].field1375.field1373 <= var1) { // L: 102 - if (var1 >= (float)this.method2714() && var1 <= (float)this.method2711()) { // L: 105 - int var2 = this.method2715(); // L: 108 - int var3 = this.field1418; // L: 109 - if (var2 > 0) { // L: 110 - int var4 = 0; // L: 111 - int var5 = var2 - 1; // L: 112 + int method2712(float var1) { + if (this.field1483 < 0 || (float)this.field1476[this.field1483].field1430 > var1 || this.field1476[this.field1483].field1427 != null && (float)this.field1476[this.field1483].field1427.field1430 <= var1) { // L: 106 + if (var1 >= (float)this.method2690() && var1 <= (float)this.method2691()) { // L: 109 + int var2 = this.method2695(); // L: 112 + int var3 = this.field1483; // L: 113 + if (var2 > 0) { // L: 114 + int var4 = 0; // L: 115 + int var5 = var2 - 1; // L: 116 do { - int var6 = var4 + var5 >> 1; // L: 114 - if (var1 < (float)this.field1411[var6].field1373) { // L: 115 - if (var1 > (float)this.field1411[var6 - 1].field1373) { // L: 116 - var3 = var6 - 1; // L: 117 + int var6 = var5 + var4 >> 1; // L: 118 + if (var1 < (float)this.field1476[var6].field1430) { // L: 119 + if (var1 > (float)this.field1476[var6 - 1].field1430) { // L: 120 + var3 = var6 - 1; // L: 121 break; } - var5 = var6 - 1; // L: 121 + var5 = var6 - 1; // L: 125 } else { - if (var1 <= (float)this.field1411[var6].field1373) { // L: 124 - var3 = var6; // L: 134 - break; // L: 135 + if (var1 <= (float)this.field1476[var6].field1430) { // L: 128 + var3 = var6; // L: 138 + break; // L: 139 } - if (var1 < (float)this.field1411[var6 + 1].field1373) { // L: 125 - var3 = var6; // L: 126 - break; // L: 127 + if (var1 < (float)this.field1476[var6 + 1].field1430) { // L: 129 + var3 = var6; // L: 130 + break; // L: 131 } - var4 = var6 + 1; // L: 130 + var4 = var6 + 1; // L: 134 } - } while(var4 <= var5); // L: 137 + } while(var4 <= var5); // L: 141 } - if (var3 != this.field1418) { // L: 139 - this.field1418 = var3; // L: 140 - this.field1407 = true; // L: 141 + if (var3 != this.field1483) { // L: 143 + this.field1483 = var3; // L: 144 + this.field1482 = true; // L: 145 } - return this.field1418; // L: 143 + return this.field1483; // L: 147 } else { - return -1; // L: 106 + return -1; // L: 110 } } else { - return this.field1418; // L: 103 + return this.field1483; // L: 107 } } + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(FI)Ldi;", + garbageValue = "-5315501" + ) + class113 method2707(float var1) { + int var2 = this.method2712(var1); // L: 151 + return var2 >= 0 && var2 < this.field1476.length ? this.field1476[var2] : null; // L: 152 153 156 + } + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(FB)Ldm;", - garbageValue = "-11" + descriptor = "(S)I", + garbageValue = "6186" ) - class113 method2736(float var1) { - int var2 = this.method2713(var1); // L: 147 - return var2 >= 0 && var2 < this.field1411.length ? this.field1411[var2] : null; // L: 148 149 152 + int method2695() { + return this.field1476 == null ? 0 : this.field1476.length; // L: 161 162 } - @ObfuscatedName("l") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2021346356" + descriptor = "(IIIIIII)I", + garbageValue = "1632957867" ) - int method2715() { - return this.field1411 == null ? 0 : this.field1411.length; // L: 157 158 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SIII)V", - garbageValue = "-1434751049" - ) - @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 - - 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 - } - } - - 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 + public static int method2717(int var0, int var1, int var2, int var3, int var4, int var5) { + if ((var5 & 1) == 1) { // L: 17 + int var6 = var3; // L: 18 + var3 = var4; // L: 19 + var4 = var6; // L: 20 } - } // L: 36 + var2 &= 3; // L: 22 + if (var2 == 0) { // L: 23 + return var1; + } else if (var2 == 1) { // L: 24 + return 7 - var0 - (var3 - 1); + } else { + return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 25 + } + } } diff --git a/runescape-client/src/main/java/class118.java b/runescape-client/src/main/java/class118.java index 6d26d6c020..43cd17a2aa 100644 --- a/runescape-client/src/main/java/class118.java +++ b/runescape-client/src/main/java/class118.java @@ -3,138 +3,131 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("df") +@ObfuscatedName("dl") public class class118 implements MouseWheel { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ldf;" + descriptor = "Ldl;" ) - static final class118 field1433; - @ObfuscatedName("c") + static final class118 field1498; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Ldf;" + descriptor = "Ldl;" ) - static final class118 field1430; - @ObfuscatedName("i") + static final class118 field1491; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ldf;" + descriptor = "Ldl;" ) - static final class118 field1431; - @ObfuscatedName("f") + static final class118 field1492; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ldf;" + descriptor = "Ldl;" ) - static final class118 field1432; - @ObfuscatedName("b") + static final class118 field1499; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Ldf;" + descriptor = "Ldl;" ) - static final class118 field1434; - @ObfuscatedName("n") + static final class118 field1490; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Ldf;" + descriptor = "Ldl;" ) - static final class118 field1429; + static final class118 field1495; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -733991275 + ) + final int field1496; @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1756960623 + intValue = 1625780091 ) - final int field1437; - @ObfuscatedName("l") + final int field1497; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1872311517 + intValue = -808605415 ) - final int field1436; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -2109677301 - ) - final int field1435; + final int field1493; static { - field1433 = new class118(0, 0, (String)null, 0); // L: 14 - field1430 = new class118(1, 1, (String)null, 9); // L: 15 - field1431 = new class118(2, 2, (String)null, 3); // L: 16 - field1432 = new class118(3, 3, (String)null, 6); // L: 17 - field1434 = new class118(4, 4, (String)null, 1); // L: 18 - field1429 = new class118(5, 5, (String)null, 3); // L: 19 + field1498 = new class118(0, 0, (String)null, 0); // L: 14 + field1491 = new class118(1, 1, (String)null, 9); // L: 15 + field1492 = new class118(2, 2, (String)null, 3); // L: 16 + field1499 = new class118(3, 3, (String)null, 6); // L: 17 + field1490 = new class118(4, 4, (String)null, 1); // L: 18 + field1495 = new class118(5, 5, (String)null, 3); // L: 19 } class118(int var1, int var2, String var3, int var4) { - this.field1437 = var1; // L: 29 - this.field1436 = var2; // L: 30 - this.field1435 = var4; // L: 31 + this.field1496 = var1; + this.field1497 = var2; // L: 30 + this.field1493 = var4; // L: 31 } // L: 32 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1436; // L: 45 + return this.field1497; // L: 46 } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1895809881" + garbageValue = "-1599057614" ) - int method2739() { - return this.field1435; // L: 41 + int method2732() { + return this.field1493; // L: 41 } - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([BIII)Ljava/lang/String;", - garbageValue = "1410693926" + descriptor = "(Llp;Ljava/lang/String;Ljava/lang/String;IZI)V", + garbageValue = "-898838791" ) - @Export("decodeStringCp1252") - public static String decodeStringCp1252(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; // L: 132 - int var4 = 0; // L: 133 + public static void method2733(AbstractArchive var0, String var1, String var2, int var3, boolean var4) { + int var5 = var0.getGroupId(var1); // L: 26 + int var6 = var0.getFileId(var5, var2); // L: 27 + UserComparator8.method2574(var0, var5, var6, var3, var4); // L: 28 + } // L: 29 - for (int var5 = 0; var5 < var2; ++var5) { // L: 134 - int var6 = var0[var5 + var1] & 255; // L: 135 - if (var6 != 0) { // L: 136 - if (var6 >= 128 && var6 < 160) { // L: 137 - char var7 = class345.cp1252AsciiExtension[var6 - 128]; // L: 138 - if (var7 == 0) { // L: 139 - var7 = '?'; - } + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)[Lkg;", + garbageValue = "-495384223" + ) + @Export("PlayerType_values") + public static PlayerType[] PlayerType_values() { + return new PlayerType[]{PlayerType.field3989, PlayerType.PlayerType_ironman, PlayerType.field3984, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_normal, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_ultimateIronman, PlayerType.field3990}; // L: 22 + } - var6 = var7; // L: 140 - } - - var3[var4++] = (char)var6; // L: 142 - } + @ObfuscatedName("ht") + @ObfuscatedSignature( + descriptor = "(Lca;I)Z", + garbageValue = "1081302246" + ) + static boolean method2720(Player var0) { + if (Client.drawPlayerNames == 0) { // L: 5020 + return false; + } else if (ModelData0.localPlayer != var0) { // L: 5021 + boolean var1 = (Client.drawPlayerNames & 4) != 0; // L: 5024 + return var1 || SoundSystem.method779() && var0.isFriend() || class116.method2685() && var0.isFriendsChatMember(); // L: 5026 + } else { + return class21.method274(); // L: 5028 } - - return new String(var3, 0, var4); // L: 144 } - @ObfuscatedName("q") + @ObfuscatedName("lx") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1500949037" + descriptor = "(S)Z", + garbageValue = "5517" ) - static final int method2747() { - return ViewportMouse.ViewportMouse_y; // L: 84 - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "1898368305" - ) - public static int[] method2748() { - int[] var0 = new int[KeyHandler.field132]; // L: 259 - - for (int var1 = 0; var1 < KeyHandler.field132; ++var1) { // L: 260 - var0[var1] = KeyHandler.field139[var1]; // L: 261 - } - - return var0; // L: 263 + static boolean method2721() { + return class12.clientPreferences.method2243() >= Client.field484; // L: 12710 } } diff --git a/runescape-client/src/main/java/class119.java b/runescape-client/src/main/java/class119.java index bf9362f476..a32e70d43e 100644 --- a/runescape-client/src/main/java/class119.java +++ b/runescape-client/src/main/java/class119.java @@ -1,131 +1,132 @@ -import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; -@ObfuscatedName("dk") +@ObfuscatedName("da") public class class119 implements MouseWheel { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Ldk;" - ) - static final class119 field1449; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Ldk;" - ) - static final class119 field1439; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Ldk;" - ) - static final class119 field1440; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Ldk;" - ) - static final class119 field1441; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Ldk;" - ) - static final class119 field1442; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Ldk;" - ) - static final class119 field1446; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ldk;" - ) - static final class119 field1444; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Ldk;" - ) - static final class119 field1443; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Ldk;" - ) - static final class119 field1455; @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Lda;" ) - static final class119 field1447; - @ObfuscatedName("r") + static final class119 field1508; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Lda;" ) - static final class119 field1448; - @ObfuscatedName("p") + static final class119 field1512; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Lda;" ) - static final class119 field1451; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Ldk;" - ) - static final class119 field1450; + static final class119 field1502; @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Lda;" ) - static final class119 field1445; - @ObfuscatedName("d") + static final class119 field1516; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Lda;" ) - static final class119 field1457; + static final class119 field1518; @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Lda;" ) - static final class119 field1452; - @ObfuscatedName("u") + static final class119 field1521; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Lda;" ) - static final class119 field1454; + static final class119 field1506; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + static final class119 field1507; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + static final class119 field1500; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + static final class119 field1509; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + static final class119 field1510; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + static final class119 field1511; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + static final class119 field1503; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + static final class119 field1513; @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -1189647423 + @ObfuscatedSignature( + descriptor = "Lda;" ) - final int field1438; + static final class119 field1514; @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 590424235 + @ObfuscatedSignature( + descriptor = "Lda;" ) - final int field1456; + static final class119 field1515; @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1848047837 + @ObfuscatedSignature( + descriptor = "Lda;" ) - final int field1453; + static final class119 field1504; + @ObfuscatedName("ac") + @Export("fontHelvetica13") + static java.awt.Font fontHelvetica13; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1636917821 + ) + final int field1517; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -1474083167 + ) + final int field1505; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 1038102121 + ) + final int field1519; static { - field1449 = new class119(0, 0, (String)null, -1, -1); // L: 51 - field1439 = new class119(1, 1, (String)null, 0, 2); // L: 52 - field1440 = new class119(2, 2, (String)null, 1, 2); // L: 53 - field1441 = new class119(3, 3, (String)null, 2, 2); // L: 54 - field1442 = new class119(4, 4, (String)null, 3, 1); // L: 55 - field1446 = new class119(5, 5, (String)null, 4, 1); // L: 56 - field1444 = new class119(6, 6, (String)null, 5, 1); // L: 57 - field1443 = new class119(7, 7, (String)null, 6, 3); // L: 58 - field1455 = new class119(8, 8, (String)null, 7, 3); // L: 59 - field1447 = new class119(9, 9, (String)null, 8, 3); // L: 60 - field1448 = new class119(10, 10, (String)null, 0, 7); // L: 61 - field1451 = new class119(11, 11, (String)null, 1, 7); // L: 62 - field1450 = new class119(12, 12, (String)null, 2, 7); // L: 63 - field1445 = new class119(13, 13, (String)null, 3, 7); // L: 64 - field1457 = new class119(14, 14, (String)null, 4, 7); // L: 65 - field1452 = new class119(15, 15, (String)null, 5, 7); // L: 66 - field1454 = new class119(16, 16, (String)null, 0, 5); // L: 67 + field1508 = new class119(0, 0, (String)null, -1, -1); // L: 52 + field1512 = new class119(1, 1, (String)null, 0, 2); // L: 53 + field1502 = new class119(2, 2, (String)null, 1, 2); // L: 54 + field1516 = new class119(3, 3, (String)null, 2, 2); // L: 55 + field1518 = new class119(4, 4, (String)null, 3, 1); // L: 56 + field1521 = new class119(5, 5, (String)null, 4, 1); // L: 57 + field1506 = new class119(6, 6, (String)null, 5, 1); // L: 58 + field1507 = new class119(7, 7, (String)null, 6, 3); + field1500 = new class119(8, 8, (String)null, 7, 3); // L: 60 + field1509 = new class119(9, 9, (String)null, 8, 3); + field1510 = new class119(10, 10, (String)null, 0, 7); + field1511 = new class119(11, 11, (String)null, 1, 7); + field1503 = new class119(12, 12, (String)null, 2, 7); + field1513 = new class119(13, 13, (String)null, 3, 7); + field1514 = new class119(14, 14, (String)null, 4, 7); + field1515 = new class119(15, 15, (String)null, 5, 7); + field1504 = new class119(16, 16, (String)null, 0, 5); } @ObfuscatedSignature( @@ -133,132 +134,141 @@ public class class119 implements MouseWheel { garbageValue = "-1" ) class119(int var1, int var2, String var3, int var4, int var5) { - this.field1438 = var1; // L: 77 - this.field1456 = var2; // L: 78 - this.field1453 = var4; // L: 79 - } // L: 80 + this.field1517 = var1; + this.field1505 = var2; // L: 79 + this.field1519 = var4; // L: 80 + } // L: 81 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1456; // L: 83 + return this.field1505; // L: 84 } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1943929497" + descriptor = "(B)I", + garbageValue = "1" ) - int method2751() { - return this.field1453; // L: 87 + int method2738() { + return this.field1519; // L: 88 } - @ObfuscatedName("kc") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([Lky;II)V", - garbageValue = "-908944822" + descriptor = "([BB)Ljava/lang/String;", + garbageValue = "-27" ) - @Export("drawModelComponents") - static final void drawModelComponents(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11941 - Widget var3 = var0[var2]; // L: 11942 - if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !class1.isComponentHidden(var3))) { // L: 11943 11944 11945 - if (var3.type == 0) { // L: 11946 - if (!var3.isIf3 && class1.isComponentHidden(var3) && var3 != DevicePcmPlayerProvider.mousedOverWidgetIf1) { // L: 11947 - continue; - } + public static String method2745(byte[] var0) { + int var2 = var0.length; // L: 59 + StringBuilder var3 = new StringBuilder(); // L: 61 - drawModelComponents(var0, var3.id); // L: 11948 - if (var3.children != null) { // L: 11949 - drawModelComponents(var3.children, var3.id); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11950 - if (var4 != null) { // L: 11951 - class115.method2680(var4.group); - } + for (int var4 = 0; var4 < var2 + 0; var4 += 3) { // L: 62 + int var5 = var0[var4] & 255; // L: 63 + var3.append(class342.field4158[var5 >>> 2]); // L: 64 + if (var4 < var2 - 1) { // L: 65 + int var6 = var0[var4 + 1] & 255; // L: 66 + var3.append(class342.field4158[(var5 & 3) << 4 | var6 >>> 4]); // L: 67 + if (var4 < var2 - 2) { // L: 68 + int var7 = var0[var4 + 2] & 255; // L: 69 + var3.append(class342.field4158[(var6 & 15) << 2 | var7 >>> 6]).append(class342.field4158[var7 & 63]); // L: 70 + } else { + var3.append(class342.field4158[(var6 & 15) << 2]).append("="); // L: 72 } - - if (var3.type == 6) { // L: 11953 - int var5; - if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 11954 - boolean var7 = Skills.runCs1(var3); // L: 11955 - if (var7) { // L: 11957 - var5 = var3.sequenceId2; - } else { - var5 = var3.sequenceId; // L: 11958 - } - - if (var5 != -1) { // L: 11959 - SequenceDefinition var6 = class163.SequenceDefinition_get(var5); // L: 11960 - - for (var3.modelFrameCycle += Client.field556; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class346.invalidateWidget(var3)) { // L: 11961 11962 11969 - var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 11963 - ++var3.modelFrame; // L: 11964 - if (var3.modelFrame >= var6.frameIds.length) { // L: 11965 - var3.modelFrame -= var6.frameCount; // L: 11966 - if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 11967 - var3.modelFrame = 0; - } - } - } - } - } - - if (var3.field3392 != 0 && !var3.isIf3) { // L: 11973 - int var8 = var3.field3392 >> 16; // L: 11974 - var5 = var3.field3392 << 16 >> 16; // L: 11975 - var8 *= Client.field556; // L: 11976 - var5 *= Client.field556; // L: 11977 - var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 11978 - var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 11979 - class346.invalidateWidget(var3); // L: 11980 - } - } - } - } - - } // L: 11984 - - @ObfuscatedName("lm") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1036888479" - ) - static void method2760(String var0) { - class65.field868 = var0; // L: 12501 - - try { - String var1 = class127.client.getParameter(Integer.toString(18)); // L: 12503 - String var2 = class127.client.getParameter(Integer.toString(13)); // L: 12504 - String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 12505 - String var5; - if (var0.length() == 0) { // L: 12506 - var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; } else { - String var4 = var3 + "; Expires="; // L: 12508 - long var6 = class136.method2931() + 94608000000L; // L: 12510 - Calendar.Calendar_calendar.setTime(new Date(var6)); // L: 12512 - int var8 = Calendar.Calendar_calendar.get(7); // L: 12513 - int var9 = Calendar.Calendar_calendar.get(5); // L: 12514 - int var10 = Calendar.Calendar_calendar.get(2); // L: 12515 - int var11 = Calendar.Calendar_calendar.get(1); // L: 12516 - int var12 = Calendar.Calendar_calendar.get(11); // L: 12517 - int var13 = Calendar.Calendar_calendar.get(12); // L: 12518 - int var14 = Calendar.Calendar_calendar.get(13); // L: 12519 - 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: 12520 - var3 = var4 + var5 + "; Max-Age=" + 94608000L; // L: 12522 + var3.append(class342.field4158[(var5 & 3) << 4]).append("=="); // L: 74 } - - Client var16 = class127.client; // L: 12524 - var5 = "document.cookie=\"" + var3 + "\""; // L: 12525 - JSObject.getWindow(var16).eval(var5); // L: 12528 - } catch (Throwable var15) { // L: 12531 } - } // L: 12532 + String var1 = var3.toString(); // L: 76 + return var1; // L: 78 + } + + @ObfuscatedName("iw") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-197494883" + ) + static void method2739(int var0, int var1) { + int var2 = ChatChannel.fontBold12.stringWidth("Choose Option"); // L: 8871 + + int var3; + for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { // L: 8872 + Font var7 = ChatChannel.fontBold12; // L: 8873 + String var8; + if (var3 < 0) { // L: 8876 + var8 = ""; // L: 8877 + } else if (Client.menuTargets[var3].length() > 0) { // L: 8880 + var8 = Client.menuActions[var3] + " " + Client.menuTargets[var3]; + } else { + var8 = Client.menuActions[var3]; // L: 8881 + } + + int var6 = var7.stringWidth(var8); // L: 8883 + if (var6 > var2) { // L: 8884 + var2 = var6; + } + } + + var2 += 8; // L: 8886 + var3 = Client.menuOptionsCount * 15 + 22; // L: 8887 + int var4 = var0 - var2 / 2; // L: 8888 + if (var2 + var4 > GraphicsObject.canvasWidth) { // L: 8889 + var4 = GraphicsObject.canvasWidth - var2; + } + + if (var4 < 0) { // L: 8890 + var4 = 0; + } + + int var5 = var1; // L: 8891 + if (var1 + var3 > class433.canvasHeight) { // L: 8892 + var5 = class433.canvasHeight - var3; + } + + if (var5 < 0) { // L: 8893 + var5 = 0; + } + + BuddyRankComparator.menuX = var4; // L: 8894 + FontName.menuY = var5; // L: 8895 + KeyHandler.menuWidth = var2; // L: 8896 + class7.menuHeight = Client.menuOptionsCount * 15 + 22; // L: 8897 + } // L: 8898 + + @ObfuscatedName("ka") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-58" + ) + static void method2737() { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11925 + int var1 = var0.group; // L: 11926 + if (WorldMapDecoration.loadInterface(var1)) { // L: 11927 + boolean var2 = true; // L: 11928 + Widget[] var3 = NetSocket.Widget_interfaceComponents[var1]; // L: 11929 + + int var4; + for (var4 = 0; var4 < var3.length; ++var4) { // L: 11930 + if (var3[var4] != null) { // L: 11931 + var2 = var3[var4].isIf3; // L: 11932 + break; + } + } + + if (!var2) { // L: 11936 + var4 = (int)var0.key; // L: 11937 + Widget var5 = class92.getWidget(var4); // L: 11938 + if (var5 != null) { // L: 11939 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var5); + } + } + } + } + + } // L: 11943 } diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java index 3ab3bdbd63..ff0c4020ca 100644 --- a/runescape-client/src/main/java/class12.java +++ b/runescape-client/src/main/java/class12.java @@ -6,17 +6,35 @@ import javax.net.ssl.HandshakeCompletedListener; import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSocket; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import org.bouncycastle.crypto.tls.TlsClientProtocol; @ObfuscatedName("w") class class12 extends SSLSocket { - @ObfuscatedName("v") - Certificate[] field62; + @ObfuscatedName("uq") + @ObfuscatedSignature( + descriptor = "Lcy;" + ) + @Export("clientPreferences") + static ClientPreferences clientPreferences; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -380169429 + ) + @Export("Interpreter_intStackSize") + static int Interpreter_intStackSize; + @ObfuscatedName("cd") + @ObfuscatedGetter( + intValue = -1896109667 + ) + public static int field61; + @ObfuscatedName("o") + Certificate[] field63; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lm;" + descriptor = "Lg;" ) final class15 this$0; // $FF: synthetic field @@ -25,312 +43,97 @@ class class12 extends SSLSocket { final String val$host; @ObfuscatedSignature( - descriptor = "(Lm;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V" + descriptor = "(Lg;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V" ) class12(class15 var1, TlsClientProtocol var2, String var3) { - this.this$0 = var1; // L: 81 + this.this$0 = var1; // L: 88 this.val$tlsClientProtocol = var2; this.val$host = var3; } - public InputStream getInputStream() throws IOException { - return this.val$tlsClientProtocol.getInputStream(); // L: 85 - } - - public OutputStream getOutputStream() throws IOException { - return this.val$tlsClientProtocol.getOutputStream(); // L: 89 - } - public synchronized void close() throws IOException { - this.val$tlsClientProtocol.close(); // L: 93 - } // L: 94 + this.val$tlsClientProtocol.close(); // L: 103 + } // L: 104 - public void startHandshake() throws IOException { - this.val$tlsClientProtocol.connect(new class13(this)); // L: 227 - } // L: 273 + public void addHandshakeCompletedListener(HandshakeCompletedListener var1) { + } // L: 107 - public String[] getEnabledCipherSuites() { - return null; // L: 103 - } - - public String[] getEnabledProtocols() { - return null; // L: 107 - } - - public boolean getNeedClientAuth() { + public boolean getEnableSessionCreation() { return false; // L: 111 } - public String[] getSupportedProtocols() { - return null; // L: 203 + public String[] getEnabledCipherSuites() { + return null; // L: 116 } - public void removeHandshakeCompletedListener(HandshakeCompletedListener var1) { - } // L: 218 - - public void setEnableSessionCreation(boolean var1) { - } // L: 219 - - public void setEnabledCipherSuites(String[] var1) { - } // L: 220 - - public void setEnabledProtocols(String[] var1) { - } // L: 221 - - public void setNeedClientAuth(boolean var1) { - } // L: 222 - - public void setWantClientAuth(boolean var1) { - } // L: 224 + public String[] getEnabledProtocols() { + return null; // L: 121 + } public SSLSession getSession() { - return new class17(this); // L: 115 + return new class17(this); // L: 131 } - public void addHandshakeCompletedListener(HandshakeCompletedListener var1) { - } // L: 96 - - public void setUseClientMode(boolean var1) { - } // L: 223 - - public boolean getUseClientMode() { - return false; // L: 211 - } - - public boolean getWantClientAuth() { - return false; // L: 215 + public OutputStream getOutputStream() throws IOException { + return this.val$tlsClientProtocol.getOutputStream(); // L: 98 } public String[] getSupportedCipherSuites() { - return null; // L: 207 + return null; // L: 246 } - public boolean getEnableSessionCreation() { - return false; // L: 99 + public boolean getWantClientAuth() { + return false; // L: 256 } - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1760016998" - ) - static void method157() { - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 300 - Login.currentLoginField = 1; // L: 301 - } else { - Login.currentLoginField = 0; // L: 304 - } + public void removeHandshakeCompletedListener(HandshakeCompletedListener var1) { + } // L: 260 - } // L: 306 + public void setEnabledCipherSuites(String[] var1) { + } // L: 266 - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "380597881" - ) - static final int method117(int var0, int var1) { - int var2 = var0 + var1 * 57; // L: 927 - var2 ^= var2 << 13; // L: 928 - int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; // L: 929 - return var3 >> 19 & 255; // L: 930 + public void setEnabledProtocols(String[] var1) { + } // L: 269 + + public void setNeedClientAuth(boolean var1) { + } // L: 272 + + public void setUseClientMode(boolean var1) { + } // L: 275 + + public void startHandshake() throws IOException { + this.val$tlsClientProtocol.connect(new class13(this)); // L: 282 + } // L: 332 + + public InputStream getInputStream() throws IOException { + return this.val$tlsClientProtocol.getInputStream(); // L: 93 } - @ObfuscatedName("hz") + public boolean getNeedClientAuth() { + return false; // L: 126 + } + + public boolean getUseClientMode() { + return false; // L: 251 + } + + public void setEnableSessionCreation(boolean var1) { + } // L: 263 + + public String[] getSupportedProtocols() { + return null; // L: 241 + } + + public void setWantClientAuth(boolean var1) { + } // L: 278 + + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1823604285" + descriptor = "(II)Lbo;", + garbageValue = "1838920898" ) - static final void method158(int var0, int var1) { - if (Client.hintArrowType == 2) { // L: 4843 - VarbitComposition.worldToScreen((Client.hintArrowX - GrandExchangeOfferOwnWorldComparator.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - VarcInt.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4844 - if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4845 - InvDefinition.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); - } - - } - } // L: 4846 - - @ObfuscatedName("jc") - @ObfuscatedSignature( - descriptor = "(Lcy;IIII)V", - garbageValue = "402229020" - ) - @Export("addNpcToMenu") - static final void addNpcToMenu(NPC var0, int var1, int var2, int var3) { - NPCComposition var4 = var0.definition; // L: 10015 - if (Client.menuOptionsCount < 400) { // L: 10016 - if (var4.transforms != null) { // L: 10017 - var4 = var4.transform(); - } - - if (var4 != null) { // L: 10018 - if (var4.isInteractable) { // L: 10019 - if (!var4.isFollower || Client.followerIndex == var1) { // L: 10020 - String var5 = var4.name; // L: 10021 - int var6; - int var9; - if (var4.combatLevel != 0 && var0.field1182 != 0) { // L: 10022 - var6 = var0.field1182 != -1 ? var0.field1182 * -979480491 * -1781781251 : var4.combatLevel * -867920465 * 2112479567; // L: 10023 - var9 = GrandExchangeEvents.localPlayer.combatLevel; // L: 10026 - int var10 = var9 - var6; // L: 10028 - String var8; - if (var10 < -9) { // L: 10029 - var8 = UserComparator9.colorStartTag(16711680); // L: 10030 - } else if (var10 < -6) { // L: 10033 - var8 = UserComparator9.colorStartTag(16723968); // L: 10034 - } else if (var10 < -3) { // L: 10037 - var8 = UserComparator9.colorStartTag(16740352); // L: 10038 - } else if (var10 < 0) { // L: 10041 - var8 = UserComparator9.colorStartTag(16756736); // L: 10042 - } else if (var10 > 9) { // L: 10045 - var8 = UserComparator9.colorStartTag(65280); // L: 10046 - } else if (var10 > 6) { // L: 10049 - var8 = UserComparator9.colorStartTag(4259584); // L: 10050 - } else if (var10 > 3) { // L: 10053 - var8 = UserComparator9.colorStartTag(8453888); // L: 10054 - } else if (var10 > 0) { // L: 10057 - var8 = UserComparator9.colorStartTag(12648192); // L: 10058 - } else { - var8 = UserComparator9.colorStartTag(16776960); // L: 10061 - } - - var5 = var5 + var8 + " " + " (" + "level-" + var6 + ")"; // L: 10063 - } - - if (var4.isFollower && Client.followerOpsLowPriority) { // L: 10065 - class21.insertMenuItemNoShift("Examine", UserComparator9.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 10066 - } - - if (Client.isItemSelected == 1) { // L: 10069 - class21.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator9.colorStartTag(16776960) + var5, 7, var1, var2, var3); // L: 10070 - } else if (Client.isSpellSelected) { // L: 10073 - if ((class17.selectedSpellFlags & 2) == 2) { // L: 10074 - class21.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator9.colorStartTag(16776960) + var5, 8, var1, var2, var3); // L: 10075 - } - } else { - var6 = var4.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 10080 - String[] var7 = var4.actions; // L: 10081 - int var11; - if (var7 != null) { // L: 10082 - for (var11 = 4; var11 >= 0; --var11) { // L: 10083 - if (var7[var11] != null && !var7[var11].equalsIgnoreCase("Attack")) { // L: 10084 - var9 = 0; // L: 10085 - if (var11 == 0) { // L: 10086 - var9 = var6 + 9; - } - - if (var11 == 1) { // L: 10087 - var9 = var6 + 10; - } - - if (var11 == 2) { // L: 10088 - var9 = var6 + 11; - } - - if (var11 == 3) { // L: 10089 - var9 = var6 + 12; - } - - if (var11 == 4) { // L: 10090 - var9 = var6 + 13; - } - - class21.insertMenuItemNoShift(var7[var11], UserComparator9.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 10091 - } - } - } - - if (var7 != null) { // L: 10096 - for (var11 = 4; var11 >= 0; --var11) { // L: 10097 - if (var7[var11] != null && var7[var11].equalsIgnoreCase("Attack")) { // L: 10098 - short var12 = 0; // L: 10099 - if (Client.npcAttackOption != AttackOption.AttackOption_hidden) { // L: 10100 - if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var4.combatLevel > GrandExchangeEvents.localPlayer.combatLevel) { // L: 10101 - var12 = 2000; // L: 10102 - } - - var9 = 0; // L: 10104 - if (var11 == 0) { // L: 10105 - var9 = var12 + 9; - } - - if (var11 == 1) { // L: 10106 - var9 = var12 + 10; - } - - if (var11 == 2) { // L: 10107 - var9 = var12 + 11; - } - - if (var11 == 3) { // L: 10108 - var9 = var12 + 12; - } - - if (var11 == 4) { // L: 10109 - var9 = var12 + 13; - } - - class21.insertMenuItemNoShift(var7[var11], UserComparator9.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 10110 - } - } - } - } - - if (!var4.isFollower || !Client.followerOpsLowPriority) { // L: 10115 - class21.insertMenuItemNoShift("Examine", UserComparator9.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 10116 - } - } - - } - } - } - } - } // L: 10120 - - @ObfuscatedName("lo") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZB)V", - garbageValue = "121" - ) - @Export("findItemDefinitions") - static void findItemDefinitions(String var0, boolean var1) { - var0 = var0.toLowerCase(); // L: 12535 - short[] var2 = new short[16]; // L: 12536 - int var3 = 0; // L: 12537 - - for (int var4 = 0; var4 < class293.ItemDefinition_fileCount; ++var4) { // L: 12538 - ItemComposition var9 = class19.ItemDefinition_get(var4); // L: 12539 - if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 12540 12541 12542 - if (var3 >= 250) { // L: 12543 - Script.foundItemIdCount = -1; // L: 12544 - PendingSpawn.foundItemIds = null; // L: 12545 - return; // L: 12546 - } - - if (var3 >= var2.length) { // L: 12548 - short[] var6 = new short[var2.length * 2]; // L: 12549 - - for (int var7 = 0; var7 < var3; ++var7) { // L: 12550 - var6[var7] = var2[var7]; - } - - var2 = var6; // L: 12551 - } - - var2[var3++] = (short)var4; // L: 12553 - } - } - - PendingSpawn.foundItemIds = var2; // L: 12555 - GameEngine.foundItemIndex = 0; // L: 12556 - Script.foundItemIdCount = var3; // L: 12557 - String[] var8 = new String[Script.foundItemIdCount]; // L: 12558 - - for (int var5 = 0; var5 < Script.foundItemIdCount; ++var5) { // L: 12559 - var8[var5] = class19.ItemDefinition_get(var2[var5]).name; - } - - short[] var10 = PendingSpawn.foundItemIds; // L: 12560 - class117.sortItemsByName(var8, var10, 0, var8.length - 1); // L: 12562 - } // L: 12564 + @Export("Messages_getMessage") + static Message Messages_getMessage(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40 + } } diff --git a/runescape-client/src/main/java/class120.java b/runescape-client/src/main/java/class120.java index 2a5801f36a..79e7d8fddc 100644 --- a/runescape-client/src/main/java/class120.java +++ b/runescape-client/src/main/java/class120.java @@ -1,33 +1,26 @@ -import java.io.File; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("du") +@ObfuscatedName("dv") public class class120 implements class112 { - @ObfuscatedName("c") - @Export("FileSystem_cacheDir") - static File FileSystem_cacheDir; - @ObfuscatedName("dj") + @ObfuscatedName("ub") @ObfuscatedSignature( - descriptor = "Lcf;" + descriptor = "Llb;" ) - @Export("mouseRecorder") - static MouseRecorder mouseRecorder; + @Export("grandExchangeEvents") + static GrandExchangeEvents grandExchangeEvents; + @ObfuscatedName("f") + @Export("Widget_loadedInterfaces") + public static boolean[] Widget_loadedInterfaces; - @ObfuscatedName("v") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)Lnq;", - garbageValue = "4" + descriptor = "(IB)Lfx;", + garbageValue = "-81" ) - public static class386 method2761() { - synchronized(class386.field4344) { // L: 26 - if (class386.field4339 == 0) { // L: 27 - return new class386(); - } else { - class386.field4344[--class386.field4339].method6985(); // L: 29 - return class386.field4344[class386.field4339]; // L: 30 - } - } + @Export("WorldMapElement_get") + public static WorldMapElement WorldMapElement_get(int var0) { + return var0 >= 0 && var0 < class344.WorldMapElement_cached.length && class344.WorldMapElement_cached[var0] != null ? class344.WorldMapElement_cached[var0] : new WorldMapElement(var0); // L: 62 63 } } diff --git a/runescape-client/src/main/java/class121.java b/runescape-client/src/main/java/class121.java new file mode 100644 index 0000000000..b2e71dc13d --- /dev/null +++ b/runescape-client/src/main/java/class121.java @@ -0,0 +1,56 @@ +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("dr") +public class class121 { + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1242696181 + ) + static int field1529; + + @ObfuscatedName("ff") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "2071231531" + ) + static boolean method2748() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1481 + while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1482 + ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 1483 + if (!var0.isLoaded()) { + return false; // L: 1484 + } + + ++Client.archiveLoadersDone; // L: 1485 + } + + return true; // L: 1487 + } else { + return true; // L: 1486 + } + } + + @ObfuscatedName("ku") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "55" + ) + @Export("FriendSystem_invalidateIgnoreds") + static final void FriendSystem_invalidateIgnoreds() { + Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 12412 + + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); // L: 12413 + var1.clearIsFromIgnored(); // L: 12415 + } + + if (PcmPlayer.friendsChat != null) { // L: 12419 + PcmPlayer.friendsChat.invalidateIgnoreds(); // L: 12420 + } + + } // L: 12422 +} diff --git a/runescape-client/src/main/java/class122.java b/runescape-client/src/main/java/class122.java index 1209b43bf6..e376a9a56a 100644 --- a/runescape-client/src/main/java/class122.java +++ b/runescape-client/src/main/java/class122.java @@ -3,315 +3,323 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("do") +@ObfuscatedName("ds") public class class122 extends DualNode { - @ObfuscatedName("r") + @ObfuscatedName("sd") + @ObfuscatedSignature( + descriptor = "Las;" + ) + @Export("pcmStreamMixer") + static PcmStreamMixer pcmStreamMixer; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 756927065 + intValue = -676167361 ) - @Export("Interpreter_stringStackSize") - static int Interpreter_stringStackSize; - @ObfuscatedName("be") + int field1531; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lpe;" + descriptor = "[[Ldz;" ) - @Export("loginType") - static LoginType loginType; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -1723408099 - ) - int field1470; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "[[Ldt;" - ) - public class117[][] field1474; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "[[Ldt;" - ) - class117[][] field1471; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 2014722717 - ) - int field1469; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -332212275 - ) - int field1473; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public Skeleton field1472; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1571742799 - ) - int field1475; - @ObfuscatedName("l") - boolean field1476; - - @ObfuscatedSignature( - descriptor = "(Lln;Lln;IZ)V", - garbageValue = "0" - ) - public class122(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { - this.field1474 = null; // L: 14 - this.field1471 = null; // L: 15 - this.field1475 = 0; // L: 19 - this.field1470 = var3; // L: 23 - byte[] var5 = var1.takeFile(this.field1470 >> 16 & 65535, this.field1470 & 65535); // L: 24 - Buffer var6 = new Buffer(var5); // L: 25 - int var7 = var6.readUnsignedByte(); // L: 26 - int var8 = var6.readUnsignedShort(); // L: 27 - byte[] var9 = var2.getFile(var8, 0); // L: 30 - this.field1472 = new Skeleton(var8, var9); // L: 31 - this.method2780(var6, var7); // L: 32 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-1615717546" - ) - void method2780(Buffer var1, int var2) { - this.field1469 = var1.readUnsignedShort(); // L: 36 - this.field1473 = var1.readUnsignedShort(); // L: 37 - this.field1475 = var1.readUnsignedByte(); // L: 38 - int var3 = var1.readUnsignedShort(); // L: 39 - this.field1471 = new class117[this.field1472.method4721().method4698()][]; // L: 40 - this.field1474 = new class117[this.field1472.method4720()][]; // L: 41 - - for (int var4 = 0; var4 < var3; ++var4) { // L: 42 - class118 var5 = TriBool.method6838(var1.readUnsignedByte()); // L: 43 - int var6 = var1.readShortSmart(); // L: 44 - int var8 = var1.readUnsignedByte(); // L: 46 - class119 var9 = (class119)MusicPatchPcmStream.findEnumerated(GrandExchangeOfferTotalQuantityComparator.method5977(), var8); // L: 48 - if (var9 == null) { // L: 49 - var9 = class119.field1449; - } - - class117 var10 = new class117(); // L: 53 - var10.method2708(var1, var2); // L: 54 - int var11 = var5.method2739(); // L: 55 - class117[][] var12; - if (var5 == class118.field1430) { // L: 57 - var12 = this.field1471; // L: 58 - } else { - var12 = this.field1474; // L: 61 - } - - if (var12[var6] == null) { // L: 63 - var12[var6] = new class117[var11]; // L: 64 - } - - var12[var6][var9.method2751()] = var10; // L: 66 - if (var5 == class118.field1434) { // L: 67 - this.field1476 = true; // L: 68 - } - } - - } // L: 71 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "35" - ) - int method2764() { - return this.field1469; // L: 74 - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1732677053" - ) - int method2781() { - return this.field1473; // L: 78 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "30516" - ) - public int method2766() { - return this.field1475; // L: 82 - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "5" - ) - public int method2762() { - return this.method2781() - this.method2764(); // L: 86 - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1927278316" - ) - public boolean method2768() { - return this.field1476; // L: 90 - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(ILda;III)V", - garbageValue = "-1716818444" - ) - public void method2796(int var1, class115 var2, int var3, int var4) { - class387 var5; - synchronized(class387.field4346) { // L: 96 - if (class387.field4347 == 0) { // L: 97 - var5 = new class387(); - } else { - class387.field4346[--class387.field4347].method7011(); // L: 99 - var5 = class387.field4346[class387.field4347]; // L: 100 - } - } - - this.method2763(var5, var3, var2, var1); // L: 105 - this.method2793(var5, var3, var2, var1); // L: 106 - this.method2771(var5, var3, var2, var1); // L: 107 - var2.method2676(var5); // L: 108 - var5.method7029(); // L: 109 - } // L: 110 - + public class117[][] field1530; @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lnt;ILda;II)V", - garbageValue = "-1176349802" + descriptor = "[[Ldz;" ) - void method2763(class387 var1, int var2, class115 var3, int var4) { - float[] var5 = var3.method2672(this.field1475); // L: 113 - float var6 = var5[0]; // L: 114 - float var7 = var5[1]; // L: 115 - float var8 = var5[2]; // L: 116 - if (this.field1471[var2] != null) { // L: 117 - class117 var9 = this.field1471[var2][0]; // L: 118 - class117 var10 = this.field1471[var2][1]; // L: 119 - class117 var11 = this.field1471[var2][2]; // L: 120 - if (var9 != null) { // L: 121 - var6 = var9.method2709(var4); - } + class117[][] field1532; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1182736645 + ) + int field1533; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 195847897 + ) + int field1534; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public Skeleton field1535; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 2017030435 + ) + int field1536; + @ObfuscatedName("s") + boolean field1537; - if (var10 != null) { // L: 122 - var7 = var10.method2709(var4); - } - - if (var11 != null) { // L: 123 - var8 = var11.method2709(var4); - } + @ObfuscatedSignature( + descriptor = "(Llp;Llp;IZ)V" + ) + class122(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { + this.field1530 = null; // L: 14 + this.field1532 = null; // L: 15 + this.field1536 = 0; // L: 19 + this.field1531 = var3; // L: 44 + byte[] var5 = var1.takeFile(this.field1531 >> 16 & 65535, this.field1531 & 65535); // L: 45 + Buffer var6 = new Buffer(var5); // L: 46 + int var7 = var6.readUnsignedByte(); // L: 47 + int var8 = var6.readUnsignedShort(); // L: 48 + byte[] var9; + if (var4) { // L: 50 + var9 = var2.getFile(0, var8); + } else { + var9 = var2.getFile(var8, 0); // L: 51 } - class386 var17 = class120.method2761(); // L: 125 - var17.method6984(1.0F, 0.0F, 0.0F, var6); // L: 126 - class386 var18 = class120.method2761(); // L: 127 - var18.method6984(0.0F, 1.0F, 0.0F, var7); // L: 128 - class386 var19 = class120.method2761(); // L: 129 - var19.method6984(0.0F, 0.0F, 1.0F, var8); // L: 130 - class386 var12 = class120.method2761(); // L: 131 - var12.method6986(var19); // L: 132 - var12.method6986(var17); // L: 133 - var12.method6986(var18); // L: 134 - class387 var13; - synchronized(class387.field4346) { // L: 137 - if (class387.field4347 == 0) { // L: 138 - var13 = new class387(); - } else { - class387.field4346[--class387.field4347].method7011(); // L: 140 - var13 = class387.field4346[class387.field4347]; // L: 141 - } - } - - var13.method7006(var12); // L: 146 - var1.method7017(var13); // L: 147 - var17.method6988(); // L: 148 - var18.method6988(); // L: 149 - var19.method6988(); // L: 150 - var12.method6988(); // L: 151 - var13.method7029(); // L: 152 - } // L: 153 + this.field1535 = new Skeleton(var8, var9); // L: 52 + this.method2750(var6, var7); // L: 53 + } // L: 54 @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lnt;ILda;IB)V", - garbageValue = "-70" + descriptor = "(Lpx;II)V", + garbageValue = "-1451589844" ) - void method2771(class387 var1, int var2, class115 var3, int var4) { - float[] var5 = var3.method2673(this.field1475); // L: 156 - float var6 = var5[0]; // L: 157 - float var7 = var5[1]; // L: 158 - float var8 = var5[2]; // L: 159 - if (this.field1471[var2] != null) { // L: 160 - class117 var9 = this.field1471[var2][3]; // L: 161 - class117 var10 = this.field1471[var2][4]; // L: 162 - class117 var11 = this.field1471[var2][5]; // L: 163 - if (var9 != null) { // L: 164 - var6 = var9.method2709(var4); + void method2750(Buffer var1, int var2) { + this.field1533 = var1.readUnsignedShort(); // L: 57 + this.field1534 = var1.readUnsignedShort(); // L: 58 + this.field1536 = var1.readUnsignedByte(); // L: 59 + int var3 = var1.readUnsignedShort(); // L: 60 + this.field1532 = new class117[this.field1535.method4023().method4003()][]; // L: 61 + this.field1530 = new class117[this.field1535.method4018()][]; // L: 62 + + for (int var4 = 0; var4 < var3; ++var4) { // L: 63 + class118 var5 = class160.method3169(var1.readUnsignedByte()); // L: 64 + int var6 = var1.readShortSmart(); // L: 65 + int var8 = var1.readUnsignedByte(); // L: 67 + class119 var9 = (class119)class291.findEnumerated(ItemContainer.method2060(), var8); // L: 69 + if (var9 == null) { // L: 70 + var9 = class119.field1508; } - if (var10 != null) { // L: 165 - var7 = var10.method2709(var4); - } - - if (var11 != null) { // L: 166 - var8 = var11.method2709(var4); - } - } - - var1.field4348[12] = var6; // L: 168 - var1.field4348[13] = var7; // L: 169 - var1.field4348[14] = var8; // L: 170 - } // L: 171 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Lnt;ILda;II)V", - garbageValue = "16711935" - ) - void method2793(class387 var1, int var2, class115 var3, int var4) { - float[] var5 = var3.method2674(this.field1475); // L: 174 - float var6 = var5[0]; // L: 175 - float var7 = var5[1]; // L: 176 - float var8 = var5[2]; // L: 177 - if (this.field1471[var2] != null) { // L: 178 - class117 var9 = this.field1471[var2][6]; // L: 179 - class117 var10 = this.field1471[var2][7]; // L: 180 - class117 var11 = this.field1471[var2][8]; // L: 181 - if (var9 != null) { // L: 182 - var6 = var9.method2709(var4); - } - - if (var10 != null) { // L: 183 - var7 = var10.method2709(var4); - } - - if (var11 != null) { // L: 184 - var8 = var11.method2709(var4); - } - } - - class387 var14; - synchronized(class387.field4346) { // L: 188 - if (class387.field4347 == 0) { // L: 189 - var14 = new class387(); + class117 var10 = new class117(); // L: 74 + var10.method2688(var1, var2); // L: 75 + int var11 = var5.method2732(); // L: 76 + class117[][] var12; + if (var5 == class118.field1491) { // L: 78 + var12 = this.field1532; // L: 79 } else { - class387.field4346[--class387.field4347].method7011(); // L: 191 - var14 = class387.field4346[class387.field4347]; // L: 192 + var12 = this.field1530; // L: 82 + } + + if (var12[var6] == null) { // L: 84 + var12[var6] = new class117[var11]; // L: 85 + } + + var12[var6][var9.method2738()] = var10; // L: 87 + if (var5 == class118.field1490) { // L: 88 + this.field1537 = true; // L: 89 } } - var14.method7049(var6, var7, var8); // L: 197 - var1.method7017(var14); // L: 198 - var14.method7029(); // L: 199 - } // L: 200 + } // L: 92 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "64" + ) + int method2779() { + return this.field1533; // L: 95 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1081367730" + ) + int method2752() { + return this.field1534; // L: 99 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-47" + ) + public int method2753() { + return this.field1536; // L: 103 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-98" + ) + public int method2754() { + return this.method2752() - this.method2779(); // L: 107 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-65" + ) + public boolean method2755() { + return this.field1537; // L: 111 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(ILdb;IIB)V", + garbageValue = "-94" + ) + public void method2756(int var1, class115 var2, int var3, int var4) { + class388 var5 = Tile.method3904(); // L: 115 + this.method2757(var5, var3, var2, var1); // L: 116 + this.method2758(var5, var3, var2, var1); // L: 117 + this.method2774(var5, var3, var2, var1); // L: 118 + var2.method2645(var5); // L: 119 + var5.method6865(); // L: 120 + } // L: 121 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Lnw;ILdb;II)V", + garbageValue = "-565216546" + ) + void method2757(class388 var1, int var2, class115 var3, int var4) { + float[] var5 = var3.method2647(this.field1536); // L: 124 + float var6 = var5[0]; // L: 125 + float var7 = var5[1]; // L: 126 + float var8 = var5[2]; // L: 127 + if (this.field1532[var2] != null) { // L: 128 + class117 var9 = this.field1532[var2][0]; // L: 129 + class117 var10 = this.field1532[var2][1]; // L: 130 + class117 var11 = this.field1532[var2][2]; // L: 131 + if (var9 != null) { // L: 132 + var6 = var9.method2689(var4); + } + + if (var10 != null) { // L: 133 + var7 = var10.method2689(var4); + } + + if (var11 != null) { // L: 134 + var8 = var11.method2689(var4); + } + } + + class387 var22; + synchronized(class387.field4395) { // L: 138 + if (Frames.field2492 == 0) { // L: 139 + var22 = new class387(); + } else { + class387.field4395[--Frames.field2492].method6782(); // L: 141 + var22 = class387.field4395[Frames.field2492]; // L: 142 + } + } + + var22.method6784(1.0F, 0.0F, 0.0F, var6); // L: 147 + class387 var23; + synchronized(class387.field4395) { // L: 150 + if (Frames.field2492 == 0) { // L: 151 + var23 = new class387(); + } else { + class387.field4395[--Frames.field2492].method6782(); // L: 153 + var23 = class387.field4395[Frames.field2492]; // L: 154 + } + } + + var23.method6784(0.0F, 1.0F, 0.0F, var7); // L: 159 + class387 var13; + synchronized(class387.field4395) { // L: 162 + if (Frames.field2492 == 0) { // L: 163 + var13 = new class387(); + } else { + class387.field4395[--Frames.field2492].method6782(); // L: 165 + var13 = class387.field4395[Frames.field2492]; // L: 166 + } + } + + var13.method6784(0.0F, 0.0F, 1.0F, var8); // L: 171 + class387 var15; + synchronized(class387.field4395) { // L: 174 + if (Frames.field2492 == 0) { // L: 175 + var15 = new class387(); + } else { + class387.field4395[--Frames.field2492].method6782(); // L: 177 + var15 = class387.field4395[Frames.field2492]; // L: 178 + } + } + + var15.method6783(var13); // L: 183 + var15.method6783(var22); // L: 184 + var15.method6783(var23); // L: 185 + class388 var17 = Tile.method3904(); // L: 186 + var17.method6817(var15); // L: 187 + var1.method6816(var17); // L: 188 + var22.method6779(); // L: 189 + var23.method6779(); // L: 190 + var13.method6779(); // L: 191 + var15.method6779(); // L: 192 + var17.method6865(); // L: 193 + } // L: 194 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lnw;ILdb;IB)V", + garbageValue = "-29" + ) + void method2774(class388 var1, int var2, class115 var3, int var4) { + float[] var5 = var3.method2655(this.field1536); // L: 197 + float var6 = var5[0]; // L: 198 + float var7 = var5[1]; // L: 199 + float var8 = var5[2]; // L: 200 + if (this.field1532[var2] != null) { // L: 201 + class117 var9 = this.field1532[var2][3]; // L: 202 + class117 var10 = this.field1532[var2][4]; // L: 203 + class117 var11 = this.field1532[var2][5]; // L: 204 + if (var9 != null) { // L: 205 + var6 = var9.method2689(var4); + } + + if (var10 != null) { // L: 206 + var7 = var10.method2689(var4); + } + + if (var11 != null) { // L: 207 + var8 = var11.method2689(var4); + } + } + + var1.field4400[12] = var6; // L: 209 + var1.field4400[13] = var7; // L: 210 + var1.field4400[14] = var8; // L: 211 + } // L: 212 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(Lnw;ILdb;IB)V", + garbageValue = "-6" + ) + void method2758(class388 var1, int var2, class115 var3, int var4) { + float[] var5 = var3.method2649(this.field1536); // L: 215 + float var6 = var5[0]; // L: 216 + float var7 = var5[1]; // L: 217 + float var8 = var5[2]; // L: 218 + if (this.field1532[var2] != null) { // L: 219 + class117 var9 = this.field1532[var2][6]; // L: 220 + class117 var10 = this.field1532[var2][7]; // L: 221 + class117 var11 = this.field1532[var2][8]; // L: 222 + if (var9 != null) { // L: 223 + var6 = var9.method2689(var4); + } + + if (var10 != null) { // L: 224 + var7 = var10.method2689(var4); + } + + if (var11 != null) { // L: 225 + var8 = var11.method2689(var4); + } + } + + class388 var12 = Tile.method3904(); // L: 227 + var12.method6814(var6, var7, var8); // L: 228 + var1.method6816(var12); // L: 229 + var12.method6865(); // L: 230 + } // L: 231 } diff --git a/runescape-client/src/main/java/class123.java b/runescape-client/src/main/java/class123.java index 71bf15e082..f27cf24a5a 100644 --- a/runescape-client/src/main/java/class123.java +++ b/runescape-client/src/main/java/class123.java @@ -3,99 +3,91 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dw") +@ObfuscatedName("dt") public enum class123 implements MouseWheel { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ldw;" + descriptor = "Ldt;" ) - field1483(0, 0), - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Ldw;" - ) - field1492(1, 1), - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Ldw;" - ) - field1486(2, 2), - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Ldw;" - ) - field1482(3, 3), - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Ldw;" - ) - field1481(4, 4), - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Ldw;" - ) - field1484(5, 5), - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ldw;" - ) - field1487(6, 6), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Ldw;" - ) - field1488(7, 7), + field1550(0, 0), @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Ldw;" + descriptor = "Ldt;" ) - field1489(8, 8); - - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1942889575 + field1545(1, 1), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Ldt;" ) - final int field1490; + field1540(2, 2), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Ldt;" + ) + field1542(3, 3), + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Ldt;" + ) + field1543(4, 4), + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Ldt;" + ) + field1539(5, 5), + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Ldt;" + ) + field1541(6, 6), + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Ldt;" + ) + field1546(7, 7), @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -315171815 + @ObfuscatedSignature( + descriptor = "Ldt;" ) - final int field1491; - - class123(int var3, int var4) { - this.field1490 = var3; // L: 110 - this.field1491 = var4; // L: 111 - } // L: 112 + field1547(8, 8); @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1024399329 + ) + final int field1548; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = -44674933 + ) + final int field1549; + + class123(int var3, int var4) { + this.field1548 = var3; // L: 107 + this.field1549 = var4; // L: 108 + } // L: 109 + + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1491; // L: 115 + return this.field1549; // L: 112 } - @ObfuscatedName("v") + @ObfuscatedName("lh") @ObfuscatedSignature( - descriptor = "(II)Lfk;", - garbageValue = "2122696884" + descriptor = "(IIIZB)V", + garbageValue = "16" ) - public static FloorUnderlayDefinition method2806(int var0) { - FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); // L: 21 - if (var1 != null) { // L: 22 - return var1; - } else { - byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); // L: 23 - var1 = new FloorUnderlayDefinition(); // L: 24 - if (var2 != null) { // L: 25 - var1.decode(new Buffer(var2), var0); - } - - var1.postDecode(); // L: 26 - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); // L: 27 - return var1; // L: 28 - } - } + public static void method2781(int var0, int var1, int var2, boolean var3) { + PacketBufferNode var4 = WallDecoration.getPacketBufferNode(ClientPacket.field2955, Client.packetWriter.isaacCipher); // L: 12656 + var4.packetBuffer.method7551(var1); // L: 12657 + var4.packetBuffer.method7550(var0); // L: 12658 + var4.packetBuffer.method7596(var2); // L: 12659 + var4.packetBuffer.writeIntME(var3 ? Client.field482 * -1673751255 * 1079039769 : 0); // L: 12660 + Client.packetWriter.addNode(var4); // L: 12661 + } // L: 12662 } diff --git a/runescape-client/src/main/java/class124.java b/runescape-client/src/main/java/class124.java index f87432161a..adaf9d9779 100644 --- a/runescape-client/src/main/java/class124.java +++ b/runescape-client/src/main/java/class124.java @@ -3,64 +3,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dl") +@ObfuscatedName("df") public enum class124 implements MouseWheel { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ldl;" + descriptor = "Ldf;" ) - field1501(4, 0), - @ObfuscatedName("c") + field1556(3, 0), + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Ldl;" + descriptor = "Ldf;" ) - field1498(3, 1), - @ObfuscatedName("i") + field1557(1, 1), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ldl;" + descriptor = "Ldf;" ) - field1495(1, 2), - @ObfuscatedName("f") + field1553(2, 2), + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ldl;" + descriptor = "Ldf;" ) - field1496(2, 3), - @ObfuscatedName("b") + field1551(0, 3), + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Ldl;" + descriptor = "Ldf;" ) - field1497(0, 4); + field1555(4, 4); - @ObfuscatedName("od") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -721615265 + intValue = 2107670809 ) - @Export("widgetDragDuration") - static int widgetDragDuration; - @ObfuscatedName("n") + public final int field1552; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1424208167 - ) - public final int field1493; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 669074999 + intValue = -24043459 ) @Export("id") final int id; class124(int var3, int var4) { - this.field1493 = var3; // L: 17 + this.field1552 = var3; // L: 17 this.id = var4; // L: 18 } // L: 19 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 22 + return this.id; // L: 23 } } diff --git a/runescape-client/src/main/java/class125.java b/runescape-client/src/main/java/class125.java index edd2def680..7a153094f2 100644 --- a/runescape-client/src/main/java/class125.java +++ b/runescape-client/src/main/java/class125.java @@ -1,72 +1,150 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dn") +@ObfuscatedName("dm") public class class125 extends class128 { - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1563450385 + @ObfuscatedName("px") + @ObfuscatedSignature( + descriptor = "Lcu;" ) - int field1505; - @ObfuscatedName("c") + @Export("varcs") + static Varcs varcs; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 166042901 + intValue = -887084095 ) - int field1506; - @ObfuscatedName("i") + int field1561; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 436886769 + intValue = -1121955905 ) - int field1504; - @ObfuscatedName("f") + int field1559; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -647039723 + intValue = -263123509 ) - int field1503; + int field1560; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1343023729 + ) + int field1562; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Les;" + descriptor = "Leh;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Les;)V" + descriptor = "(Leh;)V" ) class125(class131 var1) { this.this$0 = var1; - this.field1505 = -1; // L: 158 + this.field1561 = -1; // L: 158 } // L: 163 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-413979452" + descriptor = "(Lpx;I)V", + garbageValue = "-611912046" ) - void vmethod3168(Buffer var1) { - this.field1505 = var1.readUnsignedShort(); // L: 166 - this.field1506 = var1.readInt(); // L: 167 - this.field1504 = var1.readUnsignedByte(); // L: 168 - this.field1503 = var1.readUnsignedByte(); // L: 169 + void vmethod3040(Buffer var1) { + this.field1561 = var1.readUnsignedShort(); // L: 166 + this.field1559 = var1.readInt(); // L: 167 + this.field1560 = var1.readUnsignedByte(); // L: 168 + this.field1562 = var1.readUnsignedByte(); // L: 169 } // L: 170 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lex;S)V", - garbageValue = "-10316" + descriptor = "(Lek;B)V", + garbageValue = "-73" ) - void vmethod3162(ClanSettings var1) { - var1.method2967(this.field1505, this.field1506, this.field1504, this.field1503); // L: 173 + void vmethod3041(ClanSettings var1) { + var1.method2896(this.field1561, this.field1559, this.field1560, this.field1562); // L: 173 } // L: 174 - @ObfuscatedName("v") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lln;Lln;Lln;I)V", - garbageValue = "2079991679" + descriptor = "(Ljava/lang/Object;ZI)[B", + garbageValue = "1216365156" ) - public static void method2811(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { - class11.SequenceDefinition_archive = var0; // L: 46 - SequenceDefinition.SequenceDefinition_animationsArchive = var1; // L: 47 - SequenceDefinition.SequenceDefinition_skeletonsArchive = var2; // L: 48 - } // L: 49 + public static byte[] method2791(Object var0, boolean var1) { + if (var0 == null) { // L: 21 + return null; + } else if (var0 instanceof byte[]) { // L: 22 + byte[] var3 = (byte[])((byte[])var0); // L: 23 + return var1 ? UrlRequester.method2537(var3) : var3; // L: 24 + } else if (var0 instanceof AbstractByteArrayCopier) { // L: 27 + AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 28 + return var2.get(); // L: 29 + } else { + throw new IllegalArgumentException(); // L: 31 + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lle;IB)V", + garbageValue = "1" + ) + static void method2796(Archive var0, int var1) { + if (class300.NetCache_reference != null) { // L: 110 + class300.NetCache_reference.offset = var1 * 8 + 5; + int var2 = class300.NetCache_reference.readInt(); + int var3 = class300.NetCache_reference.readInt(); + var0.loadIndex(var2, var3); // L: 114 + } else { + class250.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); + NetCache.NetCache_archives[var1] = var0; + } + } // L: 115 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "([BIIIIIII[Lgh;I)V", + garbageValue = "810433263" + ) + static final void method2794(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: 111 + for (var10 = 0; var10 < 8; ++var10) { // L: 112 + if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { // L: 113 + int[] var10000 = var8[var1].flags[var9 + var2]; + var10000[var10 + var3] &= -16777217; + } + } + } + + Buffer var20 = new Buffer(var0); // L: 116 + + for (var10 = 0; var10 < 4; ++var10) { // L: 117 + for (int var11 = 0; var11 < 64; ++var11) { // L: 118 + for (int var12 = 0; var12 < 64; ++var12) { // L: 119 + if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { // L: 120 + int var17 = var11 & 7; // L: 125 + int var18 = var12 & 7; // L: 126 + int var19 = var7 & 3; // L: 129 + int var16; + if (var19 == 0) { // L: 130 + var16 = var17; // L: 131 + } else if (var19 == 1) { // L: 134 + var16 = var18; // L: 135 + } else if (var19 == 2) { // L: 138 + var16 = 7 - var17; // L: 139 + } else { + var16 = 7 - var18; // L: 142 + } + + class67.loadTerrain(var20, var1, var2 + var16, var3 + VarpDefinition.method3273(var11 & 7, var12 & 7, var7), 0, 0, var7); // L: 144 + } else { + class67.loadTerrain(var20, 0, -1, -1, 0, 0, 0); // L: 146 + } + } + } + } + + } // L: 150 } diff --git a/runescape-client/src/main/java/class126.java b/runescape-client/src/main/java/class126.java index 6dcbd5e14a..89efcf64ce 100644 --- a/runescape-client/src/main/java/class126.java +++ b/runescape-client/src/main/java/class126.java @@ -3,66 +3,67 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("db") +@ObfuscatedName("dq") public class class126 extends class128 { - @ObfuscatedName("cf") + @ObfuscatedName("ci") @ObfuscatedSignature( - descriptor = "[Lqq;" + descriptor = "Lqd;" ) - @Export("worldSelectArrows") - static IndexedSprite[] worldSelectArrows; - @ObfuscatedName("v") + @Export("worldSelectLeftSprite") + static IndexedSprite worldSelectLeftSprite; + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = 5363365603419108439L + longValue = 5516505450809482133L ) - long field1511; - @ObfuscatedName("c") - String field1508; + long field1567; + @ObfuscatedName("q") + String field1566; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Les;" + descriptor = "Leh;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Les;)V" + descriptor = "(Leh;)V" ) class126(class131 var1) { this.this$0 = var1; - this.field1511 = -1L; // L: 74 - this.field1508 = null; // L: 75 + this.field1567 = -1L; // L: 74 + this.field1566 = null; // L: 75 } // L: 77 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-413979452" + descriptor = "(Lpx;I)V", + garbageValue = "-611912046" ) - void vmethod3168(Buffer var1) { + void vmethod3040(Buffer var1) { if (var1.readUnsignedByte() != 255) { // L: 80 --var1.offset; // L: 81 - this.field1511 = var1.readLong(); // L: 82 + this.field1567 = var1.readLong(); // L: 82 } - this.field1508 = var1.readStringCp1252NullTerminatedOrNull(); // L: 84 + this.field1566 = var1.readStringCp1252NullTerminatedOrNull(); // L: 84 } // L: 85 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lex;S)V", - garbageValue = "-10316" + descriptor = "(Lek;B)V", + garbageValue = "-73" ) - void vmethod3162(ClanSettings var1) { - var1.method2959(this.field1511, this.field1508, 0); // L: 88 + void vmethod3041(ClanSettings var1) { + var1.method2888(this.field1567, this.field1566, 0); // L: 88 } // L: 89 - @ObfuscatedName("ku") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1206801353" + garbageValue = "-904049199" ) - static final void method2824(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); // L: 12031 - class131.clientPreferences.updateSoundEffectVolume(var0); // L: 12032 - } // L: 12033 + static void method2799(int var0) { + if (var0 != Login.loginIndex) { // L: 1964 + Login.loginIndex = var0; // L: 1965 + } + } // L: 1966 } diff --git a/runescape-client/src/main/java/class127.java b/runescape-client/src/main/java/class127.java index 18422d6228..410bba393d 100644 --- a/runescape-client/src/main/java/class127.java +++ b/runescape-client/src/main/java/class127.java @@ -2,235 +2,167 @@ 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("dh") +@ObfuscatedName("dw") public class class127 extends class128 { - @ObfuscatedName("as") - @Export("client") + @ObfuscatedName("ue") @ObfuscatedSignature( - descriptor = "Lclient;" + descriptor = "Llh;" ) - static Client client; - @ObfuscatedName("v") + public static class326 field1570; + @ObfuscatedName("r") + @Export("SpriteBuffer_pixels") + public static byte[][] SpriteBuffer_pixels; + @ObfuscatedName("iu") + @ObfuscatedSignature( + descriptor = "[Lqd;" + ) + @Export("scrollBarSprites") + static IndexedSprite[] scrollBarSprites; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1073843279 + intValue = -115567503 ) - int field1518; + int field1572; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Les;" + descriptor = "Leh;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Les;)V" + descriptor = "(Leh;)V" ) class127(class131 var1) { this.this$0 = var1; - this.field1518 = -1; - } + this.field1572 = -1; // L: 114 + } // L: 116 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-413979452" + descriptor = "(Lpx;I)V", + garbageValue = "-611912046" ) - void vmethod3168(Buffer var1) { - this.field1518 = var1.readUnsignedShort(); + void vmethod3040(Buffer var1) { + this.field1572 = var1.readUnsignedShort(); // L: 119 } // L: 120 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lex;S)V", - garbageValue = "-10316" + descriptor = "(Lek;B)V", + garbageValue = "-73" ) - void vmethod3162(ClanSettings var1) { - var1.method2960(this.field1518); // L: 123 - } + void vmethod3041(ClanSettings var1) { + var1.method2926(this.field1572); // L: 123 + } // L: 124 - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)[Ljv;", - garbageValue = "-78" - ) - static LoginPacket[] method2836() { - return new LoginPacket[]{LoginPacket.field3137, LoginPacket.field3132, LoginPacket.field3134, LoginPacket.field3131, LoginPacket.field3133, LoginPacket.field3130}; // L: 22 - } + @ObfuscatedName("o") + public static final int method2805(double var0, double var2, double var4) { + double var6 = var4; // L: 9 + double var8 = var4; // L: 10 + double var10 = var4; // L: 11 + if (var2 != 0.0D) { // L: 12 + double var12; + if (var4 < 0.5D) { // L: 14 + var12 = (var2 + 1.0D) * var4; + } else { + var12 = var2 + var4 - var4 * var2; // L: 15 + } - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)Lky;", - garbageValue = "-1735575897" - ) - @Export("getWidget") - public static Widget getWidget(int var0) { - int var1 = var0 >> 16; // L: 229 - int var2 = var0 & 65535; // L: 230 - if (Widget.Widget_interfaceComponents[var1] == null || Widget.Widget_interfaceComponents[var1][var2] == null) { // L: 231 - boolean var3 = class155.loadInterface(var1); // L: 232 - if (!var3) { // L: 233 - return null; + double var14 = var4 * 2.0D - 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 (6.0D * var16 < 1.0D) { // L: 22 + var6 = var14 + (var12 - var14) * 6.0D * var16; + } else if (var16 * 2.0D < 1.0D) { // L: 23 + var6 = var12; + } else if (3.0D * var16 < 2.0D) { + var6 = (0.6666666666666666D - var16) * (var12 - var14) * 6.0D + var14; + } else { + var6 = var14; + } + + if (var0 * 6.0D < 1.0D) { + var8 = var14 + (var12 - var14) * 6.0D * var0; + } else if (2.0D * var0 < 1.0D) { + var8 = var12; + } else if (3.0D * var0 < 2.0D) { + var8 = var14 + 6.0D * (0.6666666666666666D - var0) * (var12 - var14); + } else { + var8 = var14; + } + + if (6.0D * var20 < 1.0D) { + var10 = var20 * 6.0D * (var12 - var14) + var14; + } else if (var20 * 2.0D < 1.0D) { + var10 = var12; + } else if (3.0D * var20 < 2.0D) { + var10 = var14 + (var12 - var14) * (0.6666666666666666D - var20) * 6.0D; + } else { + var10 = var14; } } - return Widget.Widget_interfaceComponents[var1][var2]; // L: 235 + int var22 = (int)(256.0D * var6); + int var13 = (int)(256.0D * var8); + int var23 = (int)(var10 * 256.0D); + int var15 = var23 + (var13 << 8) + (var22 << 16); + return var15; // L: 39 } - @ObfuscatedName("i") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([Lbb;II[I[IB)V", - garbageValue = "-21" + descriptor = "(ILpx;B)Lfn;", + garbageValue = "105" ) - @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 + public static class168 method2807(int var0, Buffer var1) { + int var2 = var1.readUnsignedByte(); // L: 24 + boolean var3 = (var2 & 1) != 0; // L: 25 + boolean var4 = (var2 & 2) != 0; // L: 26 + class168 var5 = new class168(var0); // L: 27 + int var6; + int[] var7; + boolean var8; + int var9; + short var10; + if (var3) { // L: 28 + var6 = var1.readUnsignedByte(); // L: 29 + var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 30 31 32 + var8 = var5.field1847 != null && var7.length == var5.field1847.length; // L: 33 - 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; - } + for (var9 = 0; var9 < 2; ++var9) { // L: 34 + if (var7[var9] != 15) { // L: 35 + var10 = (short)var1.readUnsignedShort(); // L: 36 + if (var8) { // L: 37 + var5.field1847[var7[var9]] = var10; // L: 38 } - } 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 (var11 != var12) { // 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 } - } // L: 168 + if (var4) { // L: 43 + var6 = var1.readUnsignedByte(); // L: 44 + var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 45 46 47 + var8 = var5.field1844 != null && var7.length == var5.field1844.length; // L: 48 - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "451726103" - ) - static int method2840(int var0, Script var1, boolean var2) { - Widget var3 = getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1449 - if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1450 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapID.Widget_unpackTargetMask(class326.getWidgetFlags(var3)); // L: 1451 - return 1; // L: 1452 - } else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1454 - if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1461 - if (var3.dataText == null) { // L: 1462 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1463 + for (var9 = 0; var9 < 2; ++var9) { // L: 49 + if (var7[var9] != 15) { // L: 50 + var10 = (short)var1.readUnsignedShort(); // L: 51 + if (var8) { // L: 52 + var5.field1844[var7[var9]] = var10; // L: 53 + } } - - return 1; // L: 1464 - } else { - return 2; // L: 1466 } - } else { - int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1455 - --var4; // L: 1456 - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1457 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1458 - } else { - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; - } - - return 1; // L: 1459 } - } - @ObfuscatedName("kx") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "799305208" - ) - static final void method2830(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); // L: 12036 - class131.clientPreferences.method2244(var0); // L: 12037 - } // L: 12038 + return var5; // L: 58 + } } diff --git a/runescape-client/src/main/java/class128.java b/runescape-client/src/main/java/class128.java index d8f1138f49..5aa737f7f5 100644 --- a/runescape-client/src/main/java/class128.java +++ b/runescape-client/src/main/java/class128.java @@ -1,824 +1,31 @@ -import java.io.BufferedReader; -import java.io.File; -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.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dq") +@ObfuscatedName("dk") public abstract class class128 extends Node { - @ObfuscatedName("t") - @Export("ByteArrayPool_altSizeArrayCounts") - static int[] ByteArrayPool_altSizeArrayCounts; - @ObfuscatedName("a") - @Export("formattedOperatingSystemName") - public static String formattedOperatingSystemName; + @ObfuscatedName("lt") + @ObfuscatedGetter( + intValue = -1795055701 + ) + @Export("Client_plane") + static int Client_plane; class128() { - } + } // L: 68 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-413979452" + descriptor = "(Lpx;I)V", + garbageValue = "-611912046" ) - abstract void vmethod3168(Buffer var1); + abstract void vmethod3040(Buffer var1); - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lex;S)V", - garbageValue = "-10316" + descriptor = "(Lek;B)V", + garbageValue = "-73" ) - abstract void vmethod3162(ClanSettings var1); - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljava/io/File;B)V", - garbageValue = "63" - ) - static void method2856(File var0) { - class120.FileSystem_cacheDir = var0; // L: 16 - if (!class120.FileSystem_cacheDir.exists()) { // L: 17 - throw new RuntimeException(""); - } else { - FileSystem.FileSystem_hasPermissions = true; // L: 18 - } - } // L: 19 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;I)Ljava/lang/String;", - garbageValue = "-1938819519" - ) - static String method2853(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("p") - @ObfuscatedSignature( - descriptor = "(Lmd;Lmd;Lmd;I)V", - garbageValue = "-461855642" - ) - @Export("drawTitle") - static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (InvDefinition.canvasWidth - 765) / 2; // L: 1185 - Login.loginBoxX = Login.xPadding + 202; // L: 1186 - HealthBarDefinition.loginBoxCenter = Login.loginBoxX + 180; // L: 1187 - byte var3; - int var4; - int var11; - int var12; - int var25; - int var26; - int var28; - int var29; - int var34; - int var40; - if (Login.worldSelectOpen) { // L: 1188 - int var46; - if (class393.worldSelectBackSprites == null) { // L: 1190 - Archive var41 = class145.archive8; // L: 1192 - var40 = var41.getGroupId("sl_back"); // L: 1194 - var46 = var41.getFileId(var40, ""); // L: 1195 - SpritePixels[] var47 = class429.method7568(var41, var40, var46); // L: 1196 - class393.worldSelectBackSprites = var47; // L: 1198 - } - - if (class400.worldSelectFlagSprites == null) { // L: 1200 - class400.worldSelectFlagSprites = class93.method2386(class145.archive8, "sl_flags", ""); - } - - if (class126.worldSelectArrows == null) { // L: 1201 - class126.worldSelectArrows = class93.method2386(class145.archive8, "sl_arrows", ""); - } - - if (TileItem.worldSelectStars == null) { // L: 1202 - TileItem.worldSelectStars = class93.method2386(class145.archive8, "sl_stars", ""); - } - - if (class54.worldSelectLeftSprite == null) { // L: 1203 - class54.worldSelectLeftSprite = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(class145.archive8, "leftarrow", ""); - } - - if (AttackOption.worldSelectRightSprite == null) { // L: 1204 - AttackOption.worldSelectRightSprite = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(class145.archive8, "rightarrow", ""); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 1205 - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 1206 - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 1207 - var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 1208 - if (TileItem.worldSelectStars != null) { // L: 1209 - TileItem.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 1210 - var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 1211 - TileItem.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 1212 - var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 1213 - } - - if (class126.worldSelectArrows != null) { // L: 1215 - var34 = Login.xPadding + 280; // L: 1216 - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 1217 - class126.worldSelectArrows[2].drawAt(var34, 4); - } else { - class126.worldSelectArrows[0].drawAt(var34, 4); // L: 1218 - } - - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 1219 - class126.worldSelectArrows[3].drawAt(var34 + 15, 4); - } else { - class126.worldSelectArrows[1].drawAt(var34 + 15, 4); // L: 1220 - } - - var0.draw("World", var34 + 32, 17, 16777215, -1); // L: 1221 - var4 = Login.xPadding + 390; // L: 1222 - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 1223 - class126.worldSelectArrows[2].drawAt(var4, 4); - } else { - class126.worldSelectArrows[0].drawAt(var4, 4); // L: 1224 - } - - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 1225 - class126.worldSelectArrows[3].drawAt(var4 + 15, 4); - } else { - class126.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 1226 - } - - var0.draw("Players", var4 + 32, 17, 16777215, -1); // L: 1227 - var40 = Login.xPadding + 500; // L: 1228 - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 1229 - class126.worldSelectArrows[2].drawAt(var40, 4); - } else { - class126.worldSelectArrows[0].drawAt(var40, 4); // L: 1230 - } - - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 1231 - class126.worldSelectArrows[3].drawAt(var40 + 15, 4); - } else { - class126.worldSelectArrows[1].drawAt(var40 + 15, 4); // L: 1232 - } - - var0.draw("Location", var40 + 32, 17, 16777215, -1); // L: 1233 - var46 = Login.xPadding + 610; // L: 1234 - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 1235 - class126.worldSelectArrows[2].drawAt(var46, 4); - } else { - class126.worldSelectArrows[0].drawAt(var46, 4); // L: 1236 - } - - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 1237 - class126.worldSelectArrows[3].drawAt(var46 + 15, 4); - } else { - class126.worldSelectArrows[1].drawAt(var46 + 15, 4); // L: 1238 - } - - var0.draw("Type", var46 + 32, 17, 16777215, -1); // L: 1239 - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 1241 - var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 1242 - Login.hoveredWorldIndex = -1; // L: 1243 - if (class393.worldSelectBackSprites != null) { // L: 1244 - var3 = 88; // L: 1245 - byte var38 = 19; // L: 1246 - var40 = 765 / (var3 + 1) - 1; // L: 1247 - var46 = 480 / (var38 + 1); // L: 1248 - - do { - var25 = var46; // L: 1250 - var26 = var40; // L: 1251 - if (var46 * (var40 - 1) >= World.World_count) { // L: 1252 - --var40; - } - - if (var40 * (var46 - 1) >= World.World_count) { // L: 1253 - --var46; - } - - if (var40 * (var46 - 1) >= World.World_count) { // L: 1254 - --var46; - } - } while(var25 != var46 || var26 != var40); // L: 1255 - - var25 = (765 - var3 * var40) / (var40 + 1); // L: 1257 - if (var25 > 5) { // L: 1258 - var25 = 5; - } - - var26 = (480 - var46 * var38) / (var46 + 1); // L: 1259 - if (var26 > 5) { // L: 1260 - var26 = 5; - } - - var28 = (765 - var3 * var40 - var25 * (var40 - 1)) / 2; // L: 1261 - var29 = (480 - var46 * var38 - var26 * (var46 - 1)) / 2; // L: 1262 - var11 = (var46 + World.World_count - 1) / var46; // L: 1263 - Login.worldSelectPagesCount = var11 - var40; // L: 1264 - if (class54.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1265 - class54.worldSelectLeftSprite.drawAt(8, class321.canvasHeight / 2 - class54.worldSelectLeftSprite.subHeight / 2); // L: 1266 - } - - if (AttackOption.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1268 - AttackOption.worldSelectRightSprite.drawAt(InvDefinition.canvasWidth - AttackOption.worldSelectRightSprite.subWidth - 8, class321.canvasHeight / 2 - AttackOption.worldSelectRightSprite.subHeight / 2); // L: 1269 - } - - var12 = var29 + 23; // L: 1271 - int var37 = var28 + Login.xPadding; // L: 1272 - int var14 = 0; // L: 1273 - boolean var15 = false; // L: 1274 - int var16 = Login.worldSelectPage; // L: 1275 - - int var17; - for (var17 = var46 * var16; var17 < World.World_count && var16 - Login.worldSelectPage < var40; ++var17) { // L: 1276 1277 - World var18 = DevicePcmPlayerProvider.World_worlds[var17]; // L: 1280 - boolean var19 = true; // L: 1281 - String var20 = Integer.toString(var18.population); // L: 1282 - if (var18.population == -1) { // L: 1283 - var20 = "OFF"; // L: 1284 - var19 = false; // L: 1285 - } else if (var18.population > 1980) { // L: 1287 - var20 = "FULL"; // L: 1288 - var19 = false; // L: 1289 - } - - int var22 = 0; // L: 1292 - byte var21; - if (var18.isBeta()) { // L: 1293 - if (var18.isMembersOnly()) { // L: 1294 - var21 = 7; - } else { - var21 = 6; // L: 1295 - } - } else if (var18.isDeadman()) { // L: 1297 - var22 = 16711680; // L: 1298 - if (var18.isMembersOnly()) { // L: 1299 - var21 = 5; - } else { - var21 = 4; // L: 1300 - } - } else if (var18.method1642()) { // L: 1302 - if (var18.isMembersOnly()) { // L: 1303 - var21 = 9; - } else { - var21 = 8; // L: 1304 - } - } else if (var18.isPvp()) { // L: 1306 - if (var18.isMembersOnly()) { // L: 1307 - var21 = 3; - } else { - var21 = 2; // L: 1308 - } - } else if (var18.isMembersOnly()) { // L: 1311 - var21 = 1; - } else { - var21 = 0; // L: 1312 - } - - if (MouseHandler.MouseHandler_x >= var37 && MouseHandler.MouseHandler_y >= var12 && MouseHandler.MouseHandler_x < var37 + var3 && MouseHandler.MouseHandler_y < var12 + var38 && var19) { // L: 1314 - Login.hoveredWorldIndex = var17; // L: 1315 - class393.worldSelectBackSprites[var21].drawTransOverlayAt(var37, var12, 128, 16777215); // L: 1316 - var15 = true; // L: 1317 - } else { - class393.worldSelectBackSprites[var21].drawAt(var37, var12); // L: 1319 - } - - if (class400.worldSelectFlagSprites != null) { // L: 1320 - class400.worldSelectFlagSprites[(var18.isMembersOnly() ? 8 : 0) + var18.location].drawAt(var37 + 29, var12); - } - - var0.drawCentered(Integer.toString(var18.id), var37 + 15, var38 / 2 + var12 + 5, var22, -1); // L: 1321 - var1.drawCentered(var20, var37 + 60, var38 / 2 + var12 + 5, 268435455, -1); // L: 1322 - var12 = var12 + var38 + var26; // L: 1323 - ++var14; // L: 1324 - if (var14 >= var46) { - var12 = var29 + 23; // L: 1325 - var37 = var37 + var3 + var25; // L: 1326 - var14 = 0; // L: 1327 - ++var16; // L: 1328 - } - } - - if (var15) { // L: 1331 - var17 = var1.stringWidth(DevicePcmPlayerProvider.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1332 - int var32 = var1.ascent + 8; // L: 1333 - int var39 = MouseHandler.MouseHandler_y + 25; // L: 1334 - if (var39 + var32 > 480) { // L: 1335 - var39 = MouseHandler.MouseHandler_y - 25 - var32; // L: 1336 - } - - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var39, var17, var32, 16777120); // L: 1338 - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var39, var17, var32, 0); // L: 1339 - var1.drawCentered(DevicePcmPlayerProvider.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var39 + var1.ascent + 4, 0, -1); // L: 1340 - } - } - - FontName.rasterProvider.drawFull(0, 0); // L: 1343 - } else { - class17.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1347 - ViewportMouse.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1348 - Decimator.logoSprite.drawAt(Login.xPadding + 382 - Decimator.logoSprite.subWidth / 2, 18); // L: 1349 - if (Client.gameState == 0 || Client.gameState == 5) { // L: 1350 - var3 = 20; // L: 1351 - var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 1352 - var4 = 253 - var3; // L: 1353 - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 1354 - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 1355 - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 1356 - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 1357 - var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 1358 - } - - String var6; - String var7; - String var8; - String var9; - short var33; - short var35; - if (Client.gameState == 20) { // L: 1360 - Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); // L: 1361 - var33 = 201; // L: 1362 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1363 - var34 = var33 + 15; // L: 1364 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); // L: 1365 - var34 += 15; // L: 1366 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); // L: 1367 - var34 += 15; // L: 1368 - var34 += 7; // L: 1369 - if (Login.loginIndex != 4 && Login.loginIndex != 10) { // L: 1370 - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var34, 16777215, 0); // L: 1371 - var35 = 200; // L: 1372 - if (class131.clientPreferences.method2317()) { // L: 1376 - var8 = Login.Login_username; // L: 1378 - var7 = class140.method3040('*', var8.length()); // L: 1380 - var6 = var7; // L: 1382 - } else { - var6 = Login.Login_username; // L: 1384 - } - - for (var6 = var6; var0.stringWidth(var6) > var35; var6 = var6.substring(0, var6.length() - 1)) { // L: 1387 1388 1389 - } - - var0.draw(AbstractFont.escapeBrackets(var6), Login.loginBoxX + 180 - 70, var34, 16777215, 0); // L: 1391 - var34 += 15; // L: 1392 - var8 = Login.Login_password; // L: 1394 - var7 = class140.method3040('*', var8.length()); // L: 1396 - - for (var9 = var7; var0.stringWidth(var9) > var35; var9 = var9.substring(1)) { // L: 1398 1399 1400 - } - - var0.draw("Password: " + var9, Login.loginBoxX + 180 - 108, var34, 16777215, 0); // L: 1402 - var34 += 15; // L: 1403 - } - } - - if (Client.gameState == 10 || Client.gameState == 11 || Client.gameState == 50) { // L: 1406 - Login.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 1407 - short var23; - if (Login.loginIndex == 0) { // L: 1408 - var33 = 251; // L: 1409 - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1410 - var34 = var33 + 30; // L: 1411 - var4 = Login.loginBoxX + 180 - 80; // L: 1412 - var23 = 291; // L: 1413 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1414 - var0.drawLines("New User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1415 - var4 = Login.loginBoxX + 180 + 80; // L: 1416 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1417 - var0.drawLines("Existing User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1418 - } else if (Login.loginIndex == 1) { // L: 1420 - var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 1421 - var33 = 236; // L: 1422 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1423 - var34 = var33 + 15; // L: 1424 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16777215, 0); // L: 1425 - var34 += 15; // L: 1426 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16777215, 0); // L: 1427 - var34 += 15; // L: 1428 - var4 = Login.loginBoxX + 180 - 80; // L: 1429 - var23 = 321; // L: 1430 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1431 - var0.drawCentered("Continue", var4, var23 + 5, 16777215, 0); // L: 1432 - var4 = Login.loginBoxX + 180 + 80; // L: 1433 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1434 - var0.drawCentered("Cancel", var4, var23 + 5, 16777215, 0); // L: 1435 - } else if (Login.loginIndex == 2) { // L: 1437 - var33 = 201; // L: 1438 - var0.drawCentered(Login.Login_response1, HealthBarDefinition.loginBoxCenter, var33, 16776960, 0); // L: 1439 - var34 = var33 + 15; // L: 1440 - var0.drawCentered(Login.Login_response2, HealthBarDefinition.loginBoxCenter, var34, 16776960, 0); // L: 1441 - var34 += 15; // L: 1442 - var0.drawCentered(Login.Login_response3, HealthBarDefinition.loginBoxCenter, var34, 16776960, 0); // L: 1443 - var34 += 15; // L: 1444 - var34 += 7; // L: 1445 - var0.draw("Login: ", HealthBarDefinition.loginBoxCenter - 110, var34, 16777215, 0); // L: 1446 - var35 = 200; // L: 1447 - if (class131.clientPreferences.method2317()) { // L: 1451 - var8 = Login.Login_username; // L: 1453 - var7 = class140.method3040('*', var8.length()); // L: 1455 - var6 = var7; // L: 1457 - } else { - var6 = Login.Login_username; // L: 1459 - } - - for (var6 = var6; var0.stringWidth(var6) > var35; var6 = var6.substring(1)) { // L: 1462 1463 1464 - } - - var0.draw(AbstractFont.escapeBrackets(var6) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? UserComparator9.colorStartTag(16776960) + "|" : ""), HealthBarDefinition.loginBoxCenter - 70, var34, 16777215, 0); // L: 1466 - var34 += 15; // L: 1467 - var8 = Login.Login_password; // L: 1469 - var7 = class140.method3040('*', var8.length()); // L: 1471 - - for (var9 = var7; var0.stringWidth(var9) > var35; var9 = var9.substring(1)) { // L: 1473 1474 1475 - } - - var0.draw("Password: " + var9 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? UserComparator9.colorStartTag(16776960) + "|" : ""), HealthBarDefinition.loginBoxCenter - 108, var34, 16777215, 0); // L: 1477 - var34 += 15; // L: 1478 - var33 = 277; // L: 1479 - var29 = HealthBarDefinition.loginBoxCenter + -117; // L: 1480 - IndexedSprite var30 = class9.method73(Client.Login_isUsernameRemembered, Login.field909); // L: 1481 - var30.drawAt(var29, var33); // L: 1482 - var29 = var29 + var30.subWidth + 5; // L: 1483 - var1.draw("Remember username", var29, var33 + 13, 16776960, 0); // L: 1484 - var29 = HealthBarDefinition.loginBoxCenter + 24; // L: 1485 - var30 = class9.method73(class131.clientPreferences.method2317(), Login.field906); // L: 1486 - var30.drawAt(var29, var33); // L: 1487 - var29 = var29 + var30.subWidth + 5; // L: 1488 - var1.draw("Hide username", var29, var33 + 13, 16776960, 0); // L: 1489 - var34 = var33 + 15; // L: 1490 - var12 = HealthBarDefinition.loginBoxCenter - 80; // L: 1491 - short var13 = 321; // L: 1492 - Login.titlebuttonSprite.drawAt(var12 - 73, var13 - 20); // L: 1493 - var0.drawCentered("Login", var12, var13 + 5, 16777215, 0); // L: 1494 - var12 = HealthBarDefinition.loginBoxCenter + 80; // L: 1495 - Login.titlebuttonSprite.drawAt(var12 - 73, var13 - 20); // L: 1496 - var0.drawCentered("Cancel", var12, var13 + 5, 16777215, 0); // L: 1497 - var33 = 357; // L: 1498 - switch(Login.field895) { // L: 1499 - case 2: - class137.field1573 = "Having trouble logging in?"; // L: 1501 - break; - default: - class137.field1573 = "Can't login? Click here."; // L: 1504 - } - - class113.field1378 = new Bounds(HealthBarDefinition.loginBoxCenter, var33, var1.stringWidth(class137.field1573), 11); // L: 1507 - class260.field2892 = new Bounds(HealthBarDefinition.loginBoxCenter, var33, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1508 - var1.drawCentered(class137.field1573, HealthBarDefinition.loginBoxCenter, var33, 16777215, 0); // L: 1509 - } else if (Login.loginIndex == 3) { // L: 1511 - var33 = 201; // L: 1512 - var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1513 - var34 = var33 + 20; // L: 1514 - var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var34, 16776960, 0); // L: 1515 - var34 += 15; // L: 1516 - var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var34, 16776960, 0); // L: 1517 - var34 += 15; // L: 1518 - var4 = Login.loginBoxX + 180; // L: 1519 - var23 = 276; // L: 1520 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1521 - var2.drawCentered("Try again", var4, var23 + 5, 16777215, 0); // L: 1522 - var4 = Login.loginBoxX + 180; // L: 1523 - var23 = 326; // L: 1524 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1525 - var2.drawCentered("Forgotten password?", var4, var23 + 5, 16777215, 0); // L: 1526 - } else { - String var5; - if (Login.loginIndex == 4) { // L: 1528 - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1529 - var33 = 236; // L: 1530 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1531 - var34 = var33 + 15; // L: 1532 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16777215, 0); // L: 1533 - var34 += 15; // L: 1534 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16777215, 0); // L: 1535 - var34 += 15; // L: 1536 - var5 = "PIN: "; // L: 1538 - var7 = HealthBar.otp; // L: 1540 - var6 = class140.method3040('*', var7.length()); // L: 1542 - var0.draw(var5 + var6 + (Client.cycle % 40 < 20 ? UserComparator9.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var34, 16777215, 0); // L: 1544 - var34 -= 8; // L: 1545 - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var34, 16776960, 0); // L: 1546 - var34 += 15; // L: 1547 - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var34, 16776960, 0); // L: 1548 - var26 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1549 - var28 = var34 - var0.ascent; // L: 1550 - IndexedSprite var10; - if (Login.field907) { // L: 1552 - var10 = class54.options_buttons_2Sprite; // L: 1553 - } else { - var10 = WorldMapSection2.options_buttons_0Sprite; // L: 1556 - } - - var10.drawAt(var26, var28); // L: 1558 - var34 += 15; // L: 1559 - var11 = Login.loginBoxX + 180 - 80; // L: 1560 - short var36 = 321; // L: 1561 - Login.titlebuttonSprite.drawAt(var11 - 73, var36 - 20); // L: 1562 - var0.drawCentered("Continue", var11, var36 + 5, 16777215, 0); // L: 1563 - var11 = Login.loginBoxX + 180 + 80; // L: 1564 - Login.titlebuttonSprite.drawAt(var11 - 73, var36 - 20); // L: 1565 - var0.drawCentered("Cancel", var11, var36 + 5, 16777215, 0); // L: 1566 - var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var36 + 36, 255, 0); // L: 1567 - } else { - short var42; - if (Login.loginIndex == 5) { // L: 1569 - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1570 - var33 = 221; // L: 1571 - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1572 - var34 = var33 + 15; // L: 1573 - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); // L: 1574 - var34 += 15; // L: 1575 - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); // L: 1576 - var34 += 15; // L: 1577 - var34 += 14; // L: 1578 - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var34, 16777215, 0); // L: 1579 - var35 = 174; // L: 1580 - if (class131.clientPreferences.method2317()) { // L: 1584 - var8 = Login.Login_username; // L: 1586 - var7 = class140.method3040('*', var8.length()); // L: 1588 - var6 = var7; // L: 1590 - } else { - var6 = Login.Login_username; // L: 1592 - } - - for (var6 = var6; var0.stringWidth(var6) > var35; var6 = var6.substring(1)) { // L: 1595 1596 1597 - } - - var0.draw(AbstractFont.escapeBrackets(var6) + (Client.cycle % 40 < 20 ? UserComparator9.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var34, 16777215, 0); // L: 1599 - var34 += 15; // L: 1600 - var25 = Login.loginBoxX + 180 - 80; // L: 1601 - var42 = 321; // L: 1602 - Login.titlebuttonSprite.drawAt(var25 - 73, var42 - 20); // L: 1603 - var0.drawCentered("Recover", var25, var42 + 5, 16777215, 0); // L: 1604 - var25 = Login.loginBoxX + 180 + 80; // L: 1605 - Login.titlebuttonSprite.drawAt(var25 - 73, var42 - 20); // L: 1606 - var0.drawCentered("Back", var25, var42 + 5, 16777215, 0); // L: 1607 - var42 = 356; // L: 1608 - var1.drawCentered("Still having trouble logging in?", HealthBarDefinition.loginBoxCenter, var42, 268435455, 0); // L: 1609 - } else if (Login.loginIndex == 6) { // L: 1611 - var33 = 201; // L: 1612 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1613 - var34 = var33 + 15; // L: 1614 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); // L: 1615 - var34 += 15; // L: 1616 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); // L: 1617 - var34 += 15; // L: 1618 - var4 = Login.loginBoxX + 180; // L: 1619 - var23 = 321; // L: 1620 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1621 - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1622 - } else if (Login.loginIndex == 7) { // L: 1624 - if (Client.field504 && !Client.onMobile) { // L: 1625 - var33 = 201; // L: 1626 - var0.drawCentered(Login.Login_response1, HealthBarDefinition.loginBoxCenter, var33, 16776960, 0); // L: 1627 - var34 = var33 + 15; // L: 1628 - var0.drawCentered(Login.Login_response2, HealthBarDefinition.loginBoxCenter, var34, 16776960, 0); // L: 1629 - var34 += 15; // L: 1630 - var0.drawCentered(Login.Login_response3, HealthBarDefinition.loginBoxCenter, var34, 16776960, 0); // L: 1631 - var4 = HealthBarDefinition.loginBoxCenter - 150; // L: 1632 - var34 += 10; // L: 1633 - - for (var40 = 0; var40 < 8; ++var40) { // L: 1634 - Login.titlebuttonSprite.method8054(var4, var34, 30, 40); // L: 1635 - boolean var27 = var40 == Login.field903 & Client.cycle % 40 < 20; // L: 1636 - var0.draw((Login.field904[var40] == null ? "" : Login.field904[var40]) + (var27 ? UserComparator9.colorStartTag(16776960) + "|" : ""), var4 + 10, var34 + 27, 16777215, 0); // L: 1637 - if (var40 != 1 && var40 != 3) { // L: 1638 - var4 += 35; // L: 1643 - } else { - var4 += 50; // L: 1639 - var0.draw(AbstractFont.escapeBrackets("/"), var4 - 13, var34 + 27, 16777215, 0); // L: 1640 - } - } - - var40 = HealthBarDefinition.loginBoxCenter - 80; // L: 1646 - short var44 = 321; // L: 1647 - Login.titlebuttonSprite.drawAt(var40 - 73, var44 - 20); // L: 1648 - var0.drawCentered("Submit", var40, var44 + 5, 16777215, 0); // L: 1649 - var40 = HealthBarDefinition.loginBoxCenter + 80; // L: 1650 - Login.titlebuttonSprite.drawAt(var40 - 73, var44 - 20); // L: 1651 - var0.drawCentered("Cancel", var40, var44 + 5, 16777215, 0); // L: 1652 - } else { - var33 = 216; // L: 1655 - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1656 - var34 = var33 + 15; // L: 1657 - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var34, 16776960, 0); // L: 1658 - var34 += 15; // L: 1659 - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var34, 16776960, 0); // L: 1660 - var34 += 15; // L: 1661 - var4 = Login.loginBoxX + 180 - 80; // L: 1662 - var23 = 321; // L: 1663 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1664 - var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0); // L: 1665 - var4 = Login.loginBoxX + 180 + 80; // L: 1666 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1667 - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1668 - } - } else if (Login.loginIndex == 8) { // L: 1671 - var33 = 216; // L: 1672 - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1673 - var34 = var33 + 15; // L: 1674 - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var34, 16776960, 0); // L: 1675 - var34 += 15; // L: 1676 - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var34, 16776960, 0); // L: 1677 - var34 += 15; // L: 1678 - var4 = Login.loginBoxX + 180 - 80; // L: 1679 - var23 = 321; // L: 1680 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1681 - var0.drawCentered("Privacy Policy", var4, var23 + 5, 16777215, 0); // L: 1682 - var4 = Login.loginBoxX + 180 + 80; // L: 1683 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1684 - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1685 - } else if (Login.loginIndex == 9) { // L: 1687 - var33 = 221; // L: 1688 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1689 - var34 = var33 + 25; // L: 1690 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16776960, 0); // L: 1691 - var34 += 25; // L: 1692 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16776960, 0); // L: 1693 - var4 = Login.loginBoxX + 180; // L: 1694 - var23 = 311; // L: 1695 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1696 - var0.drawCentered("Try again", var4, var23 + 5, 16777215, 0); // L: 1697 - } else if (Login.loginIndex == 10) { // L: 1699 - var34 = Login.loginBoxX + 180; // L: 1700 - var35 = 209; // L: 1701 - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var35, 16776960, 0); // L: 1702 - var4 = var35 + 20; // L: 1703 - class296.field3496.drawAt(var34 - 109, var4); // L: 1704 - class259.field2887.drawAt(var34 - 48, var4 + 18); // L: 1705 - } else if (Login.loginIndex == 12) { // L: 1707 - var34 = HealthBarDefinition.loginBoxCenter; // L: 1708 - var35 = 216; // L: 1709 - var2.drawCentered("Before using this app, please read and accept our", var34, var35, 16777215, 0); // L: 1710 - var4 = var35 + 17; // L: 1711 - var2.drawCentered("terms of use, privacy policy, and end user licence", var34, var4, 16777215, 0); // L: 1712 - var4 += 17; // L: 1713 - var2.drawCentered("agreement (EULA).", var34, var4, 16777215, 0); // L: 1714 - var4 += 17; // L: 1715 - var2.drawCentered("By accepting, you agree to these documents.", var34, var4, 16777215, 0); // L: 1716 - var34 = HealthBarDefinition.loginBoxCenter - 80; // L: 1717 - var35 = 311; // L: 1718 - Login.titlebuttonSprite.drawAt(var34 - 73, var35 - 20); // L: 1719 - var0.drawCentered("Accept", var34, var35 + 5, 16777215, 0); // L: 1720 - var34 = HealthBarDefinition.loginBoxCenter + 80; // L: 1721 - Login.titlebuttonSprite.drawAt(var34 - 73, var35 - 20); // L: 1722 - var0.drawCentered("Decline", var34, var35 + 5, 16777215, 0); // L: 1723 - } else if (Login.loginIndex == 13) { // L: 1725 - var33 = 231; // L: 1726 - var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var33, 16777215, 0); // L: 1727 - var34 = var33 + 20; // L: 1728 - var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var34, 16777215, 0); // L: 1729 - var4 = Login.loginBoxX + 180; // L: 1730 - var33 = 311; // L: 1731 - Login.titlebuttonSprite.drawAt(var4 - 73, var33 - 20); // L: 1732 - var0.drawCentered("Back", var4, var33 + 5, 16777215, 0); // L: 1733 - } else if (Login.loginIndex == 14) { // L: 1735 - var33 = 201; // L: 1736 - String var24 = ""; // L: 1737 - var5 = ""; // L: 1738 - var6 = ""; // L: 1739 - switch(Login.field901) { // L: 1740 - case 0: - var24 = "Your account has been disabled."; // L: 1755 - var5 = Strings.field3645; // L: 1756 - var6 = ""; // L: 1757 - break; - case 1: - var24 = "Account locked as we suspect it has been stolen."; // L: 1748 - var5 = Strings.field3684; // L: 1749 - var6 = ""; // L: 1750 - break; // L: 1751 - default: - Messages.Login_promptCredentials(false); // L: 1743 - } - - var0.drawCentered(var24, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1761 - var34 = var33 + 15; // L: 1762 - var2.drawCentered(var5, Login.loginBoxX + 180, var34, 16776960, 0); // L: 1763 - var34 += 15; // L: 1764 - var2.drawCentered(var6, Login.loginBoxX + 180, var34, 16776960, 0); // L: 1765 - var34 += 15; // L: 1766 - var25 = Login.loginBoxX + 180; // L: 1767 - var42 = 276; // L: 1768 - Login.titlebuttonSprite.drawAt(var25 - 73, var42 - 20); // L: 1769 - var0.drawCentered("Support Page", var25, var42 + 5, 16777215, 0); // L: 1770 - var25 = Login.loginBoxX + 180; // L: 1771 - var42 = 326; // L: 1772 - Login.titlebuttonSprite.drawAt(var25 - 73, var42 - 20); // L: 1773 - var0.drawCentered("Back", var25, var42 + 5, 16777215, 0); // L: 1774 - } else if (Login.loginIndex == 24) { // L: 1776 - var33 = 221; // L: 1777 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1778 - var34 = var33 + 15; // L: 1779 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var34, 16777215, 0); // L: 1780 - var34 += 15; // L: 1781 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var34, 16777215, 0); // L: 1782 - var34 += 15; // L: 1783 - var4 = Login.loginBoxX + 180; // L: 1784 - var23 = 301; // L: 1785 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1786 - var0.drawCentered("Ok", var4, var23 + 5, 16777215, 0); // L: 1787 - } - } - } - } - - if (Client.gameState >= 10) { // L: 1790 - int[] var31 = new int[4]; // L: 1791 - Rasterizer2D.Rasterizer2D_getClipArray(var31); // L: 1792 - Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, class321.canvasHeight); // L: 1793 - class341.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1794 - class341.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1795 - Rasterizer2D.Rasterizer2D_setClipArray(var31); // L: 1796 - } - - class92.title_muteSprite[class131.clientPreferences.method2279() ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1798 - if (Client.gameState > 5 && Language.Language_EN == Skills.clientLanguage) { // L: 1799 - if (class135.field1569 != null) { // L: 1800 - var34 = Login.xPadding + 5; // L: 1801 - var35 = 463; // L: 1802 - byte var43 = 100; // L: 1803 - byte var45 = 35; // L: 1804 - class135.field1569.drawAt(var34, var35); // L: 1805 - var0.drawCentered("World" + " " + Client.worldId, var43 / 2 + var34, var45 / 2 + var35 - 2, 16777215, 0); // L: 1806 - if (class293.World_request != null) { // L: 1807 - var1.drawCentered("Loading...", var43 / 2 + var34, var45 / 2 + var35 + 12, 16777215, 0); - } else { - var1.drawCentered("Click to switch", var43 / 2 + var34, var45 / 2 + var35 + 12, 16777215, 0); // L: 1808 - } - } else { - class135.field1569 = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(class145.archive8, "sl_button", ""); // L: 1811 - } - } - - } - } // L: 1345 1814 - - @ObfuscatedName("he") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1863745488" - ) - static final void method2854() { - for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 4830 4831 4838 - if (var0.plane == class18.Client_plane && !var0.isFinished) { // L: 4832 - if (Client.cycle >= var0.cycleStart) { // L: 4833 - var0.advance(Client.field556); // L: 4834 - if (var0.isFinished) { // L: 4835 - var0.remove(); - } else { - ArchiveLoader.scene.drawEntity(var0.plane, var0.x, var0.y, var0.z, 60, var0, 0, -1L, false); // L: 4836 - } - } - } else { - var0.remove(); - } - } - - } // L: 4840 + abstract void vmethod3041(ClanSettings var1); } diff --git a/runescape-client/src/main/java/class129.java b/runescape-client/src/main/java/class129.java index 2dda0a604d..103cc11299 100644 --- a/runescape-client/src/main/java/class129.java +++ b/runescape-client/src/main/java/class129.java @@ -1,100 +1,118 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dy") +@ObfuscatedName("du") public class class129 extends class128 { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1742059043 + intValue = -847833425 ) - int field1526; - @ObfuscatedName("c") - boolean field1522; + int field1579; + @ObfuscatedName("q") + boolean field1577; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Les;" + descriptor = "Leh;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Les;)V" + descriptor = "(Leh;)V" ) class129(class131 var1) { this.this$0 = var1; - this.field1526 = -1; // L: 178 + this.field1579 = -1; // L: 178 } // L: 181 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-413979452" + descriptor = "(Lpx;I)V", + garbageValue = "-611912046" ) - void vmethod3168(Buffer var1) { - this.field1526 = var1.readUnsignedShort(); // L: 184 - this.field1522 = var1.readUnsignedByte() == 1; // L: 185 + void vmethod3040(Buffer var1) { + this.field1579 = var1.readUnsignedShort(); // L: 184 + this.field1577 = var1.readUnsignedByte() == 1; // L: 185 } // L: 186 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lex;S)V", - garbageValue = "-10316" + descriptor = "(Lek;B)V", + garbageValue = "-73" ) - void vmethod3162(ClanSettings var1) { - var1.method3027(this.field1526, this.field1522); // L: 189 + void vmethod3041(ClanSettings var1) { + var1.method2895(this.field1579, this.field1577); // L: 189 } // L: 190 - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(CI)C", - garbageValue = "-1943199368" - ) - static char method2863(char var0) { - return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; // L: 79 80 + @ObfuscatedName("v") + static boolean method2816(long var0) { + return (int)(var0 >>> 16 & 1L) == 1; // L: 80 } - @ObfuscatedName("jj") + @ObfuscatedName("fr") @ObfuscatedSignature( - descriptor = "(Lky;IIIIIIB)V", - garbageValue = "-9" + descriptor = "(B)V", + garbageValue = "49" ) - static final void method2861(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Client.field570) { // L: 10855 - Client.alternativeScrollbarWidth = 32; + static final void method2812() { + if (Client.logoutTimer > 0) { // L: 3053 + SecureRandomCallable.logOut(); // L: 3054 } else { - Client.alternativeScrollbarWidth = 0; // L: 10856 + Client.timer.method6375(); // L: 3057 + PendingSpawn.updateGameState(40); // L: 3058 + DirectByteArrayCopier.field3337 = Client.packetWriter.getSocket(); // L: 3059 + Client.packetWriter.removeSocket(); // L: 3060 } + } // L: 3055 3061 - Client.field570 = false; // L: 10857 - int var7; - if (MouseHandler.MouseHandler_currentButton == 1 || !GameBuild.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 10858 - if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 10859 - var0.scrollY -= 4; // L: 10860 - class346.invalidateWidget(var0); // L: 10861 - } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 10863 - var0.scrollY += 4; // L: 10864 - class346.invalidateWidget(var0); // L: 10865 - } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 10867 - var7 = var3 * (var3 - 32) / var4; // L: 10868 - if (var7 < 8) { // L: 10869 - var7 = 8; + @ObfuscatedName("gk") + @ObfuscatedSignature( + descriptor = "(Lki;III)V", + garbageValue = "1747874161" + ) + @Export("checkIfMinimapClicked") + static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { + if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 3854 + if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !Login.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 3855 + SpriteMask var3 = var0.getSpriteMask(true); // L: 3856 + if (var3 == null) { // L: 3857 + return; } - int var8 = var6 - var2 - 16 - var7 / 2; // L: 10870 - int var9 = var3 - 32 - var7; // L: 10871 - var0.scrollY = var8 * (var4 - var3) / var9; // L: 10872 - class346.invalidateWidget(var0); // L: 10873 - Client.field570 = true; // L: 10874 + int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 3858 + int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 3859 + if (var3.contains(var4, var5)) { // L: 3860 + var4 -= var3.width / 2; // L: 3861 + var5 -= var3.height / 2; // L: 3862 + int var6 = Client.camAngleY & 2047; // L: 3863 + int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 3864 + int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 3865 + int var9 = var8 * var4 + var5 * var7 >> 11; // L: 3866 + int var10 = var5 * var8 - var7 * var4 >> 11; // L: 3867 + int var11 = var9 + ModelData0.localPlayer.x >> 7; // L: 3868 + int var12 = ModelData0.localPlayer.y - var10 >> 7; // L: 3869 + PacketBufferNode var13 = WallDecoration.getPacketBufferNode(ClientPacket.field3023, Client.packetWriter.isaacCipher); // L: 3871 + var13.packetBuffer.writeByte(18); // L: 3872 + var13.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3873 + var13.packetBuffer.method7641(var12 + GrandExchangeOfferOwnWorldComparator.baseY); // L: 3874 + var13.packetBuffer.writeShort(var11 + SecureRandomCallable.baseX); // L: 3875 + var13.packetBuffer.writeByte(var4); // L: 3876 + var13.packetBuffer.writeByte(var5); // L: 3877 + var13.packetBuffer.writeShort(Client.camAngleY); // L: 3878 + var13.packetBuffer.writeByte(57); // L: 3879 + var13.packetBuffer.writeByte(0); // L: 3880 + var13.packetBuffer.writeByte(0); // L: 3881 + var13.packetBuffer.writeByte(89); // L: 3882 + var13.packetBuffer.writeShort(ModelData0.localPlayer.x); // L: 3883 + var13.packetBuffer.writeShort(ModelData0.localPlayer.y); // L: 3884 + var13.packetBuffer.writeByte(63); // L: 3885 + Client.packetWriter.addNode(var13); // L: 3886 + Client.destinationX = var11; // L: 3887 + Client.destinationY = var12; // L: 3888 + } } - } - if (Client.mouseWheelRotation != 0) { // L: 10877 - var7 = var0.width; // L: 10878 - if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 10879 - var0.scrollY += Client.mouseWheelRotation * 45; // L: 10880 - class346.invalidateWidget(var0); // L: 10881 - } } - - } // L: 10884 + } // L: 3891 } diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index f12f81f52f..2b47484df4 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -2,20 +2,13 @@ import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.Hashtable; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import org.bouncycastle.crypto.tls.DefaultTlsClient; import org.bouncycastle.crypto.tls.TlsAuthentication; -@ObfuscatedName("k") +@ObfuscatedName("b") class class13 extends DefaultTlsClient { - @ObfuscatedName("gk") - @ObfuscatedSignature( - descriptor = "Lmd;" - ) - @Export("fontPlain12") - static Font fontPlain12; // $FF: synthetic field @ObfuscatedSignature( descriptor = "Lw;" @@ -26,95 +19,28 @@ class class13 extends DefaultTlsClient { descriptor = "(Lw;)V" ) class13(class12 var1) { - this.this$1 = var1; // L: 227 + this.this$1 = var1; // L: 282 } public Hashtable getClientExtensions() throws IOException { - Hashtable var1 = super.getClientExtensions(); // L: 229 - if (var1 == null) { // L: 230 - var1 = new Hashtable(); // L: 231 + Hashtable var1 = super.getClientExtensions(); // L: 285 + if (var1 == null) { // L: 286 + var1 = new Hashtable(); // L: 287 } - byte[] var2 = this.this$1.val$host.getBytes(); // L: 233 - ByteArrayOutputStream var3 = new ByteArrayOutputStream(); // L: 234 - DataOutputStream var4 = new DataOutputStream(var3); // L: 235 - var4.writeShort(var2.length + 3); // L: 236 - var4.writeByte(0); // L: 237 - var4.writeShort(var2.length); // L: 238 - var4.write(var2); // L: 239 - var4.close(); // L: 240 - var1.put(0, var3.toByteArray()); // L: 241 - return var1; // L: 242 + byte[] var2 = this.this$1.val$host.getBytes(); // L: 289 + ByteArrayOutputStream var3 = new ByteArrayOutputStream(); // L: 290 + DataOutputStream var4 = new DataOutputStream(var3); // L: 291 + var4.writeShort(var2.length + 3); // L: 292 + var4.writeByte(0); // L: 293 + var4.writeShort(var2.length); // L: 294 + var4.write(var2); // L: 295 + var4.close(); // L: 296 + var1.put(0, var3.toByteArray()); // L: 297 + return var1; // L: 298 } public TlsAuthentication getAuthentication() throws IOException { - return new class11(this); // L: 246 - } - - @ObfuscatedName("gs") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-547008186" - ) - static final void method163(int var0, int var1, int var2) { - if (WorldMapLabelSize.cameraX < var0) { // L: 3729 - WorldMapLabelSize.cameraX = (var0 - WorldMapLabelSize.cameraX) * ArchiveDisk.field4309 / 1000 + WorldMapLabelSize.cameraX + Script.field955; // L: 3730 - if (WorldMapLabelSize.cameraX > var0) { // L: 3731 - WorldMapLabelSize.cameraX = var0; - } - } - - if (WorldMapLabelSize.cameraX > var0) { // L: 3733 - WorldMapLabelSize.cameraX -= (WorldMapLabelSize.cameraX - var0) * ArchiveDisk.field4309 / 1000 + Script.field955; // L: 3734 - if (WorldMapLabelSize.cameraX < var0) { // L: 3735 - WorldMapLabelSize.cameraX = var0; - } - } - - if (ItemContainer.cameraY < var1) { // L: 3737 - ItemContainer.cameraY = (var1 - ItemContainer.cameraY) * ArchiveDisk.field4309 / 1000 + ItemContainer.cameraY + Script.field955; // L: 3738 - if (ItemContainer.cameraY > var1) { // L: 3739 - ItemContainer.cameraY = var1; - } - } - - if (ItemContainer.cameraY > var1) { // L: 3741 - ItemContainer.cameraY -= (ItemContainer.cameraY - var1) * ArchiveDisk.field4309 / 1000 + Script.field955; // L: 3742 - if (ItemContainer.cameraY < var1) { // L: 3743 - ItemContainer.cameraY = var1; - } - } - - if (class154.cameraZ < var2) { // L: 3745 - class154.cameraZ = (var2 - class154.cameraZ) * ArchiveDisk.field4309 / 1000 + class154.cameraZ + Script.field955; // L: 3746 - if (class154.cameraZ > var2) { // L: 3747 - class154.cameraZ = var2; - } - } - - if (class154.cameraZ > var2) { // L: 3749 - class154.cameraZ -= (class154.cameraZ - var2) * ArchiveDisk.field4309 / 1000 + Script.field955; // L: 3750 - if (class154.cameraZ < var2) { // L: 3751 - class154.cameraZ = var2; - } - } - - } // L: 3753 - - @ObfuscatedName("hs") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "109" - ) - static int method164(int var0, int var1) { - int var2 = var1 - 334; // L: 5445 - if (var2 < 0) { // L: 5446 - var2 = 0; - } else if (var2 > 100) { // L: 5447 - var2 = 100; - } - - int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; // L: 5448 - return var0 * var3 / 256; // L: 5449 + return new class11(this); // L: 303 } } diff --git a/runescape-client/src/main/java/class131.java b/runescape-client/src/main/java/class131.java index 0c4da5a8a9..0993b96bfe 100644 --- a/runescape-client/src/main/java/class131.java +++ b/runescape-client/src/main/java/class131.java @@ -3,47 +3,47 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("es") +@ObfuscatedName("eh") public class class131 { - @ObfuscatedName("uh") - @ObfuscatedSignature( - descriptor = "Lca;" - ) - @Export("clientPreferences") - static ClientPreferences clientPreferences; - @ObfuscatedName("v") + @ObfuscatedName("a") + @Export("ArchiveDiskActionHandler_thread") + static Thread ArchiveDiskActionHandler_thread; + @ObfuscatedName("e") + @Export("ByteArrayPool_arrays") + static byte[][][] ByteArrayPool_arrays; + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = -5200207434161239507L + longValue = 8236093129399313125L ) - long field1539; - @ObfuscatedName("c") + long field1588; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1578407985 + intValue = 1513231141 ) - int field1535; - @ObfuscatedName("i") + int field1587; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llk;" + descriptor = "Llo;" ) - IterableNodeDeque field1536; + IterableNodeDeque field1589; @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpx;)V" ) public class131(Buffer var1) { - this.field1535 = -1; // L: 9 - this.field1536 = new IterableNodeDeque(); // L: 10 - this.method2872(var1); // L: 28 + this.field1587 = -1; // L: 9 + this.field1589 = new IterableNodeDeque(); // L: 10 + this.method2827(var1); // L: 28 } // L: 29 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-2070939911" + descriptor = "(Lpx;I)V", + garbageValue = "-1779541187" ) - void method2872(Buffer var1) { - this.field1539 = var1.readLong(); // L: 32 - this.field1535 = var1.readInt(); // L: 33 + void method2827(Buffer var1) { + this.field1588 = var1.readLong(); // L: 32 + this.field1587 = var1.readInt(); // L: 33 for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 34 35 55 Object var3; @@ -83,89 +83,39 @@ public class class131 { var3 = new class147(this); } - ((class128)var3).vmethod3168(var1); // L: 53 - this.field1536.addFirst((Node)var3); // L: 54 + ((class128)var3).vmethod3040(var1); // L: 53 + this.field1589.addFirst((Node)var3); // L: 54 } } // L: 57 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lex;I)V", - garbageValue = "-1644962091" + descriptor = "(Lek;I)V", + garbageValue = "-1989711462" ) - public void method2873(ClanSettings var1) { - if (this.field1539 == var1.field1586 && this.field1535 == var1.field1583) { // L: 60 - for (class128 var2 = (class128)this.field1536.last(); var2 != null; var2 = (class128)this.field1536.previous()) { // L: 61 - var2.vmethod3162(var1); // L: 62 + public void method2822(ClanSettings var1) { + if (var1.field1635 == this.field1588 && this.field1587 == var1.field1636) { // L: 60 + for (class128 var2 = (class128)this.field1589.last(); var2 != null; var2 = (class128)this.field1589.previous()) { // L: 61 + var2.vmethod3041(var1); // L: 62 } - ++var1.field1583; // L: 64 + ++var1.field1636; // L: 64 } else { throw new RuntimeException(""); } } // L: 65 - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-583434867" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-2088063820" ) - @Export("isAlphaNumeric") - public static boolean isAlphaNumeric(char var0) { - return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 146 + static int method2828(String var0) { + if (var0.equals("centre")) { // L: 297 + return 1; // L: 298 + } else { + return !var0.equals("bottom") && !var0.equals("right") ? 0 : 2; // L: 300 301 303 + } } - - @ObfuscatedName("gp") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1041289778" - ) - @Export("setWindowedMode") - static void setWindowedMode(int var0) { - Client.field601 = 0L; // L: 4263 - if (var0 >= 2) { // L: 4264 - Client.isResizable = true; - } else { - Client.isResizable = false; // L: 4265 - } - - if (Client.getWindowedMode() == 1) { // L: 4266 - class127.client.setMaxCanvasSize(765, 503); // L: 4267 - } else { - class127.client.setMaxCanvasSize(7680, 2160); // L: 4270 - } - - if (Client.gameState >= 25) { // L: 4272 - class4.method17(); - } - - } // L: 4273 - - @ObfuscatedName("jl") - @ObfuscatedSignature( - descriptor = "(IIIIIIIII)V", - garbageValue = "1296688270" - ) - @Export("drawWidgets") - static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (class155.loadInterface(var0)) { // L: 10214 - class307.field3585 = null; // L: 10221 - class268.drawInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 10222 - if (class307.field3585 != null) { // L: 10223 - class268.drawInterface(class307.field3585, -1412584499, var1, var2, var3, var4, class93.field1252, ItemContainer.field1013, var7); // L: 10224 - class307.field3585 = null; // L: 10225 - } - - } else { - if (var7 != -1) { // L: 10215 - Client.field715[var7] = true; - } else { - for (int var8 = 0; var8 < 100; ++var8) { // L: 10217 - Client.field715[var8] = true; - } - } - - } - } // L: 10219 10227 } diff --git a/runescape-client/src/main/java/class132.java b/runescape-client/src/main/java/class132.java index de38f89532..82d80fccbc 100644 --- a/runescape-client/src/main/java/class132.java +++ b/runescape-client/src/main/java/class132.java @@ -2,154 +2,215 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("el") +@ObfuscatedName("ej") public class class132 extends class128 { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -516096679 + intValue = -1443435093 ) - int field1543; - @ObfuscatedName("c") - byte field1544; + int field1599; + @ObfuscatedName("q") + byte field1597; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Les;" + descriptor = "Leh;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Les;)V" + descriptor = "(Leh;)V" ) class132(class131 var1) { this.this$0 = var1; - this.field1543 = -1; // L: 128 + this.field1599 = -1; // L: 128 } // L: 131 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-413979452" + descriptor = "(Lpx;I)V", + garbageValue = "-611912046" ) - void vmethod3168(Buffer var1) { - this.field1543 = var1.readUnsignedShort(); // L: 134 - this.field1544 = var1.readByte(); // L: 135 + void vmethod3040(Buffer var1) { + this.field1599 = var1.readUnsignedShort(); // L: 134 + this.field1597 = var1.readByte(); // L: 135 } // L: 136 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lex;S)V", - garbageValue = "-10316" + descriptor = "(Lek;B)V", + garbageValue = "-73" ) - void vmethod3162(ClanSettings var1) { - var1.method2964(this.field1543, this.field1544); // L: 139 + void vmethod3041(ClanSettings var1) { + var1.method2930(this.field1599, this.field1597); // L: 139 } // L: 140 - @ObfuscatedName("v") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "([FIFZFZ[FB)I", - garbageValue = "0" + descriptor = "(IS)J", + garbageValue = "-14369" ) - public static int method2888(float[] var0, int var1, float var2, boolean var3, float var4, boolean var5, float[] var6) { - float var7 = 0.0F; // L: 15 + public static long method2833(int var0) { + return ViewportMouse.ViewportMouse_entityTags[var0]; // L: 56 + } - for (int var8 = 0; var8 < var1 + 1; ++var8) { // L: 16 - var7 += Math.abs(var0[var8]); // L: 17 - } + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "([BIIB)Z", + garbageValue = "-32" + ) + static final boolean method2834(byte[] var0, int var1, int var2) { + boolean var3 = true; // L: 211 + Buffer var4 = new Buffer(var0); // L: 212 + int var5 = -1; // L: 213 - float var24 = (Math.abs(var2) + Math.abs(var4)) * (float)(var1 + 1) * class114.field1382; // L: 19 - if (var7 <= var24) { // L: 20 - return -1; // L: 21 - } else { - float[] var9 = new float[var1 + 1]; // L: 23 - - int var10; - for (var10 = 0; var10 < var1 + 1; ++var10) { // L: 24 - var9[var10] = 1.0F / var7 * var0[var10]; // L: 25 + label71: + while (true) { + int var6 = var4.method7531(); // L: 215 + if (var6 == 0) { // L: 216 + return var3; // L: 247 } - while (Math.abs(var9[var1]) < var24) { // L: 27 - --var1; // L: 28 - } + var5 += var6; // L: 217 + int var7 = 0; // L: 218 + boolean var8 = false; // L: 219 - var10 = 0; // L: 30 - if (var1 == 0) { // L: 31 - return var10; // L: 32 - } else if (var1 == 1) { // L: 34 - var6[0] = -var9[0] / var9[1]; // L: 35 - boolean var22 = var3 ? var2 < var24 + var6[0] : var2 < var6[0] - var24; // L: 36 - boolean var23 = var5 ? var4 > var6[0] - var24 : var4 > var6[0] + var24; // L: 37 - var10 = var22 && var23 ? 1 : 0; // L: 38 - if (var10 > 0) { // L: 39 - if (var3 && var6[0] < var2) { // L: 40 - var6[0] = var2; // L: 41 - } else if (var5 && var6[0] > var4) { // L: 43 - var6[0] = var4; // L: 44 + while (true) { + int var9; + while (!var8) { // L: 221 + var9 = var4.readUShortSmart(); // L: 227 + if (var9 == 0) { // L: 228 + continue label71; + } + + var7 += var9 - 1; // L: 229 + int var10 = var7 & 63; // L: 230 + int var11 = var7 >> 6 & 63; // L: 231 + int var12 = var4.readUnsignedByte() >> 2; // L: 232 + int var13 = var11 + var1; // L: 233 + int var14 = var10 + var2; // L: 234 + if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { // L: 235 + ObjectComposition var15 = class82.getObjectDefinition(var5); // L: 236 + if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { // L: 237 + if (!var15.needsModelFiles()) { // L: 238 + ++Client.field570; // L: 239 + var3 = false; // L: 240 + } + + var8 = true; // L: 242 + } } } - return var10; // L: 47 - } else { - class389 var11 = new class389(var9, var1); // L: 50 - float[] var12 = new float[var1 + 1]; // L: 51 - - for (int var13 = 1; var13 <= var1; ++var13) { // L: 52 - var12[var13 - 1] = var9[var13] * (float)var13; // L: 53 + var9 = var4.readUShortSmart(); // L: 222 + if (var9 == 0) { // L: 223 + break; } - float[] var21 = new float[var1 + 1]; // L: 55 - int var14 = method2888(var12, var1 - 1, var2, false, var4, false, var21); // L: 56 - if (var14 == -1) { // L: 57 - return 0; // L: 58 - } else { - boolean var15 = false; // L: 60 - float var17 = 0.0F; // L: 62 - float var18 = 0.0F; // L: 63 - float var19 = 0.0F; // L: 64 - - for (int var20 = 0; var20 <= var14; ++var20) { // L: 65 - if (var10 > var1) { // L: 66 - return var10; - } - - float var16; - if (var20 == 0) { // L: 67 - var16 = var2; // L: 68 - var18 = class306.method5786(var9, var1, var2); // L: 69 - if (Math.abs(var18) <= var24 && var3) { // L: 70 - var6[var10++] = var2; - } - } else { - var16 = var19; // L: 73 - var18 = var17; // L: 74 - } - - if (var14 == var20) { // L: 76 - var19 = var4; // L: 77 - var15 = false; // L: 78 - } else { - var19 = var21[var20]; // L: 81 - } - - var17 = class306.method5786(var9, var1, var19); // L: 83 - if (var15) { // L: 84 - var15 = false; // L: 85 - } else if (Math.abs(var17) < var24) { // L: 88 - if (var20 != var14 || var5) { // L: 89 - var6[var10++] = var19; // L: 90 - var15 = true; // L: 91 - } - } else if (var18 < 0.0F && var17 > 0.0F || var18 > 0.0F && var17 < 0.0F) { // L: 94 - var6[var10++] = class154.method3181(var11, var16, var19, 0.0F); // L: 95 - if (var10 > 1 && var6[var10 - 2] >= var6[var10 - 1] - var24) { // L: 96 - var6[var10 - 2] = 0.5F * (var6[var10 - 1] + var6[var10 - 2]); // L: 97 - --var10; // L: 98 - } - } - } - - return var10; // L: 104 - } + var4.readUnsignedByte(); // L: 224 } } } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Laj;I)V", + garbageValue = "-1921096355" + ) + static void method2829(GameEngine var0) { + while (TaskHandler.isKeyDown()) { // L: 1837 + if (class12.field61 == 13) { // L: 1838 + WorldMapScaleHandler.method4927(); // L: 1839 + return; // L: 1840 + } + + if (class12.field61 == 96) { // L: 1842 + if (Login.worldSelectPage > 0 && class126.worldSelectLeftSprite != null) { // L: 1843 + --Login.worldSelectPage; // L: 1844 + } + } else if (class12.field61 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && class424.worldSelectRightSprite != null) { // L: 1847 1848 + ++Login.worldSelectPage; // L: 1849 + } + } + + if (MouseHandler.MouseHandler_lastButton == 1 || !Login.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 1853 + int var1 = Login.xPadding + 280; // L: 1854 + if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1855 + class306.changeWorldSelectSorting(0, 0); // L: 1856 + return; // L: 1857 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1859 + class306.changeWorldSelectSorting(0, 1); // L: 1860 + return; // L: 1861 + } + + int var2 = Login.xPadding + 390; // L: 1863 + if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1864 + class306.changeWorldSelectSorting(1, 0); // L: 1865 + return; // L: 1866 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1868 + class306.changeWorldSelectSorting(1, 1); // L: 1869 + return; // L: 1870 + } + + int var3 = Login.xPadding + 500; // L: 1872 + if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1873 + class306.changeWorldSelectSorting(2, 0); // L: 1874 + return; // L: 1875 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1877 + class306.changeWorldSelectSorting(2, 1); // L: 1878 + return; // L: 1879 + } + + int var4 = Login.xPadding + 610; // L: 1881 + if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1882 + class306.changeWorldSelectSorting(3, 0); // L: 1883 + return; // L: 1884 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1886 + class306.changeWorldSelectSorting(3, 1); // L: 1887 + return; // L: 1888 + } + + if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 1890 + WorldMapScaleHandler.method4927(); // L: 1891 + return; // L: 1892 + } + + if (Login.hoveredWorldIndex != -1) { // L: 1894 + World var5 = World.World_worlds[Login.hoveredWorldIndex]; // L: 1895 + InvDefinition.changeWorld(var5); // L: 1896 + WorldMapScaleHandler.method4927(); // L: 1897 + return; // L: 1898 + } + + if (Login.worldSelectPage > 0 && class126.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class126.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= class433.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class433.canvasHeight / 2 + 50) { // L: 1900 + --Login.worldSelectPage; // L: 1901 + } + + if (Login.worldSelectPage < Login.worldSelectPagesCount && class424.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= GraphicsObject.canvasWidth - class424.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= GraphicsObject.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= class433.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class433.canvasHeight / 2 + 50) { // L: 1903 + ++Login.worldSelectPage; // L: 1904 + } + } + + } // L: 1907 + + @ObfuscatedName("ip") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-1705854659" + ) + static final void method2836(int var0, int var1, int var2, int var3) { + for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 8715 + if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetYs[var4] + Client.rootWidgetHeights[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { // L: 8716 + Client.field652[var4] = true; + } + } + + } // L: 8718 } diff --git a/runescape-client/src/main/java/class133.java b/runescape-client/src/main/java/class133.java index 308b0707e8..396ddc7eba 100644 --- a/runescape-client/src/main/java/class133.java +++ b/runescape-client/src/main/java/class133.java @@ -1,64 +1,60 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ej") +@ObfuscatedName("en") public class class133 extends class128 { - @ObfuscatedName("hh") - @Export("regionLandArchiveIds") - static int[] regionLandArchiveIds; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 432924361 + intValue = 1372494639 ) - int field1556; - @ObfuscatedName("c") + int field1605; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -2115932519 + intValue = -923115207 ) - int field1555; - @ObfuscatedName("i") + int field1602; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 117330729 + intValue = 81969821 ) - int field1552; - @ObfuscatedName("f") + int field1603; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -850318401 + intValue = 1344220301 ) - int field1550; + int field1604; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Les;" + descriptor = "Leh;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Les;)V" + descriptor = "(Leh;)V" ) class133(class131 var1) { this.this$0 = var1; // L: 289 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-413979452" + descriptor = "(Lpx;I)V", + garbageValue = "-611912046" ) - void vmethod3168(Buffer var1) { - this.field1556 = var1.readInt(); // L: 292 - this.field1550 = var1.readInt(); // L: 293 - this.field1555 = var1.readUnsignedByte(); // L: 294 - this.field1552 = var1.readUnsignedByte(); // L: 295 + void vmethod3040(Buffer var1) { + this.field1605 = var1.readInt(); // L: 292 + this.field1604 = var1.readInt(); // L: 293 + this.field1602 = var1.readUnsignedByte(); // L: 294 + this.field1603 = var1.readUnsignedByte(); // L: 295 } // L: 296 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lex;S)V", - garbageValue = "-10316" + descriptor = "(Lek;B)V", + garbageValue = "-73" ) - void vmethod3162(ClanSettings var1) { - var1.method2969(this.field1556, this.field1550, this.field1555, this.field1552); // L: 299 + void vmethod3041(ClanSettings var1) { + var1.method2898(this.field1605, this.field1604, this.field1602, this.field1603); // L: 299 } // L: 300 } diff --git a/runescape-client/src/main/java/class134.java b/runescape-client/src/main/java/class134.java index 36156a9b4c..2a6a47b054 100644 --- a/runescape-client/src/main/java/class134.java +++ b/runescape-client/src/main/java/class134.java @@ -2,174 +2,87 @@ 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("em") +@ObfuscatedName("eb") public class class134 extends class144 { - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -890090541 + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Llp;" ) - int field1558; - @ObfuscatedName("c") - byte field1557; - @ObfuscatedName("i") + @Export("Widget_archive") + public static AbstractArchive Widget_archive; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1576822887 + intValue = -457086001 ) - int field1559; - @ObfuscatedName("f") - String field1560; + int field1608; + @ObfuscatedName("q") + byte field1607; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 369270557 + ) + int field1609; + @ObfuscatedName("k") + String field1606; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Lee;" ) final class145 this$0; @ObfuscatedSignature( - descriptor = "(Ler;)V" + descriptor = "(Lee;)V" ) class134(class145 var1) { this.this$0 = var1; - this.field1558 = -1; // L: 101 + this.field1608 = -1; // L: 101 } // L: 106 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "23" + descriptor = "(Lpx;I)V", + garbageValue = "1212008489" ) - void vmethod3152(Buffer var1) { - this.field1558 = var1.readUnsignedShort(); // L: 109 - this.field1557 = var1.readByte(); // L: 110 - this.field1559 = var1.readUnsignedShort(); // L: 111 + void vmethod3037(Buffer var1) { + this.field1608 = var1.readUnsignedShort(); // L: 109 + this.field1607 = var1.readByte(); + this.field1609 = var1.readUnsignedShort(); var1.readLong(); // L: 112 - this.field1560 = var1.readStringCp1252NullTerminated(); // L: 113 + this.field1606 = var1.readStringCp1252NullTerminated(); // L: 113 } // L: 114 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lea;I)V", - garbageValue = "1764669808" + descriptor = "(Let;I)V", + garbageValue = "1640110130" ) - void vmethod3153(ClanChannel var1) { - ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1558); // L: 117 - var2.rank = this.field1557; // L: 118 - var2.world = this.field1559; // L: 119 - var2.username = new Username(this.field1560); // L: 120 + void vmethod3032(ClanChannel var1) { + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1608); // L: 117 + var2.rank = this.field1607; // L: 118 + var2.world = this.field1609; // L: 119 + var2.username = new Username(this.field1606); // L: 120 } // L: 121 - @ObfuscatedName("v") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IB)Lfb;", - garbageValue = "6" + descriptor = "(III)I", + garbageValue = "-574473090" ) - @Export("VarpDefinition_get") - public static VarpDefinition VarpDefinition_get(int var0) { - VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); // L: 18 - if (var1 != null) { // L: 19 - return var1; - } else { - byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); // L: 20 - var1 = new VarpDefinition(); // L: 21 - if (var2 != null) { // L: 22 - var1.decode(new Buffer(var2)); - } - - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 23 - return var1; // L: 24 - } + public static int method2841(int var0, int var1) { + int var2 = var0 >>> 31; // L: 110 + return (var0 + var2) / var1 - var2; // L: 111 } - @ObfuscatedName("c") + @ObfuscatedName("lu") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-939584832" + descriptor = "(I)V", + garbageValue = "-1592310985" ) - public static boolean method2905(char var0) { - if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { // L: 45 - if (var0 != 0) { // L: 46 - char[] var1 = class345.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; - } - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(ILbd;ZS)I", - garbageValue = "300" - ) - static int method2906(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { // L: 818 - var0 -= 1000; // L: 819 - var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 820 - } else { - var3 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 822 + static void method2850() { + if (Client.oculusOrbState == 1) { // L: 12674 + Client.field575 = true; // L: 12675 } - class346.invalidateWidget(var3); // L: 823 - if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 824 - if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 844 - var3.modelType = 2; // L: 845 - var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 846 - return 1; // L: 847 - } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 849 - var3.modelType = 3; // L: 850 - var3.modelId = GrandExchangeEvents.localPlayer.appearance.getChatHeadId(); // L: 851 - return 1; // L: 852 - } else { - return 2; // L: 854 - } - } else { - Interpreter.Interpreter_intStackSize -= 2; // L: 825 - int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 826 - int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 827 - var3.itemId = var4; // L: 828 - var3.itemQuantity = var5; // L: 829 - ItemComposition var6 = class19.ItemDefinition_get(var4); // L: 830 - var3.modelAngleX = var6.xan2d; // L: 831 - var3.modelAngleY = var6.yan2d; // L: 832 - var3.modelAngleZ = var6.zan2d; // L: 833 - var3.modelOffsetX = var6.offsetX2d; // L: 834 - var3.modelOffsetY = var6.offsetY2d; // L: 835 - var3.modelZoom = var6.zoom2d; // L: 836 - if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { // L: 837 - var3.itemQuantityMode = 0; - } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { // L: 838 - var3.itemQuantityMode = 1; - } else { - var3.itemQuantityMode = 2; // L: 839 - } - - if (var3.field3467 > 0) { // L: 840 - var3.modelZoom = var3.modelZoom * 32 / var3.field3467; - } else if (var3.rawWidth > 0) { // L: 841 - var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; - } - - return 1; // L: 842 - } - } - - @ObfuscatedName("lr") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-77" - ) - static void method2908() { - Client.packetWriter.addNode(WorldMapSprite.getPacketBufferNode(ClientPacket.field2989, Client.packetWriter.isaacCipher)); // L: 12607 - Client.oculusOrbState = 0; // L: 12608 - } // L: 12609 + } // L: 12677 } diff --git a/runescape-client/src/main/java/class135.java b/runescape-client/src/main/java/class135.java index de9e611601..874d9e19ce 100644 --- a/runescape-client/src/main/java/class135.java +++ b/runescape-client/src/main/java/class135.java @@ -1,491 +1,71 @@ +import java.awt.FontMetrics; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ei") +@ObfuscatedName("ea") public class class135 extends class128 { - @ObfuscatedName("cs") + @ObfuscatedName("uw") @ObfuscatedSignature( - descriptor = "Lqq;" + descriptor = "Lnc;" ) - static IndexedSprite field1569; - @ObfuscatedName("v") - boolean field1566; - @ObfuscatedName("c") - byte field1565; - @ObfuscatedName("i") - byte field1567; - @ObfuscatedName("f") - byte field1564; - @ObfuscatedName("b") - byte field1568; + @Export("masterDisk") + static ArchiveDisk masterDisk; + @ObfuscatedName("ul") + @ObfuscatedSignature( + descriptor = "Lom;" + ) + @Export("platformInfo") + static PlatformInfo platformInfo; + @ObfuscatedName("ab") + @Export("loginScreenFontMetrics") + static FontMetrics loginScreenFontMetrics; + @ObfuscatedName("o") + boolean field1614; + @ObfuscatedName("q") + byte field1613; + @ObfuscatedName("l") + byte field1615; + @ObfuscatedName("k") + byte field1622; + @ObfuscatedName("a") + byte field1616; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Les;" + descriptor = "Leh;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Les;)V" + descriptor = "(Leh;)V" ) class135(class131 var1) { this.this$0 = var1; // L: 248 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-413979452" + descriptor = "(Lpx;I)V", + garbageValue = "-611912046" ) - void vmethod3168(Buffer var1) { - this.field1566 = var1.readUnsignedByte() == 1; // L: 251 - this.field1565 = var1.readByte(); // L: 252 - this.field1567 = var1.readByte(); // L: 253 - this.field1564 = var1.readByte(); // L: 254 - this.field1568 = var1.readByte(); // L: 255 + void vmethod3040(Buffer var1) { + this.field1614 = var1.readUnsignedByte() == 1; // L: 251 + this.field1613 = var1.readByte(); // L: 252 + this.field1615 = var1.readByte(); // L: 253 + this.field1622 = var1.readByte(); // L: 254 + this.field1616 = var1.readByte(); // L: 255 } // L: 256 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lex;S)V", - garbageValue = "-10316" + descriptor = "(Lek;B)V", + garbageValue = "-73" ) - void vmethod3162(ClanSettings var1) { - var1.allowGuests = this.field1566; // L: 259 - var1.field1591 = this.field1565; // L: 260 - var1.field1592 = this.field1567; // L: 261 - var1.field1593 = this.field1564; // L: 262 - var1.field1606 = this.field1568; // L: 263 + void vmethod3041(ClanSettings var1) { + var1.allowGuests = this.field1614; // L: 259 + var1.field1633 = this.field1613; // L: 260 + var1.field1641 = this.field1615; // L: 261 + var1.field1642 = this.field1622; // L: 262 + var1.field1648 = this.field1616; // L: 263 } // L: 264 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(IIIIIIII)Z", - garbageValue = "1081787239" - ) - static final boolean method2919(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = ViewportMouse.ViewportMouse_y + var6; // L: 124 - if (var7 < var0 && var7 < var1 && var7 < var2) { // L: 125 - return false; - } else { - var7 = ViewportMouse.ViewportMouse_y - var6; // L: 126 - if (var7 > var0 && var7 > var1 && var7 > var2) { - return false; // L: 127 - } else { - var7 = ViewportMouse.ViewportMouse_x + var6; // L: 128 - if (var7 < var3 && var7 < var4 && var7 < var5) { // L: 129 - return false; - } else { - var7 = ViewportMouse.ViewportMouse_x - var6; // L: 130 - return var7 <= var3 || var7 <= var4 || var7 <= var5; // L: 131 - } - } - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(IIIIIZI)Lqi;", - garbageValue = "-152475428" - ) - @Export("getItemSprite") - public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { - if (var1 == -1) { // L: 365 - var4 = 0; - } else if (var4 == 2 && var1 != 1) { // L: 366 - var4 = 1; - } - - long var6 = ((long)var1 << 16) + (long)var0 + ((long)var2 << 38) + ((long)var4 << 40) + ((long)var3 << 42); // L: 367 - SpritePixels var8; - if (!var5) { // L: 369 - var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); // L: 370 - if (var8 != null) { // L: 371 - return var8; - } - } - - ItemComposition var9 = class19.ItemDefinition_get(var0); // L: 373 - if (var1 > 1 && var9.countobj != null) { // L: 374 - int var10 = -1; // L: 375 - - for (int var11 = 0; var11 < 10; ++var11) { // L: 376 - if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 377 - var10 = var9.countobj[var11]; - } - } - - if (var10 != -1) { // L: 379 - var9 = class19.ItemDefinition_get(var10); - } - } - - Model var21 = var9.getModel(1); // L: 381 - if (var21 == null) { // L: 382 - return null; - } else { - SpritePixels var22 = null; // L: 383 - if (var9.noteTemplate != -1) { // L: 384 - var22 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 385 - if (var22 == null) { // L: 386 - return null; - } - } else if (var9.notedId != -1) { // L: 388 - var22 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 389 - if (var22 == null) { // L: 390 - return null; - } - } else if (var9.placeholderTemplate != -1) { // L: 392 - var22 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 393 - if (var22 == null) { // L: 394 - return null; - } - } - - int[] var12 = Rasterizer2D.Rasterizer2D_pixels; // L: 396 - int var13 = Rasterizer2D.Rasterizer2D_width; // L: 397 - int var14 = Rasterizer2D.Rasterizer2D_height; // L: 398 - int[] var15 = new int[4]; // L: 399 - Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 400 - var8 = new SpritePixels(36, 32); // L: 401 - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 402 - Rasterizer2D.Rasterizer2D_clear(); // L: 403 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 404 - Rasterizer3D.method4631(16, 16); // L: 405 - Rasterizer3D.field2553 = false; // L: 406 - if (var9.placeholderTemplate != -1) { // L: 407 - var22.drawTransBgAt(0, 0); - } - - int var16 = var9.zoom2d; // L: 408 - if (var5) { // L: 409 - var16 = (int)((double)var16 * 1.5D); - } else if (var2 == 2) { // L: 410 - var16 = (int)(1.04D * (double)var16); - } - - int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 411 - int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 412 - var21.calculateBoundsCylinder(); // L: 413 - var21.method5003(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var21.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 414 - if (var9.notedId != -1) { // L: 415 - var22.drawTransBgAt(0, 0); - } - - if (var2 >= 1) { // L: 416 - var8.outline(1); - } - - if (var2 >= 2) { // L: 417 - var8.outline(16777215); - } - - if (var3 != 0) { // L: 418 - var8.shadow(var3); - } - - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 419 - if (var9.noteTemplate != -1) { // L: 420 - var22.drawTransBgAt(0, 0); - } - - if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 421 - Font var19 = ParamComposition.ItemDefinition_fontPlain11; // L: 422 - String var20; - if (var1 < 100000) { // L: 425 - var20 = "" + var1 + ""; // L: 426 - } else if (var1 < 10000000) { // L: 429 - var20 = "" + var1 / 1000 + "K" + ""; // L: 430 - } else { - var20 = "" + var1 / 1000000 + "M" + ""; // L: 433 - } - - var19.draw(var20, 0, 9, 16776960, 1); // L: 435 - } - - if (!var5) { // L: 437 - ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); - } - - Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 438 - Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 439 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 440 - Rasterizer3D.field2553 = true; // L: 441 - return var8; // L: 442 - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "1999407180" - ) - static int method2922(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1199 - if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1200 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId; // L: 1201 - return 1; // L: 1202 - } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1204 - if (var3.itemId != -1) { // L: 1205 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1206 - } - - return 1; // L: 1207 - } else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1209 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1210 - return 1; // L: 1211 - } else if (var0 == 1707) { // L: 1213 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.method5690() ? 1 : 0; // L: 1214 - return 1; // L: 1215 - } else if (var0 == 1708) { // L: 1217 - return UserComparator9.method2617(var3); // L: 1218 - } else { - return var0 == 1708 ? class305.method5782(var3) : 2; // L: 1220 1221 1223 - } - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "-35" - ) - static int method2921(int var0, Script var1, boolean var2) { - Widget var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1341 - if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1342 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1343 - return 1; // L: 1344 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1346 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1347 - return 1; // L: 1348 - } else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1350 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var3.text; // L: 1351 - return 1; // L: 1352 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1354 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1355 - return 1; // L: 1356 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1358 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1359 - return 1; // L: 1360 - } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1362 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1363 - return 1; // L: 1364 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1366 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1367 - return 1; // L: 1368 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1370 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1371 - return 1; // L: 1372 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1374 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1375 - return 1; // L: 1376 - } else if (var0 == ScriptOpcodes.IF_GETTRANS) { // L: 1378 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1379 - return 1; // L: 1380 - } else if (var0 == 2610) { // L: 1382 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1383 - return 1; // L: 1384 - } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1386 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; // L: 1387 - return 1; // L: 1388 - } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1390 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; // L: 1391 - return 1; // L: 1392 - } else if (var0 == 2613) { // L: 1394 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1395 - return 1; // L: 1396 - } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1398 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1399 - return 1; // L: 1400 - } else if (var0 != 2615 && var0 != 2616) { // L: 1402 - return 2; // L: 1406 - } else { - ++Interpreter.Interpreter_intStackSize; // L: 1403 - return 1; // L: 1404 - } - } - - @ObfuscatedName("gc") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "241580709" - ) - static final void method2920() { - int var0; - int var1; - int var2; - int var3; - int var4; - int var5; - if (Client.oculusOrbState == 0) { // L: 3801 - var0 = GrandExchangeEvents.localPlayer.x; // L: 3802 - var1 = GrandExchangeEvents.localPlayer.y; // L: 3803 - if (class10.oculusOrbFocalPointX - var0 < -500 || class10.oculusOrbFocalPointX - var0 > 500 || ClientPacket.oculusOrbFocalPointY - var1 < -500 || ClientPacket.oculusOrbFocalPointY - var1 > 500) { // L: 3804 - class10.oculusOrbFocalPointX = var0; // L: 3805 - ClientPacket.oculusOrbFocalPointY = var1; // L: 3806 - } - - if (var0 != class10.oculusOrbFocalPointX) { // L: 3808 - class10.oculusOrbFocalPointX += (var0 - class10.oculusOrbFocalPointX) / 16; - } - - if (var1 != ClientPacket.oculusOrbFocalPointY) { // L: 3809 - ClientPacket.oculusOrbFocalPointY += (var1 - ClientPacket.oculusOrbFocalPointY) / 16; - } - - var2 = class10.oculusOrbFocalPointX >> 7; // L: 3810 - var3 = ClientPacket.oculusOrbFocalPointY >> 7; // L: 3811 - var4 = WorldMapLabel.getTileHeight(class10.oculusOrbFocalPointX, ClientPacket.oculusOrbFocalPointY, class18.Client_plane); // L: 3812 - var5 = 0; // L: 3813 - int var6; - if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { // L: 3814 - for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { // L: 3815 - for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { // L: 3816 - int var8 = class18.Client_plane; // L: 3817 - if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { // L: 3818 - ++var8; - } - - int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; // L: 3819 - if (var9 > var5) { // L: 3820 - var5 = var9; - } - } - } - } - - var6 = var5 * 192; // L: 3824 - if (var6 > 98048) { // L: 3825 - var6 = 98048; - } - - if (var6 < 32768) { // L: 3826 - var6 = 32768; - } - - if (var6 > Client.field718) { // L: 3827 - Client.field718 += (var6 - Client.field718) / 24; - } else if (var6 < Client.field718) { // L: 3828 - Client.field718 += (var6 - Client.field718) / 80; - } - - Decimator.field397 = WorldMapLabel.getTileHeight(GrandExchangeEvents.localPlayer.x, GrandExchangeEvents.localPlayer.y, class18.Client_plane) - Client.camFollowHeight; // L: 3829 - } else if (Client.oculusOrbState == 1) { // L: 3831 - UrlRequest.method2560(); // L: 3832 - short var10 = -1; // L: 3833 - if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 3834 - var10 = 0; - } else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 3835 - var10 = 1024; - } - - if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 3836 - if (var10 == 0) { // L: 3837 - var10 = 1792; - } else if (var10 == 1024) { // L: 3838 - var10 = 1280; - } else { - var10 = 1536; // L: 3839 - } - } else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 3841 - if (var10 == 0) { // L: 3842 - var10 = 256; - } else if (var10 == 1024) { // L: 3843 - var10 = 768; - } else { - var10 = 512; // L: 3844 - } - } - - byte var11 = 0; // L: 3846 - if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 3847 - var11 = -1; - } else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 3848 - var11 = 1; - } - - var2 = 0; // L: 3849 - if (var10 >= 0 || var11 != 0) { // L: 3850 - var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed * 868767683 * -1383870229 : Client.oculusOrbNormalSpeed * -210849807 * -1329831663; // L: 3851 - var2 *= 16; // L: 3852 - Client.field590 = var10; // L: 3853 - Client.field489 = var11; // L: 3854 - } - - if (Client.field581 < var2) { // L: 3856 - Client.field581 += var2 / 8; // L: 3857 - if (Client.field581 > var2) { // L: 3858 - Client.field581 = var2; - } - } else if (Client.field581 > var2) { // L: 3860 - Client.field581 = Client.field581 * 9 / 10; - } - - if (Client.field581 > 0) { // L: 3861 - var3 = Client.field581 / 16; // L: 3862 - if (Client.field590 >= 0) { // L: 3863 - var0 = Client.field590 - class21.cameraYaw & 2047; // L: 3864 - var4 = Rasterizer3D.Rasterizer3D_sine[var0]; // L: 3865 - var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; // L: 3866 - class10.oculusOrbFocalPointX += var4 * var3 / 65536; // L: 3867 - ClientPacket.oculusOrbFocalPointY += var3 * var5 / 65536; // L: 3868 - } - - if (Client.field489 != 0) { // L: 3870 - Decimator.field397 += var3 * Client.field489; // L: 3871 - if (Decimator.field397 > 0) { // L: 3872 - Decimator.field397 = 0; - } - } - } else { - Client.field590 = -1; // L: 3876 - Client.field489 = -1; // L: 3877 - } - - if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 3879 - class134.method2908(); // L: 3880 - } - } - - if (MouseHandler.MouseHandler_currentButton == 4 && GameBuild.mouseCam) { // L: 3883 - var0 = MouseHandler.MouseHandler_y - Client.mouseCamClickedY; // L: 3884 - Client.camAngleDX = var0 * 2; // L: 3885 - Client.mouseCamClickedY = var0 != -1 && var0 != 1 ? (Client.mouseCamClickedY + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y * 1209120729 * -785295255; // L: 3886 - var1 = Client.mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 3887 - Client.camAngleDY = var1 * 2; // L: 3888 - Client.mouseCamClickedX = var1 != -1 && var1 != 1 ? (MouseHandler.MouseHandler_x + Client.mouseCamClickedX) / 2 : MouseHandler.MouseHandler_x * 945035617 * -611956063; // L: 3889 - } else { - if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 3892 - Client.camAngleDY += (-24 - Client.camAngleDY) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 3893 - Client.camAngleDY += (24 - Client.camAngleDY) / 2; - } else { - Client.camAngleDY /= 2; // L: 3894 - } - - if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 3895 - Client.camAngleDX += (12 - Client.camAngleDX) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3896 - Client.camAngleDX += (-12 - Client.camAngleDX) / 2; - } else { - Client.camAngleDX /= 2; // L: 3897 - } - - Client.mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 3898 - Client.mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 3899 - } - - Client.camAngleY = Client.camAngleDY / 2 + Client.camAngleY & 2047; // L: 3901 - Client.camAngleX += Client.camAngleDX / 2; // L: 3902 - if (Client.camAngleX < 128) { // L: 3903 - Client.camAngleX = 128; - } - - if (Client.camAngleX > 383) { // L: 3904 - Client.camAngleX = 383; - } - - } // L: 3905 } diff --git a/runescape-client/src/main/java/class136.java b/runescape-client/src/main/java/class136.java index f55c2463c5..b5cb0f178a 100644 --- a/runescape-client/src/main/java/class136.java +++ b/runescape-client/src/main/java/class136.java @@ -1,35 +1,42 @@ +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.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ep") +@ObfuscatedName("er") public class class136 extends class144 { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -855933295 + intValue = -862261103 ) - int field1571; + int field1624; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Lee;" ) final class145 this$0; @ObfuscatedSignature( - descriptor = "(Ler;)V" + descriptor = "(Lee;)V" ) class136(class145 var1) { this.this$0 = var1; - this.field1571 = -1; // L: 82 + this.field1624 = -1; // L: 82 } // L: 84 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "23" + descriptor = "(Lpx;I)V", + garbageValue = "1212008489" ) - void vmethod3152(Buffer var1) { - this.field1571 = var1.readUnsignedShort(); // L: 87 + void vmethod3037(Buffer var1) { + this.field1624 = var1.readUnsignedShort(); // L: 87 var1.readUnsignedByte(); // L: 88 if (var1.readUnsignedByte() != 255) { // L: 89 --var1.offset; // L: 90 @@ -38,114 +45,815 @@ public class class136 extends class144 { } // L: 93 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lea;I)V", - garbageValue = "1764669808" + descriptor = "(Let;I)V", + garbageValue = "1640110130" ) - void vmethod3153(ClanChannel var1) { - var1.removeMember(this.field1571); // L: 96 - } // L: 97 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "1053003515" - ) - public static final synchronized long method2931() { - long var0 = System.currentTimeMillis(); // L: 14 - if (var0 < class269.field3149) { // L: 15 - class269.field3147 += class269.field3149 - var0; // L: 16 - } - - class269.field3149 = var0; // L: 18 - return class269.field3147 + var0; // L: 19 + void vmethod3032(ClanChannel var1) { + var1.removeMember(this.field1624); } - @ObfuscatedName("fs") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "885015273" + descriptor = "(II)Lfw;", + garbageValue = "-185692115" ) - static final void method2923() { - for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { // L: 3493 - int var10002 = Client.queuedSoundEffectDelays[var0]--; // L: 3494 - if (Client.queuedSoundEffectDelays[var0] >= -10) { // L: 3495 - SoundEffect var1 = Client.soundEffects[var0]; // L: 3507 - if (var1 == null) { // L: 3508 - Object var10000 = null; // L: 3509 - var1 = SoundEffect.readSoundEffect(class182.archive4, Client.soundEffectIds[var0], 0); - if (var1 == null) { // L: 3510 - continue; - } + @Export("SpotAnimationDefinition_get") + 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)); + } - int[] var12 = Client.queuedSoundEffectDelays; // L: 3511 - var12[var0] += var1.calculateDelay(); - Client.soundEffects[var0] = var1; // L: 3512 + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 38 + return var1; // L: 39 + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Laj;Lmx;I)V", + garbageValue = "617611550" + ) + @Export("loginScreen") + static void loginScreen(GameEngine var0, Font var1) { + if (Login.worldSelectOpen) { // L: 288 + class132.method2829(var0); // L: 289 + } else { + if ((MouseHandler.MouseHandler_lastButton == 1 || !Login.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 292 + class12.clientPreferences.method2305(!class12.clientPreferences.method2226()); // L: 293 + if (!class12.clientPreferences.method2226()) { // L: 294 + class118.method2733(AbstractUserComparator.archive6, "scape main", "", 255, false); + } else { + ApproximateRouteStrategy.method1110(); // L: 295 + } + } + + if (Client.gameState != 5) { // L: 297 + if (-1L == Login.field883) { // L: 298 + Login.field883 = class113.method2624() + 1000L; // L: 299 } - if (Client.queuedSoundEffectDelays[var0] < 0) { // L: 3518 - int var2; - if (Client.soundLocations[var0] != 0) { // L: 3520 - int var3 = (Client.soundLocations[var0] & 255) * 128; // L: 3521 - int var4 = Client.soundLocations[var0] >> 16 & 255; // L: 3522 - int var5 = var4 * 128 + 64 - GrandExchangeEvents.localPlayer.x; // L: 3523 - if (var5 < 0) { // L: 3524 - var5 = -var5; + long var2 = class113.method2624(); // L: 301 + if (class121.method2748() && Login.field909 == -1L) { // L: 302 303 + Login.field909 = var2; // L: 304 + if (Login.field909 > Login.field883) { // L: 305 + Login.field883 = Login.field909; // L: 306 + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { // L: 310 + int var4; + if (Language.Language_EN == class263.clientLanguage) { // L: 311 + if (MouseHandler.MouseHandler_lastButton == 1 || !Login.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 312 + var4 = Login.xPadding + 5; // L: 313 + short var5 = 463; // L: 314 + byte var6 = 100; // L: 315 + byte var7 = 35; // L: 316 + if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + var6 && MouseHandler.MouseHandler_lastPressedY >= var5 && MouseHandler.MouseHandler_lastPressedY <= var7 + var5) { // L: 317 + Player.method2135(); // L: 318 + return; // L: 319 + } } - int var6 = Client.soundLocations[var0] >> 8 & 255; // L: 3525 - int var7 = var6 * 128 + 64 - GrandExchangeEvents.localPlayer.y; // L: 3526 - if (var7 < 0) { // L: 3527 - var7 = -var7; + if (NPC.World_request != null) { // L: 322 + Player.method2135(); + } + } + + var4 = MouseHandler.MouseHandler_lastButton; // L: 324 + int var30 = MouseHandler.MouseHandler_lastPressedX; // L: 325 + int var31 = MouseHandler.MouseHandler_lastPressedY; // L: 326 + if (var4 == 0) { // L: 327 + var30 = MouseHandler.MouseHandler_x; // L: 328 + var31 = MouseHandler.MouseHandler_y; // L: 329 + } + + if (!Login.mouseCam && var4 == 4) { // L: 331 + var4 = 1; + } + + int var34; + short var35; + if (Login.loginIndex == 0) { // L: 332 + boolean var44 = false; // L: 333 + + while (TaskHandler.isKeyDown()) { // L: 334 + if (class12.field61 == 84) { // L: 335 + var44 = true; // L: 336 + } } - int var8 = var5 + var7 - 128; // L: 3528 - if (var8 > var3) { // L: 3529 - Client.queuedSoundEffectDelays[var0] = -100; // L: 3530 - continue; // L: 3531 + var34 = Decimator.loginBoxCenter - 80; // L: 339 + var35 = 291; // L: 340 + if (var4 == 1 && var30 >= var34 - 75 && var30 <= var34 + 75 && var31 >= var35 - 20 && var31 <= var35 + 20) { // L: 341 + ScriptEvent.openURL(WorldMapData_1.method4707("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 342 } - if (var8 < 0) { // L: 3533 - var8 = 0; - } + var34 = Decimator.loginBoxCenter + 80; // L: 344 + if (var4 == 1 && var30 >= var34 - 75 && var30 <= var34 + 75 && var31 >= var35 - 20 && var31 <= var35 + 20 || var44) { // 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 + class126.method2799(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 + } - var2 = (var3 - var8) * class131.clientPreferences.method2270() / var3; // L: 3534 + Login.Login_response0 = "Warning!"; // L: 372 + class126.method2799(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 + class126.method2799(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 { + PcmPlayer.Login_promptCredentials(false); // L: 399 + } + } } else { - var2 = class131.clientPreferences.method2243(); // L: 3536 + short var8; + int var32; + if (Login.loginIndex == 1) { // L: 403 + while (true) { + if (!TaskHandler.isKeyDown()) { // L: 404 + var32 = Decimator.loginBoxCenter - 80; // L: 412 + var8 = 321; // L: 413 + if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 414 + PcmPlayer.Login_promptCredentials(false); // L: 415 + } + + var32 = Decimator.loginBoxCenter + 80; // L: 417 + if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 418 + class126.method2799(0); // L: 419 + } + break; + } + + if (class12.field61 == 84) { // L: 405 + PcmPlayer.Login_promptCredentials(false); // L: 406 + } else if (class12.field61 == 13) { // L: 408 + class126.method2799(0); // L: 409 + } + } + } else { + int var11; + short var33; + boolean var36; + if (Login.loginIndex == 2) { // L: 422 + var33 = 201; // L: 423 + var32 = var33 + 52; // L: 424 + if (var4 == 1 && var31 >= var32 - 12 && var31 < var32 + 2) { // L: 425 + Login.currentLoginField = 0; + } + + var32 += 15; // L: 426 + if (var4 == 1 && var31 >= var32 - 12 && var31 < var32 + 2) { // L: 427 + Login.currentLoginField = 1; + } + + var32 += 15; // L: 428 + var33 = 361; // L: 429 + if (ChatChannel.field976 != null) { // L: 430 + var34 = ChatChannel.field976.highX / 2; // L: 431 + if (var4 == 1 && var30 >= ChatChannel.field976.lowX - var34 && var30 <= var34 + ChatChannel.field976.lowX && var31 >= var33 - 15 && var31 < var33) { // L: 432 + switch(Login.field907) { // L: 433 + case 1: + class345.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 441 + class126.method2799(5); // L: 442 + return; // L: 443 + case 2: + ScriptEvent.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 436 + } + } + } + + var34 = Decimator.loginBoxCenter - 80; // L: 448 + var35 = 321; // L: 449 + if (var4 == 1 && var30 >= var34 - 75 && var30 <= var34 + 75 && var31 >= var35 - 20 && var31 <= var35 + 20) { // L: 450 + Login.Login_username = Login.Login_username.trim(); // L: 451 + if (Login.Login_username.length() == 0) { // L: 452 + class345.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 453 + return; // L: 454 + } + + if (Login.Login_password.length() == 0) { // L: 456 + class345.setLoginResponseString("", "Please enter your password.", ""); // L: 457 + return; // L: 458 + } + + class345.setLoginResponseString("", "Connecting to server...", ""); // L: 460 + ObjectSound.method1730(false); // L: 461 + PendingSpawn.updateGameState(20); // L: 462 + return; // L: 463 + } + + var34 = Login.loginBoxX + 180 + 80; // L: 465 + if (var4 == 1 && var30 >= var34 - 75 && var30 <= var34 + 75 && var31 >= var35 - 20 && var31 <= var35 + 20) { // L: 466 + class126.method2799(0); // L: 467 + Login.Login_username = ""; // L: 468 + Login.Login_password = ""; // L: 469 + WorldMapCacheName.field2912 = 0; // L: 470 + class92.otp = ""; // L: 471 + Login.field900 = true; // L: 472 + } + + var34 = Decimator.loginBoxCenter + -117; // L: 474 + var35 = 277; // L: 475 + Login.field879 = var30 >= var34 && var30 < var34 + class16.field81 && var31 >= var35 && var31 < var35 + class268.field3212; // L: 476 + if (var4 == 1 && Login.field879) { // L: 477 + Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 478 + if (!Client.Login_isUsernameRemembered && class12.clientPreferences.method2241() != null) { // L: 479 + class12.clientPreferences.method2297((String)null); // L: 480 + } + } + + var34 = Decimator.loginBoxCenter + 24; // L: 483 + var35 = 277; // L: 484 + Login.field881 = var30 >= var34 && var30 < var34 + class16.field81 && var31 >= var35 && var31 < var35 + class268.field3212; // L: 485 + if (var4 == 1 && Login.field881) { // L: 486 + class12.clientPreferences.method2223(!class12.clientPreferences.method2257()); // L: 487 + if (!class12.clientPreferences.method2257()) { // L: 488 + Login.Login_username = ""; // L: 489 + class12.clientPreferences.method2297((String)null); // L: 490 + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 492 + Login.currentLoginField = 1; // L: 493 + } else { + Login.currentLoginField = 0; // L: 496 + } + } + } + + label1340: + while (true) { + int var40; + Transferable var47; + do { + while (true) { + label1256: + do { + while (true) { + while (TaskHandler.isKeyDown()) { // L: 501 + if (class12.field61 != 13) { // L: 502 + if (Login.currentLoginField != 0) { // L: 511 + continue label1256; + } + + char var37 = InvDefinition.field1850; // L: 512 + + for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var37 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11); ++var11) { // L: 514 515 + } + + if (class12.field61 == 85 && Login.Login_username.length() > 0) { // L: 518 + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (class12.field61 == 84 || class12.field61 == 80) { // L: 519 + Login.currentLoginField = 1; + } + + char var38 = InvDefinition.field1850; // L: 521 + boolean var41 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var38) != -1; // L: 523 + if (var41 && Login.Login_username.length() < 320) { // L: 525 + Login.Login_username = Login.Login_username + InvDefinition.field1850; + } + } else { + class126.method2799(0); // L: 503 + Login.Login_username = ""; // L: 504 + Login.Login_password = ""; // L: 505 + WorldMapCacheName.field2912 = 0; // L: 506 + class92.otp = ""; // L: 507 + Login.field900 = true; // L: 508 + } + } + + return; // L: 950 + } + } while(Login.currentLoginField != 1); // L: 527 + + if (class12.field61 == 85 && Login.Login_password.length() > 0) { // L: 528 + Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 529 + } else if (class12.field61 == 84 || class12.field61 == 80) { // L: 531 + Login.currentLoginField = 0; // L: 532 + if (class12.field61 == 84) { // L: 533 + Login.Login_username = Login.Login_username.trim(); // L: 534 + if (Login.Login_username.length() == 0) { // L: 535 + class345.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 536 + return; // L: 537 + } + + if (Login.Login_password.length() == 0) { // L: 539 + class345.setLoginResponseString("", "Please enter your password.", ""); // L: 540 + return; // L: 541 + } + + class345.setLoginResponseString("", "Connecting to server...", ""); // L: 543 + ObjectSound.method1730(false); // L: 544 + PendingSpawn.updateGameState(20); // L: 545 + return; // L: 546 + } + } + + if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && class12.field61 == 67) { // L: 549 + Clipboard var46 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 550 + var47 = var46.getContents(class82.client); // L: 551 + var40 = 20 - Login.Login_password.length(); // L: 552 + break; + } + + char var42 = InvDefinition.field1850; // L: 602 + if ((var42 < ' ' || var42 >= 127) && (var42 <= 127 || var42 >= 160) && (var42 <= 160 || var42 > 255)) { // L: 604 + label1472: { + if (var42 != 0) { // L: 608 + char[] var48 = class341.cp1252AsciiExtension; // L: 610 + + for (int var49 = 0; var49 < var48.length; ++var49) { // L: 611 + char var14 = var48[var49]; // L: 612 + if (var42 == var14) { // L: 614 + var36 = true; // L: 615 + break label1472; // L: 616 + } + } + } + + var36 = false; // L: 622 + } + } else { + var36 = true; // L: 605 + } + + if (var36) { // L: 624 + char var50 = InvDefinition.field1850; // L: 626 + boolean var39 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var50) != -1; // L: 628 + if (var39 && Login.Login_password.length() < 20) { // L: 630 631 + Login.Login_password = Login.Login_password + InvDefinition.field1850; // L: 632 + } + } + } + } while(var40 <= 0); // L: 553 + + try { + String var13 = (String)var47.getTransferData(DataFlavor.stringFlavor); // L: 555 + int var43 = Math.min(var40, var13.length()); // L: 556 + int var15 = 0; + + while (true) { + if (var15 >= var43) { + Login.Login_password = Login.Login_password + var13.substring(0, var43); // L: 594 + continue label1340; + } + + char var17 = var13.charAt(var15); // L: 560 + boolean var16; + if (var17 >= ' ' && var17 < 127 || var17 > 127 && var17 < 160 || var17 > 160 && var17 <= 255) { // L: 562 + var16 = true; // L: 563 + } else { + label1486: { + if (var17 != 0) { // L: 566 + char[] var18 = class341.cp1252AsciiExtension; // L: 568 + + for (int var19 = 0; var19 < var18.length; ++var19) { // L: 569 + char var20 = var18[var19]; // L: 570 + if (var17 == var20) { // L: 572 + var16 = true; // L: 573 + break label1486; // L: 574 + } + } + } + + var16 = false; // L: 580 + } + } + + if (!var16) { // L: 582 + break; + } + + char var45 = var13.charAt(var15); // L: 584 + boolean var23 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var45) != -1; // L: 586 + if (!var23) { // L: 588 + break; + } + + ++var15; // L: 557 + } + + class126.method2799(3); // L: 590 + return; // L: 591 + } catch (UnsupportedFlavorException var28) { // L: 596 + } catch (IOException var29) { // L: 597 + } + } + } else if (Login.loginIndex == 3) { // L: 641 + var32 = Login.loginBoxX + 180; // L: 642 + var8 = 276; // L: 643 + if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 644 + WorldMapData_1.method4706(false); // L: 645 + } + + var32 = Login.loginBoxX + 180; // L: 647 + var8 = 326; // L: 648 + if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 649 + class345.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 650 + class126.method2799(5); // L: 651 + return; // L: 652 + } + } else { + int var10; + if (Login.loginIndex == 4) { // L: 655 + var32 = Login.loginBoxX + 180 - 80; // L: 656 + var8 = 321; // L: 657 + if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 658 + class92.otp.trim(); // L: 659 + if (class92.otp.length() != 6) { // L: 660 + class345.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 661 + return; // L: 662 + } + + WorldMapCacheName.field2912 = Integer.parseInt(class92.otp); // L: 664 + class92.otp = ""; // L: 665 + ObjectSound.method1730(true); // L: 666 + class345.setLoginResponseString("", "Connecting to server...", ""); // L: 667 + PendingSpawn.updateGameState(20); // L: 668 + return; // L: 669 + } + + if (var4 == 1 && var30 >= Login.loginBoxX + 180 - 9 && var30 <= Login.loginBoxX + 180 + 130 && var31 >= 263 && var31 <= 296) { // L: 671 + Login.field900 = !Login.field900; // L: 672 + } + + if (var4 == 1 && var30 >= Login.loginBoxX + 180 - 34 && var30 <= Login.loginBoxX + 34 + 180 && var31 >= 351 && var31 <= 363) { // L: 674 + ScriptEvent.openURL(WorldMapData_1.method4707("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 675 + } + + var32 = Login.loginBoxX + 180 + 80; // L: 677 + if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 678 + class126.method2799(0); // L: 679 + Login.Login_username = ""; // L: 680 + Login.Login_password = ""; // L: 681 + WorldMapCacheName.field2912 = 0; // L: 682 + class92.otp = ""; // L: 683 + } + + while (TaskHandler.isKeyDown()) { // L: 685 + boolean var9 = false; // L: 686 + + for (var10 = 0; var10 < "1234567890".length(); ++var10) { // L: 687 + if (InvDefinition.field1850 == "1234567890".charAt(var10)) { // L: 688 + var9 = true; // L: 689 + break; // L: 690 + } + } + + if (class12.field61 == 13) { // L: 693 + class126.method2799(0); // L: 694 + Login.Login_username = ""; // L: 695 + Login.Login_password = ""; // L: 696 + WorldMapCacheName.field2912 = 0; // L: 697 + class92.otp = ""; // L: 698 + } else { + if (class12.field61 == 85 && class92.otp.length() > 0) { // L: 701 + class92.otp = class92.otp.substring(0, class92.otp.length() - 1); + } + + if (class12.field61 == 84) { // L: 702 + class92.otp.trim(); // L: 703 + if (class92.otp.length() != 6) { // L: 704 + class345.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 705 + return; // L: 706 + } + + WorldMapCacheName.field2912 = Integer.parseInt(class92.otp); // L: 708 + class92.otp = ""; // L: 709 + ObjectSound.method1730(true); // L: 710 + class345.setLoginResponseString("", "Connecting to server...", ""); // L: 711 + PendingSpawn.updateGameState(20); // L: 712 + return; // L: 713 + } + + if (var9 && class92.otp.length() < 6) { // L: 715 + class92.otp = class92.otp + InvDefinition.field1850; + } + } + } + } else if (Login.loginIndex == 5) { // L: 719 + var32 = Login.loginBoxX + 180 - 80; // L: 720 + var8 = 321; // L: 721 + if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 722 + class21.method280(); // L: 723 + return; // L: 724 + } + + var32 = Login.loginBoxX + 180 + 80; // L: 726 + if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 727 + PcmPlayer.Login_promptCredentials(true); // L: 728 + } + + var35 = 361; // L: 730 + if (ChatChannel.field977 != null) { // L: 731 + var10 = ChatChannel.field977.highX / 2; // L: 732 + if (var4 == 1 && var30 >= ChatChannel.field977.lowX - var10 && var30 <= var10 + ChatChannel.field977.lowX && var31 >= var35 - 15 && var31 < var35) { // L: 733 + ScriptEvent.openURL(WorldMapData_1.method4707("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 734 + } + } + + while (TaskHandler.isKeyDown()) { // L: 737 + var36 = false; // L: 738 + + for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { // L: 739 + if (InvDefinition.field1850 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { // L: 740 + var36 = true; // L: 741 + break; // L: 742 + } + } + + if (class12.field61 == 13) { // L: 745 + PcmPlayer.Login_promptCredentials(true); // L: 746 + } else { + if (class12.field61 == 85 && Login.Login_username.length() > 0) { // L: 749 + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (class12.field61 == 84) { // L: 750 + class21.method280(); // L: 751 + return; // L: 752 + } + + if (var36 && Login.Login_username.length() < 320) { // L: 754 + Login.Login_username = Login.Login_username + InvDefinition.field1850; + } + } + } + } else if (Login.loginIndex != 6) { // L: 758 + if (Login.loginIndex == 7) { // L: 769 + if (class92.field1273 && !Client.onMobile) { // L: 770 + var32 = Decimator.loginBoxCenter - 150; // L: 771 + var34 = var32 + 40 + 240 + 25; // L: 772 + var35 = 231; // L: 773 + var10 = var35 + 40; // L: 774 + if (var4 == 1 && var30 >= var32 && var30 <= var34 && var31 >= var35 && var31 <= var10) { // L: 775 + Login.field896 = PcmPlayer.method693(var32, var30); // L: 776 + } + + var11 = Login.loginBoxX + 180 - 80; // L: 778 + short var12 = 321; // L: 779 + boolean var25; + if (var4 == 1 && var30 >= var11 - 75 && var30 <= var11 + 75 && var31 >= var12 - 20 && var31 <= var12 + 20) { // L: 780 + var25 = GraphicsObject.method1867(); // L: 781 + if (var25) { // L: 782 + PendingSpawn.updateGameState(50); // L: 783 + return; // L: 784 + } + } + + var11 = Login.loginBoxX + 180 + 80; // L: 787 + if (var4 == 1 && var30 >= var11 - 75 && var30 <= var11 + 75 && var31 >= var12 - 20 && var31 <= var12 + 20) { // L: 788 + Login.field876 = new String[8]; // L: 789 + PcmPlayer.Login_promptCredentials(true); // L: 790 + } + + while (TaskHandler.isKeyDown()) { // L: 792 + if (class12.field61 == 101) { // L: 793 + Login.field876[Login.field896] = null; // L: 794 + } + + if (class12.field61 == 85) { // L: 796 + if (Login.field876[Login.field896] == null && Login.field896 > 0) { // L: 797 + --Login.field896; // L: 798 + } + + Login.field876[Login.field896] = null; // L: 800 + } + + if (InvDefinition.field1850 >= '0' && InvDefinition.field1850 <= '9') { // L: 802 + Login.field876[Login.field896] = "" + InvDefinition.field1850; // L: 803 + if (Login.field896 < 7) { // L: 804 + ++Login.field896; // L: 805 + } + } + + if (class12.field61 == 84) { // L: 808 + var25 = GraphicsObject.method1867(); // L: 809 + if (var25) { // L: 810 + PendingSpawn.updateGameState(50); // L: 811 + } + + return; // L: 813 + } + } + } else { + var32 = Login.loginBoxX + 180 - 80; // L: 818 + var8 = 321; // L: 819 + if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 820 + ScriptEvent.openURL(WorldMapData_1.method4707("secure", true) + "m=dob/set_dob.ws", true, false); // L: 821 + class345.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 822 + class126.method2799(6); // L: 823 + return; // L: 824 + } + + var32 = Login.loginBoxX + 180 + 80; // L: 826 + if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 827 + PcmPlayer.Login_promptCredentials(true); // L: 828 + } + } + } else if (Login.loginIndex == 8) { // L: 832 + var32 = Login.loginBoxX + 180 - 80; // L: 833 + var8 = 321; // L: 834 + if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 835 + ScriptEvent.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 836 + class345.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 837 + class126.method2799(6); // L: 838 + return; // L: 839 + } + + var32 = Login.loginBoxX + 180 + 80; // L: 841 + if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 842 + PcmPlayer.Login_promptCredentials(true); // L: 843 + } + } else if (Login.loginIndex == 9) { // L: 846 + var32 = Login.loginBoxX + 180; // L: 847 + var8 = 311; // L: 848 + if (class12.field61 == 84 || class12.field61 == 13 || var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 849 + WorldMapData_1.method4706(false); // L: 850 + } + } else if (Login.loginIndex == 10) { // L: 853 + var32 = Login.loginBoxX + 180; // L: 854 + var8 = 209; // L: 855 + if (class12.field61 == 84 || var4 == 1 && var30 >= var32 - 109 && var30 <= var32 + 109 && var31 >= var8 && var31 <= var8 + 68) { // L: 856 + class345.setLoginResponseString("", "Connecting to server...", ""); // L: 857 + Client.field517 = class443.field4730; // L: 858 + ObjectSound.method1730(false); // L: 859 + PendingSpawn.updateGameState(20); // L: 860 + } + } else if (Login.loginIndex == 12) { // L: 863 + var32 = Decimator.loginBoxCenter; // L: 864 + var8 = 233; // L: 865 + Bounds var26 = var1.method6219(0, 30, "terms of use, privacy policy, and end user licence", var32, var8); // L: 866 + Bounds var21 = var1.method6219(32, 32, "terms of use, privacy policy, and end user licence", var32, var8); // L: 867 + Bounds var22 = var1.method6219(70, 34, "terms of use, privacy policy, and end user licence", var32, var8); // L: 868 + var34 = var8 + 17; // L: 869 + Bounds var24 = var1.method6219(0, 34, "agreement (EULA).", var32, var34); // L: 870 + if (var4 == 1) { // L: 871 + if (var26.method6742(var30, var31)) { // L: 872 + ScriptEvent.openURL("https://www.jagex.com/terms", true, false); // L: 873 + } else if (var21.method6742(var30, var31)) { // L: 875 + ScriptEvent.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 876 + } else if (var22.method6742(var30, var31) || var24.method6742(var30, var31)) { // L: 878 + ScriptEvent.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); // L: 879 + } + } + + var32 = Decimator.loginBoxCenter - 80; // L: 882 + var8 = 311; // L: 883 + if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 884 + class12.clientPreferences.method2306(Client.field484); // L: 886 + WorldMapData_1.method4706(true); // L: 888 + } + + var32 = Decimator.loginBoxCenter + 80; // L: 890 + if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 891 + Login.loginIndex = 13; // L: 892 + } + } else if (Login.loginIndex == 13) { // L: 895 + var32 = Decimator.loginBoxCenter; // L: 896 + var8 = 321; // L: 897 + if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 898 + WorldMapData_1.method4706(true); // L: 899 + } + } else if (Login.loginIndex == 14) { // L: 902 + String var27 = ""; // L: 903 + switch(Login.field887) { // L: 904 + case 0: + var27 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 909 + break; // L: 910 + case 1: + var27 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 906 + break; // L: 907 + default: + PcmPlayer.Login_promptCredentials(false); // L: 912 + } + + var34 = Login.loginBoxX + 180; // L: 915 + var35 = 276; // L: 916 + if (var4 == 1 && var30 >= var34 - 75 && var30 <= var34 + 75 && var31 >= var35 - 20 && var31 <= var35 + 20) { // L: 917 + ScriptEvent.openURL(var27, true, false); // L: 918 + class345.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 919 + class126.method2799(6); // L: 920 + return; // L: 921 + } + + var34 = Login.loginBoxX + 180; // L: 923 + var35 = 326; // L: 924 + if (var4 == 1 && var30 >= var34 - 75 && var30 <= var34 + 75 && var31 >= var35 - 20 && var31 <= var35 + 20) { // L: 925 + PcmPlayer.Login_promptCredentials(false); // L: 926 + } + } else if (Login.loginIndex == 24) { // L: 929 + var32 = Login.loginBoxX + 180; // L: 930 + var8 = 301; // L: 931 + if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 932 + WorldMapData_1.method4706(false); // L: 933 + } + } else if (Login.loginIndex == 26) { // L: 936 + var32 = Login.loginBoxX + 180 - 80; // L: 937 + var8 = 321; // L: 938 + if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 939 + ScriptEvent.openURL(WorldMapData_1.method4707("secure", true) + "m=dob/set_dob.ws", true, false); // L: 940 + class345.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 941 + class126.method2799(6); // L: 942 + return; // L: 943 + } + + var32 = Login.loginBoxX + 180 + 80; // L: 945 + if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 946 + PcmPlayer.Login_promptCredentials(true); // L: 947 + } + } + } else { + while (true) { + do { + if (!TaskHandler.isKeyDown()) { // L: 759 + var33 = 321; // L: 764 + if (var4 == 1 && var31 >= var33 - 20 && var31 <= var33 + 20) { // L: 765 + PcmPlayer.Login_promptCredentials(true); // L: 766 + } + + return; + } + } while(class12.field61 != 84 && class12.field61 != 13); // L: 760 + + PcmPlayer.Login_promptCredentials(true); // L: 761 + } + } + } + } } - if (var2 > 0) { // L: 3537 - RawSound var9 = var1.toRawSound().resample(WorldMapRectangle.decimator); // L: 3538 - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var2); // L: 3539 - var10.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); // L: 3540 - StructComposition.pcmStreamMixer.addSubStream(var10); // L: 3541 - } - - Client.queuedSoundEffectDelays[var0] = -100; // L: 3543 } - } else { - --Client.soundEffectCount; // L: 3496 - - for (int var11 = var0; var11 < Client.soundEffectCount; ++var11) { // L: 3497 - Client.soundEffectIds[var11] = Client.soundEffectIds[var11 + 1]; // L: 3498 - Client.soundEffects[var11] = Client.soundEffects[var11 + 1]; // L: 3499 - Client.queuedSoundEffectLoops[var11] = Client.queuedSoundEffectLoops[var11 + 1]; // L: 3500 - Client.queuedSoundEffectDelays[var11] = Client.queuedSoundEffectDelays[var11 + 1]; // L: 3501 - Client.soundLocations[var11] = Client.soundLocations[var11 + 1]; // L: 3502 - } - - --var0; // L: 3504 } } + } // L: 290 - if (Client.playingJingle && !class307.method5789()) { // L: 3546 - if (class131.clientPreferences.method2321() != 0 && Client.currentTrackGroupId != -1) { // L: 3547 - class18.method266(class16.archive6, Client.currentTrackGroupId, 0, class131.clientPreferences.method2321(), false); + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "412461879" + ) + public static final void method2865(int var0, int var1) { + ViewportMouse.ViewportMouse_x = var0; // L: 94 + ViewportMouse.ViewportMouse_y = var1; // L: 95 + ViewportMouse.ViewportMouse_isInViewport = true; // L: 96 + ViewportMouse.ViewportMouse_entityCount = 0; // L: 97 + ViewportMouse.ViewportMouse_false0 = false; // L: 98 + } // L: 99 + + @ObfuscatedName("fz") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "748851559" + ) + static int method2868() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1491 + int var0 = 0; // L: 1492 + + for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1493 + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1494 } - Client.playingJingle = false; // L: 3548 + return var0 * 10000 / Client.field770; // L: 1496 + } else { + return 10000; } - - } // L: 3550 + } } diff --git a/runescape-client/src/main/java/class137.java b/runescape-client/src/main/java/class137.java index 86afc5026b..8af44b9208 100644 --- a/runescape-client/src/main/java/class137.java +++ b/runescape-client/src/main/java/class137.java @@ -1,50 +1,288 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ef") +@ObfuscatedName("eo") public class class137 extends class128 { - @ObfuscatedName("ax") - static String field1573; - @ObfuscatedName("v") - String field1574; + @ObfuscatedName("o") + String field1626; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Les;" + descriptor = "Leh;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Les;)V" + descriptor = "(Leh;)V" ) class137(class131 var1) { this.this$0 = var1; // L: 229 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-413979452" + descriptor = "(Lpx;I)V", + garbageValue = "-611912046" ) - void vmethod3168(Buffer var1) { - this.field1574 = var1.readStringCp1252NullTerminated(); // L: 232 + void vmethod3040(Buffer var1) { + this.field1626 = var1.readStringCp1252NullTerminated(); // L: 232 var1.readInt(); // L: 233 } // L: 234 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lex;S)V", - garbageValue = "-10316" + descriptor = "(Lek;B)V", + garbageValue = "-73" ) - void vmethod3162(ClanSettings var1) { - var1.name = this.field1574; // L: 237 + void vmethod3041(ClanSettings var1) { + var1.name = this.field1626; // L: 237 } // L: 238 - @ObfuscatedName("f") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-66675521" + descriptor = "(IB)Z", + garbageValue = "0" ) - public static boolean method2938(int var0) { - return var0 >= WorldMapDecorationType.field3498.id && var0 <= WorldMapDecorationType.field3518.id; // L: 42 + @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("i") + @ObfuscatedSignature( + descriptor = "(ILbb;ZI)I", + garbageValue = "43434510" + ) + static int method2873(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1882 + class12.Interpreter_intStackSize -= 3; // L: 1883 + WorldMapLabelSize.queueSoundEffect(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]); // L: 1884 + return 1; // L: 1885 + } else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1887 + WorldMapIcon_0.playSong(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1888 + return 1; // L: 1889 + } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1891 + class12.Interpreter_intStackSize -= 2; // L: 1892 + class306.method5593(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]); // L: 1893 + return 1; // L: 1894 + } else { + class83 var3; + class82 var4; + int var5; + int var6; + String var7; + if (var0 != 3212 && var0 != 3213 && var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { // L: 1896 + if (var0 != 3214 && var0 != 3215 && var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { // L: 2008 + return var0 == 3211 ? 1 : 2; // L: 2117 2118 2120 + } else { + var3 = class83.field1088; // L: 2009 + var4 = class82.field1073; // L: 2010 + boolean var8 = false; // L: 2011 + if (var0 == 3214) { // L: 2012 + var6 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2013 + var3 = (class83)class291.findEnumerated(class141.method2962(), var6); // L: 2014 + if (var3 == null) { // L: 2015 + throw new RuntimeException(String.format("Unrecognized device option %d", var6)); // L: 2016 + } + } + + if (var0 == 3215) { // L: 2019 + var6 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2020 + var4 = (class82)class291.findEnumerated(Player.method2159(), var6); // L: 2021 + if (var4 == null) { // L: 2022 + throw new RuntimeException(String.format("Unrecognized game option %d", var6)); // L: 2023 + } + } + + if (var0 == 3210) { // L: 2026 + var6 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2027 + var3 = (class83)class291.findEnumerated(class141.method2962(), var6); // L: 2028 + if (var3 == null) { // L: 2029 + var4 = (class82)class291.findEnumerated(Player.method2159(), var6); // L: 2030 + if (var4 == null) { // L: 2031 + throw new RuntimeException(String.format("Unrecognized client option %d", var6)); // L: 2032 + } + } + } else if (var0 == 3182) { // L: 2036 + var3 = class83.field1092; // L: 2037 + } else if (var0 == 3204) { // L: 2039 + var4 = class82.field1078; // L: 2040 + } else if (var0 == 3206) { // L: 2042 + var4 = class82.field1075; // L: 2043 + } else if (var0 == 3208) { // L: 2045 + var4 = class82.field1076; // L: 2046 + } + + if (var4 == class82.field1073) { // L: 2048 + switch(var3.field1090) { // L: 2049 + case 1: + var5 = class12.clientPreferences.method2257() ? 1 : 0; // L: 2052 + break; + case 2: + var5 = class12.clientPreferences.method2226() ? 1 : 0; // L: 2067 + break; // L: 2068 + case 3: + var5 = class12.clientPreferences.method2229() ? 1 : 0; // L: 2072 + break; // L: 2073 + case 4: + var5 = class12.clientPreferences.method2231(); // L: 2057 + break; // L: 2058 + case 5: + var5 = GameBuild.method5586(); // L: 2077 + break; // L: 2078 + default: + var7 = String.format("Unkown device option: %s.", var3.toString()); // L: 2062 + throw new RuntimeException(var7); // L: 2063 + } + } else { + switch(var4.field1077) { // L: 2083 + case 1: + var5 = class12.clientPreferences.method2222() ? 1 : 0; // L: 2109 + break; + case 2: + var6 = class12.clientPreferences.method2248(); // L: 2097 + var5 = Math.round((float)(var6 * 100) / 255.0F); // L: 2098 + break; // L: 2099 + case 3: + var6 = class12.clientPreferences.method2244(); // L: 2103 + var5 = Math.round((float)(var6 * 100) / 127.0F); // L: 2104 + break; // L: 2105 + case 4: + var6 = class12.clientPreferences.method2239(); // L: 2086 + var5 = Math.round((float)(var6 * 100) / 127.0F); // L: 2087 + break; // L: 2088 + default: + var7 = String.format("Unkown game option: %s.", var4.toString()); // L: 2092 + throw new RuntimeException(var7); // L: 2093 + } + } + + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5; // L: 2114 + return 1; // L: 2115 + } + } else { + var3 = class83.field1088; // L: 1897 + var4 = class82.field1073; // L: 1898 + var5 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1899 + if (var0 == 3212) { // L: 1900 + var6 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1901 + var3 = (class83)class291.findEnumerated(class141.method2962(), var6); // L: 1902 + if (var3 == null) { // L: 1903 + throw new RuntimeException(String.format("Unrecognized device option %d", var6)); // L: 1904 + } + } + + if (var0 == 3213) { // L: 1907 + var6 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1908 + var4 = (class82)class291.findEnumerated(Player.method2159(), var6); // L: 1909 + if (var4 == null) { // L: 1910 + throw new RuntimeException(String.format("Unrecognized game option %d", var6)); // L: 1911 + } + } + + if (var0 == 3209) { // L: 1914 + var6 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1915 + var3 = (class83)class291.findEnumerated(class141.method2962(), var6); // L: 1916 + if (var3 == null) { // L: 1917 + var4 = (class82)class291.findEnumerated(Player.method2159(), var6); // L: 1918 + if (var4 == null) { // L: 1919 + throw new RuntimeException(String.format("Unrecognized client option %d", var6)); // L: 1920 + } + } + } else if (var0 == 3181) { // L: 1924 + var3 = class83.field1092; // L: 1925 + } else if (var0 == 3203) { // L: 1927 + var4 = class82.field1078; // L: 1928 + } else if (var0 == 3205) { // L: 1930 + var4 = class82.field1075; // L: 1931 + } else if (var0 == 3207) { // L: 1933 + var4 = class82.field1076; // L: 1934 + } + + if (var4 == class82.field1073) { // L: 1936 + switch(var3.field1090) { // L: 1937 + case 1: + class12.clientPreferences.method2223(var5 == 1); // L: 1961 + break; // L: 1962 + case 2: + class12.clientPreferences.method2305(var5 == 1); // L: 1966 + break; // L: 1967 + case 3: + class12.clientPreferences.method2227(var5 == 1); // L: 1940 + break; + case 4: + if (var5 < 0) { // L: 1955 + var5 = 0; + } + + class12.clientPreferences.method2230(var5); // L: 1956 + break; // L: 1957 + case 5: + World.method1664(var5); // L: 1945 + break; // L: 1946 + default: + var7 = String.format("Unkown device option: %s.", var3.toString()); // L: 1950 + throw new RuntimeException(var7); // L: 1951 + } + } else { + switch(var4.field1077) { // L: 1972 + case 1: + class12.clientPreferences.method2219(var5 == 1); // L: 1994 + break; // L: 1995 + case 2: + var5 = Math.min(Math.max(var5, 0), 100); // L: 1980 + var6 = Math.round((float)(var5 * 255) / 100.0F); // L: 1981 + class291.method5390(var6); // L: 1982 + break; // L: 1983 + case 3: + var5 = Math.min(Math.max(var5, 0), 100); // L: 1987 + var6 = Math.round((float)(var5 * 127) / 100.0F); // L: 1988 + class67.method1881(var6); // L: 1989 + break; // L: 1990 + case 4: + var5 = Math.min(Math.max(var5, 0), 100); // L: 1999 + var6 = Math.round((float)(var5 * 127) / 100.0F); // L: 2000 + MouseHandler.method591(var6); // L: 2001 + break; // L: 2002 + default: + var7 = String.format("Unkown game option: %s.", var4.toString()); // L: 1975 + throw new RuntimeException(var7); // L: 1976 + } + } + + return 1; // L: 2006 + } + } + } + + @ObfuscatedName("gm") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "2079145454" + ) + @Export("addNpcsToScene") + static final void addNpcsToScene(boolean var0) { + for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4982 + NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 4983 + if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 4984 + int var3 = var2.x >> 7; // L: 4985 + int var4 = var2.y >> 7; // L: 4986 + if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 4987 + if (var2.field1167 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 4988 + if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 4989 + continue; + } + + Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 4990 + } + + long var5 = VarbitComposition.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 4992 + var2.playerCycle = Client.cycle; // L: 4993 + class175.scene.drawEntity(class128.Client_plane, var2.x, var2.y, class202.getTileHeight(var2.field1167 * 64 - 64 + var2.x, var2.field1167 * 64 - 64 + var2.y, class128.Client_plane), var2.field1167 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 4994 + } + } + } + + } // L: 4998 } diff --git a/runescape-client/src/main/java/class138.java b/runescape-client/src/main/java/class138.java index 40b292c387..83d63b7191 100644 --- a/runescape-client/src/main/java/class138.java +++ b/runescape-client/src/main/java/class138.java @@ -2,227 +2,109 @@ 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("eo") +@ObfuscatedName("ec") public class class138 extends class128 { - @ObfuscatedName("ly") - @ObfuscatedSignature( - descriptor = "Lit;" - ) - @Export("textureProvider") - static TextureProvider textureProvider; - @ObfuscatedName("mz") + @ObfuscatedName("hs") + @Export("xteaKeys") + static int[][] xteaKeys; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1603030107 + intValue = -1158452921 ) - @Export("menuX") - static int menuX; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -1526195035 - ) - int field1580; - @ObfuscatedName("c") - String field1576; + int field1629; + @ObfuscatedName("q") + String field1627; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Les;" + descriptor = "Leh;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Les;)V" + descriptor = "(Leh;)V" ) class138(class131 var1) { this.this$0 = var1; // L: 323 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-413979452" + descriptor = "(Lpx;I)V", + garbageValue = "-611912046" ) - void vmethod3168(Buffer var1) { - this.field1580 = var1.readInt(); // L: 326 - this.field1576 = var1.readStringCp1252NullTerminated(); // L: 327 + void vmethod3040(Buffer var1) { + this.field1629 = var1.readInt(); // L: 326 + this.field1627 = var1.readStringCp1252NullTerminated(); // L: 327 } // L: 328 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lex;S)V", - garbageValue = "-10316" + descriptor = "(Lek;B)V", + garbageValue = "-73" ) - void vmethod3162(ClanSettings var1) { - var1.method2971(this.field1580, this.field1576); // L: 331 + void vmethod3041(ClanSettings var1) { + var1.method2900(this.field1629, this.field1627); // L: 331 } // L: 332 - @ObfuscatedName("ju") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lky;IIS)V", - garbageValue = "-3167" + descriptor = "(ILbb;ZI)I", + garbageValue = "1258686923" ) - @Export("Widget_addToMenu") - static final void Widget_addToMenu(Widget var0, int var1, int var2) { - if (var0.buttonType == 1) { // L: 11027 - class21.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 11028 + static int method2880(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 1130 + if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1131 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1132 + return 1; // L: 1133 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1135 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1136 + return 1; // L: 1137 + } else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1139 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3.text; // L: 1140 + return 1; // L: 1141 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1143 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1144 + return 1; // L: 1145 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1147 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1148 + return 1; // L: 1149 + } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1151 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1152 + return 1; // L: 1153 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1155 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1156 + return 1; // L: 1157 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1159 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1160 + return 1; // L: 1161 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1163 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1164 + return 1; // L: 1165 + } else if (var0 == ScriptOpcodes.CC_GETTRANS) { // L: 1167 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1168 + return 1; // L: 1169 + } else if (var0 == 1610) { // L: 1171 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1172 + return 1; // L: 1173 + } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1175 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.color; // L: 1176 + return 1; // L: 1177 + } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1179 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.color2; // L: 1180 + return 1; // L: 1181 + } else if (var0 == 1613) { // L: 1183 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1184 + return 1; // L: 1185 + } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1187 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1188 + return 1; // L: 1189 + } else if (var0 != 1615 && var0 != 1616) { // L: 1191 + return 2; // L: 1195 + } else { + ++class12.Interpreter_intStackSize; // L: 1192 + return 1; // L: 1193 } - - String var3; - if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 11031 - var3 = class152.Widget_getSpellActionName(var0); // L: 11032 - if (var3 != null) { // L: 11033 - class21.insertMenuItemNoShift(var3, UserComparator9.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 11034 - } - } - - if (var0.buttonType == 3) { // L: 11038 - class21.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 11039 - } - - if (var0.buttonType == 4) { // L: 11042 - class21.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 11043 - } - - if (var0.buttonType == 5) { // L: 11046 - class21.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 11047 - } - - if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 11050 - class21.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 11051 - } - - int var4; - int var5; - int var13; - if (var0.type == 2) { // L: 11054 - var13 = 0; // L: 11055 - - for (var4 = 0; var4 < var0.height; ++var4) { // L: 11056 - for (var5 = 0; var5 < var0.width; ++var5) { // L: 11057 - int var6 = (var0.paddingX + 32) * var5; // L: 11058 - int var7 = (var0.paddingY + 32) * var4; // L: 11059 - if (var13 < 20) { // L: 11060 - var6 += var0.inventoryXOffsets[var13]; // L: 11061 - var7 += var0.inventoryYOffsets[var13]; // L: 11062 - } - - if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { // L: 11064 - Client.dragItemSlotDestination = var13; // L: 11065 - GrandExchangeEvent.hoveredItemContainer = var0; // L: 11066 - if (var0.itemIds[var13] > 0) { // L: 11067 - ItemComposition var8 = class19.ItemDefinition_get(var0.itemIds[var13] - 1); // L: 11068 - if (Client.isItemSelected == 1 && class150.method3149(class326.getWidgetFlags(var0))) { // L: 11069 - if (var0.id != TaskHandler.selectedItemWidget || var13 != class432.selectedItemSlot) { // L: 11070 - class21.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator9.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id); // L: 11071 - } - } else if (Client.isSpellSelected && class150.method3149(class326.getWidgetFlags(var0))) { // L: 11075 - if ((class17.selectedSpellFlags & 16) == 16) { // L: 11076 - class21.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator9.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id); // L: 11077 - } - } else { - String[] var9 = var8.inventoryActions; // L: 11082 - int var10 = -1; // L: 11083 - if (Client.shiftClickDrop && class168.method3351()) { // L: 11084 - var10 = var8.getShiftClickIndex(); // L: 11085 - } - - int var11; - if (class150.method3149(class326.getWidgetFlags(var0))) { // L: 11087 - for (var11 = 4; var11 >= 3; --var11) { // L: 11088 - if (var10 != var11) { // L: 11089 - class65.addWidgetItemMenuItem(var0, var8, var13, var11, false); // L: 11090 - } - } - } - - if (UserComparator10.method2629(class326.getWidgetFlags(var0))) { // L: 11093 - class21.insertMenuItemNoShift("Use", UserComparator9.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id); // L: 11094 - } - - if (class150.method3149(class326.getWidgetFlags(var0))) { // L: 11097 - for (var11 = 2; var11 >= 0; --var11) { // L: 11098 - if (var11 != var10) { // L: 11099 - class65.addWidgetItemMenuItem(var0, var8, var13, var11, false); // L: 11100 - } - } - - if (var10 >= 0) { // L: 11102 - class65.addWidgetItemMenuItem(var0, var8, var13, var10, true); // L: 11103 - } - } - - var9 = var0.itemActions; // L: 11106 - if (var9 != null) { // L: 11107 - for (var11 = 4; var11 >= 0; --var11) { // L: 11108 - if (var9[var11] != null) { // L: 11109 - byte var12 = 0; // L: 11110 - if (var11 == 0) { // L: 11111 - var12 = 39; - } - - if (var11 == 1) { // L: 11112 - var12 = 40; - } - - if (var11 == 2) { // L: 11113 - var12 = 41; - } - - if (var11 == 3) { // L: 11114 - var12 = 42; - } - - if (var11 == 4) { // L: 11115 - var12 = 43; - } - - class21.insertMenuItemNoShift(var9[var11], UserComparator9.colorStartTag(16748608) + var8.name, var12, var8.id, var13, var0.id); // L: 11116 - } - } - } - - class21.insertMenuItemNoShift("Examine", UserComparator9.colorStartTag(16748608) + var8.name, 1005, var8.id, var13, var0.id); // L: 11121 - } - } - } - - ++var13; // L: 11126 - } - } - } - - if (var0.isIf3) { // L: 11130 - if (Client.isSpellSelected) { // L: 11131 - if (PacketWriter.method2498(class326.getWidgetFlags(var0)) && (class17.selectedSpellFlags & 32) == 32) { // L: 11132 - class21.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 11133 - } - } else { - for (var13 = 9; var13 >= 5; --var13) { // L: 11138 - String var15 = class358.method6583(var0, var13); // L: 11139 - if (var15 != null) { // L: 11140 - class21.insertMenuItemNoShift(var15, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); // L: 11141 - } - } - - var3 = class152.Widget_getSpellActionName(var0); // L: 11145 - if (var3 != null) { // L: 11146 - class21.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 11147 - } - - for (var4 = 4; var4 >= 0; --var4) { // L: 11150 - String var14 = class358.method6583(var0, var4); // L: 11151 - if (var14 != null) { // L: 11152 - class28.insertMenuItem(var14, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 11153 - } - } - - var5 = class326.getWidgetFlags(var0); // L: 11158 - boolean var16 = (var5 & 1) != 0; // L: 11160 - if (var16) { // L: 11162 - class21.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 11163 - } - } - } - - } // L: 11168 + } } diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java index f413bc1a44..0662f48a5b 100644 --- a/runescape-client/src/main/java/class14.java +++ b/runescape-client/src/main/java/class14.java @@ -2,126 +2,75 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("d") +@ObfuscatedName("t") public class class14 { - @ObfuscatedName("b") - @Export("Tiles_overlays") - static byte[][][] Tiles_overlays; - @ObfuscatedName("ia") - @ObfuscatedSignature( - descriptor = "Lqi;" - ) - @Export("compass") - static SpritePixels compass; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 225446733 + intValue = 93944069 ) - final int field73; - @ObfuscatedName("c") - final String field69; - @ObfuscatedName("i") - final ThreadFactory field75; - @ObfuscatedName("f") - final ThreadPoolExecutor field71; + final int field76; + @ObfuscatedName("q") + final String field74; + @ObfuscatedName("l") + final ThreadFactory field73; + @ObfuscatedName("k") + final ThreadPoolExecutor field77; public class14(String var1, int var2, int var3) { - this.field69 = var1; // L: 15 - this.field73 = var2; // L: 16 - this.field75 = new class16(this); // L: 17 - this.field71 = this.method165(var3); // L: 18 + this.field74 = var1; // L: 15 + this.field76 = var2; // L: 16 + this.field73 = new class16(this); // L: 17 + this.field77 = this.method164(var3); // L: 18 } // L: 19 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)Ljava/util/concurrent/ThreadPoolExecutor;", - garbageValue = "-61" + descriptor = "(II)Ljava/util/concurrent/ThreadPoolExecutor;", + garbageValue = "-398664409" ) - final ThreadPoolExecutor method165(int var1) { - return new ThreadPoolExecutor(var1, var1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(this.field73), this.field75); // L: 22 + final ThreadPoolExecutor method164(int var1) { + return new ThreadPoolExecutor(var1, var1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(this.field76), this.field73); // L: 22 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lr;B)Lx;", - garbageValue = "3" + descriptor = "(Ly;I)Lh;", + garbageValue = "-344605411" ) - public class19 method166(class10 var1) { - if (this.field71.getQueue().remainingCapacity() <= 0) { // L: 26 - System.err.println("REST thread pool queue is empty\r\nThread pool size " + this.field71.getCorePoolSize() + " Queue capacity " + this.field73); // L: 27 + public class19 method160(class10 var1) { + if (this.field77.getQueue().remainingCapacity() <= 0) { // L: 26 + System.err.println("REST thread pool queue is empty\r\nThread pool size " + this.field77.getCorePoolSize() + " Queue capacity " + this.field76); // L: 27 return new class19("Queue full"); // L: 28 } else { - class19 var2 = new class19(this.field71.submit(new class20(this, var1))); // L: 30 + class19 var2 = new class19(this.field77.submit(new class20(this, var1))); // L: 30 return var2; // L: 31 } } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-31" + descriptor = "(I)V", + garbageValue = "-1785406977" ) - public final void method167() { + public final void method161() { try { - this.field71.shutdown(); // L: 36 + this.field77.shutdown(); // L: 36 } catch (Exception var2) { // L: 38 System.err.println("Error shutting down RestRequestService\r\n" + var2); // L: 39 } } // L: 41 - @ObfuscatedName("gi") + @ObfuscatedName("jo") @ObfuscatedSignature( - descriptor = "(Lky;III)V", - garbageValue = "-1754195222" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "1828837420" ) - @Export("checkIfMinimapClicked") - static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { - if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 3641 - if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !GameBuild.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 3642 - SpriteMask var3 = var0.getSpriteMask(true); // L: 3643 - if (var3 == null) { // L: 3644 - return; - } - - int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 3645 - int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 3646 - if (var3.contains(var4, var5)) { // L: 3647 - var4 -= var3.width / 2; // L: 3648 - var5 -= var3.height / 2; // L: 3649 - int var6 = Client.camAngleY & 2047; // L: 3650 - int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 3651 - int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 3652 - int var9 = var7 * var5 + var4 * var8 >> 11; // L: 3653 - int var10 = var5 * var8 - var7 * var4 >> 11; // L: 3654 - int var11 = var9 + GrandExchangeEvents.localPlayer.x >> 7; // L: 3655 - int var12 = GrandExchangeEvents.localPlayer.y - var10 >> 7; // L: 3656 - PacketBufferNode var13 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2910, Client.packetWriter.isaacCipher); // L: 3658 - var13.packetBuffer.writeByte(18); // L: 3659 - var13.packetBuffer.method7710(var11 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 3660 - var13.packetBuffer.writeShort(var12 + VarcInt.baseY); // L: 3661 - var13.packetBuffer.method7703(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3662 - var13.packetBuffer.writeByte(var4); // L: 3663 - var13.packetBuffer.writeByte(var5); // L: 3664 - var13.packetBuffer.writeShort(Client.camAngleY); // L: 3665 - var13.packetBuffer.writeByte(57); // L: 3666 - var13.packetBuffer.writeByte(0); // L: 3667 - var13.packetBuffer.writeByte(0); // L: 3668 - var13.packetBuffer.writeByte(89); // L: 3669 - var13.packetBuffer.writeShort(GrandExchangeEvents.localPlayer.x); // L: 3670 - var13.packetBuffer.writeShort(GrandExchangeEvents.localPlayer.y); // L: 3671 - var13.packetBuffer.writeByte(63); // L: 3672 - Client.packetWriter.addNode(var13); // L: 3673 - Client.destinationX = var11; // L: 3674 - Client.destinationY = var12; // L: 3675 - } - } - - } - } // L: 3678 + static final String method165(int var0) { + return var0 < 999999999 ? Integer.toString(var0) : "*"; // L: 10881 10882 + } } diff --git a/runescape-client/src/main/java/class140.java b/runescape-client/src/main/java/class140.java index 3afa72e997..ef6b72e8bf 100644 --- a/runescape-client/src/main/java/class140.java +++ b/runescape-client/src/main/java/class140.java @@ -2,82 +2,76 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eq") +@ObfuscatedName("ed") public class class140 extends class144 { - @ObfuscatedName("v") - String field1613; - @ObfuscatedName("c") + @ObfuscatedName("jv") @ObfuscatedGetter( - intValue = 127019119 + intValue = 2112481743 ) - int field1615; - @ObfuscatedName("i") - byte field1612; + static int field1666; + @ObfuscatedName("o") + String field1664; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 185909857 + ) + int field1661; + @ObfuscatedName("l") + byte field1662; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Lee;" ) final class145 this$0; @ObfuscatedSignature( - descriptor = "(Ler;)V" + descriptor = "(Lee;)V" ) class140(class145 var1) { this.this$0 = var1; - this.field1613 = null; // L: 55 + this.field1664 = null; // L: 55 } // L: 59 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "23" + descriptor = "(Lpx;I)V", + garbageValue = "1212008489" ) - void vmethod3152(Buffer var1) { + void vmethod3037(Buffer var1) { if (var1.readUnsignedByte() != 255) { // L: 62 --var1.offset; // L: 63 var1.readLong(); // L: 64 } - this.field1613 = var1.readStringCp1252NullTerminatedOrNull(); // L: 66 - this.field1615 = var1.readUnsignedShort(); // L: 67 - this.field1612 = var1.readByte(); // L: 68 + this.field1664 = var1.readStringCp1252NullTerminatedOrNull(); // L: 66 + this.field1661 = var1.readUnsignedShort(); // L: 67 + this.field1662 = var1.readByte(); // L: 68 var1.readLong(); // L: 69 } // L: 70 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lea;I)V", - garbageValue = "1764669808" + descriptor = "(Let;I)V", + garbageValue = "1640110130" ) - void vmethod3153(ClanChannel var1) { + void vmethod3032(ClanChannel var1) { ClanChannelMember var2 = new ClanChannelMember(); // L: 73 - var2.username = new Username(this.field1613); // L: 74 - var2.world = this.field1615; // L: 75 - var2.rank = this.field1612; // L: 76 + var2.username = new Username(this.field1664); // L: 74 + var2.world = this.field1661; // L: 75 + var2.rank = this.field1662; // L: 76 var1.addMember(var2); // L: 77 } // L: 78 - @ObfuscatedName("f") + @ObfuscatedName("gs") @ObfuscatedSignature( - descriptor = "(I)[Ldi;", - garbageValue = "1379522153" + descriptor = "(I)V", + garbageValue = "-1349623910" ) - static class116[] method3045() { - return new class116[]{class116.field1403, class116.field1399, class116.field1400, class116.field1406, class116.field1401}; // L: 130 - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(CII)Ljava/lang/String;", - garbageValue = "1078157971" - ) - public static String method3040(char var0, int var1) { - char[] var2 = new char[var1]; // L: 169 - - for (int var3 = 0; var3 < var1; ++var3) { // L: 170 - var2[var3] = var0; - } - - return new String(var2); // L: 171 - } + static void method2951() { + PacketBufferNode var0 = WallDecoration.getPacketBufferNode(ClientPacket.field3054, Client.packetWriter.isaacCipher); // L: 4366 + var0.packetBuffer.writeByte(ClanChannelMember.getWindowedMode()); // L: 4367 + var0.packetBuffer.writeShort(GraphicsObject.canvasWidth); // L: 4368 + var0.packetBuffer.writeShort(class433.canvasHeight); // L: 4369 + Client.packetWriter.addNode(var0); // L: 4370 + } // L: 4371 } diff --git a/runescape-client/src/main/java/class141.java b/runescape-client/src/main/java/class141.java index 9a2222bde5..d8e59dcbc7 100644 --- a/runescape-client/src/main/java/class141.java +++ b/runescape-client/src/main/java/class141.java @@ -1,61 +1,119 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ed") +@ObfuscatedName("ew") public class class141 extends class144 { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -705325855 + intValue = -390226113 ) - int field1616; - @ObfuscatedName("c") - byte field1617; - @ObfuscatedName("i") + int field1670; + @ObfuscatedName("q") + byte field1668; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1660871845 + intValue = 1954797197 ) - int field1618; - @ObfuscatedName("f") - String field1619; + int field1669; + @ObfuscatedName("k") + String field1671; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Lee;" ) final class145 this$0; @ObfuscatedSignature( - descriptor = "(Ler;)V" + descriptor = "(Lee;)V" ) class141(class145 var1) { this.this$0 = var1; - this.field1616 = -1; // L: 125 + this.field1670 = -1; // L: 125 } // L: 130 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "23" + descriptor = "(Lpx;I)V", + garbageValue = "1212008489" ) - void vmethod3152(Buffer var1) { + void vmethod3037(Buffer var1) { var1.readUnsignedByte(); // L: 133 - this.field1616 = var1.readUnsignedShort(); // L: 134 - this.field1617 = var1.readByte(); // L: 135 - this.field1618 = var1.readUnsignedShort(); // L: 136 + this.field1670 = var1.readUnsignedShort(); // L: 134 + this.field1668 = var1.readByte(); // L: 135 + this.field1669 = var1.readUnsignedShort(); // L: 136 var1.readLong(); // L: 137 - this.field1619 = var1.readStringCp1252NullTerminated(); // L: 138 + this.field1671 = var1.readStringCp1252NullTerminated(); // L: 138 var1.readUnsignedByte(); // L: 139 } // L: 140 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lea;I)V", - garbageValue = "1764669808" + descriptor = "(Let;I)V", + garbageValue = "1640110130" ) - void vmethod3153(ClanChannel var1) { - ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1616); // L: 143 - var2.rank = this.field1617; // L: 144 - var2.world = this.field1618; // L: 145 - var2.username = new Username(this.field1619); // L: 146 + void vmethod3032(ClanChannel var1) { + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1670); // L: 143 + var2.rank = this.field1668; // L: 144 + var2.world = this.field1669; // L: 145 + var2.username = new Username(this.field1671); // L: 146 } // L: 147 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(B)[Lcm;", + garbageValue = "-33" + ) + static class83[] method2962() { + return new class83[]{class83.field1087, class83.field1088, class83.field1092, class83.field1084, class83.field1086, class83.field1083}; // L: 17 + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(IB)Lgt;", + garbageValue = "19" + ) + @Export("getFrames") + static Frames getFrames(int var0) { + Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 316 + if (var1 != null) { // L: 317 + return var1; + } else { + AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; // L: 319 + AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive; // L: 320 + boolean var5 = true; // L: 322 + int[] var6 = var3.getGroupFileIds(var0); // L: 323 + + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 324 + byte[] var8 = var3.getFile(var0, var6[var7]); // L: 325 + if (var8 == null) { // L: 326 + var5 = false; // L: 327 + } else { + int var9 = (var8[0] & 255) << 8 | var8[1] & 255; // L: 330 + byte[] var10 = var4.getFile(var9, 0); // L: 333 + if (var10 == null) { // L: 334 + var5 = false; + } + } + } + + Frames var2; + if (!var5) { // L: 336 + var2 = null; // L: 337 + } else { + try { + var2 = new Frames(var3, var4, var0, false); // L: 341 + } catch (Exception var12) { // L: 343 + var2 = null; // L: 344 + } + } + + if (var2 != null) { // L: 348 + SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0); + } + + return var2; // L: 349 + } + } } diff --git a/runescape-client/src/main/java/class142.java b/runescape-client/src/main/java/class142.java index c84fcd397f..44c0473794 100644 --- a/runescape-client/src/main/java/class142.java +++ b/runescape-client/src/main/java/class142.java @@ -1,50 +1,64 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ek") +@ObfuscatedName("ev") public class class142 extends class128 { - @ObfuscatedName("ke") - @ObfuscatedSignature( - descriptor = "Lky;" - ) - @Export("dragInventoryWidget") - static Widget dragInventoryWidget; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1140726439 + intValue = 12867453 ) - int field1623; + int field1676; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Les;" + descriptor = "Leh;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Les;)V" + descriptor = "(Leh;)V" ) class142(class131 var1) { this.this$0 = var1; - this.field1623 = -1; // L: 213 + this.field1676 = -1; // L: 213 } // L: 215 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-413979452" + descriptor = "(Lpx;I)V", + garbageValue = "-611912046" ) - void vmethod3168(Buffer var1) { - this.field1623 = var1.readUnsignedShort(); // L: 218 + void vmethod3040(Buffer var1) { + this.field1676 = var1.readUnsignedShort(); // L: 218 } // L: 219 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lex;S)V", - garbageValue = "-10316" + descriptor = "(Lek;B)V", + garbageValue = "-73" ) - void vmethod3162(ClanSettings var1) { - var1.method2963(this.field1623); // L: 222 + void vmethod3041(ClanSettings var1) { + var1.method2892(this.field1676); // L: 222 } // L: 223 + + @ObfuscatedName("li") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1893570048" + ) + static final void method2967(int var0, int var1) { + if (Client.currentClanChannels[var0] != null) { // L: 12477 + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method3005()) { // L: 12478 + ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 12479 + if (var2.rank == -1) { // L: 12480 + PacketBufferNode var3 = WallDecoration.getPacketBufferNode(ClientPacket.field2958, Client.packetWriter.isaacCipher); // L: 12481 + var3.packetBuffer.writeByte(3 + class392.stringCp1252NullTerminatedByteSize(var2.username.getName())); // L: 12482 + var3.packetBuffer.writeByte(var0); // L: 12483 + var3.packetBuffer.writeShort(var1); // L: 12484 + var3.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); // L: 12485 + Client.packetWriter.addNode(var3); // L: 12486 + } + } + } + } // L: 12487 } diff --git a/runescape-client/src/main/java/class143.java b/runescape-client/src/main/java/class143.java index 92eba48e09..e5c6e258fe 100644 --- a/runescape-client/src/main/java/class143.java +++ b/runescape-client/src/main/java/class143.java @@ -1,127 +1,227 @@ +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("eb") +@ObfuscatedName("el") public class class143 extends class128 { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = -5266391678876425789L + longValue = -5075875744694294941L ) - long field1627; - @ObfuscatedName("c") - String field1626; - @ObfuscatedName("i") + long field1679; + @ObfuscatedName("q") + String field1680; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 386086251 + intValue = -130404941 ) - int field1625; + int field1678; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Les;" + descriptor = "Leh;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Les;)V" + descriptor = "(Leh;)V" ) class143(class131 var1) { this.this$0 = var1; - this.field1627 = -1L; // L: 93 - this.field1626 = null; // L: 94 - this.field1625 = 0; // L: 95 + this.field1679 = -1L; + this.field1680 = null; + this.field1678 = 0; } // L: 97 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-413979452" + descriptor = "(Lpx;I)V", + garbageValue = "-611912046" ) - void vmethod3168(Buffer var1) { - if (var1.readUnsignedByte() != 255) { // L: 100 - --var1.offset; // L: 101 - this.field1627 = var1.readLong(); // L: 102 + void vmethod3040(Buffer var1) { + if (var1.readUnsignedByte() != 255) { + --var1.offset; + this.field1679 = var1.readLong(); } - this.field1626 = var1.readStringCp1252NullTerminatedOrNull(); // L: 104 - this.field1625 = var1.readUnsignedShort(); // L: 105 - } // L: 106 + this.field1680 = var1.readStringCp1252NullTerminatedOrNull(); + this.field1678 = var1.readUnsignedShort(); + } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lex;S)V", - garbageValue = "-10316" + descriptor = "(Lek;B)V", + garbageValue = "-73" ) - void vmethod3162(ClanSettings var1) { - var1.method2959(this.field1627, this.field1626, this.field1625); // L: 109 - } // L: 110 + void vmethod3041(ClanSettings var1) { + var1.method2888(this.field1679, this.field1680, this.field1678); // L: 109 + } - @ObfuscatedName("n") + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(JLjava/lang/String;I)I", + garbageValue = "-1230431234" + ) + static final int method2972(long var0, String var2) { + Random var3 = new Random(); // L: 35 + Buffer var4 = new Buffer(128); // L: 36 + Buffer var5 = new Buffer(128); // L: 37 + int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; // L: 38 39 40 41 42 + var4.writeByte(10); // L: 43 + + int var7; + for (var7 = 0; var7 < 4; ++var7) { // L: 44 + var4.writeInt(var3.nextInt()); // L: 45 + } + + var4.writeInt(var6[0]); // L: 47 + var4.writeInt(var6[1]); // L: 48 + var4.writeLong(var0); // L: 49 + var4.writeLong(0L); // L: 50 + + for (var7 = 0; var7 < 4; ++var7) { // L: 51 + var4.writeInt(var3.nextInt()); // L: 52 + } + + var4.encryptRsa(class65.field854, class65.field862); // L: 54 + var5.writeByte(10); // L: 55 + + for (var7 = 0; var7 < 3; ++var7) { // L: 56 + var5.writeInt(var3.nextInt()); // L: 57 + } + + var5.writeLong(var3.nextLong()); // L: 59 + var5.writeLongMedium(var3.nextLong()); // L: 60 + IntHashTable.method8124(var5); // L: 61 + var5.writeLong(var3.nextLong()); // L: 62 + var5.encryptRsa(class65.field854, class65.field862); // L: 63 + var7 = class392.stringCp1252NullTerminatedByteSize(var2); // L: 64 + if (var7 % 8 != 0) { // L: 65 + var7 += 8 - var7 % 8; + } + + Buffer var8 = new Buffer(var7); // L: 66 + var8.writeStringCp1252NullTerminated(var2); // L: 67 + var8.offset = var7; // L: 68 + var8.xteaEncryptAll(var6); // L: 69 + Buffer var9 = new Buffer(var8.offset + var5.offset + var4.offset + 5); // L: 70 + var9.writeByte(2); // L: 71 + var9.writeByte(var4.offset); // L: 72 + var9.writeBytes(var4.array, 0, var4.offset); // L: 73 + var9.writeByte(var5.offset); // L: 74 + var9.writeBytes(var5.array, 0, var5.offset); // L: 75 + var9.writeShort(var8.offset); // L: 76 + var9.writeBytes(var8.array, 0, var8.offset); // L: 77 + String var10 = class119.method2745(var9.array); // L: 78 + + try { + URL var11 = new URL(WorldMapData_1.method4707("services", false) + "m=accountappeal/login.ws"); // L: 80 + URLConnection var12 = var11.openConnection(); // L: 81 + var12.setDoInput(true); // L: 82 + var12.setDoOutput(true); // L: 83 + var12.setConnectTimeout(5000); // L: 84 + OutputStreamWriter var13 = new OutputStreamWriter(var12.getOutputStream()); + var13.write("data2=" + UserComparator6.method2619(var10) + "&dest=" + UserComparator6.method2619("passwordchoice.ws")); + var13.flush(); + InputStream var14 = var12.getInputStream(); + var9 = new Buffer(new byte[1000]); // L: 89 + + do { + int var15 = var14.read(var9.array, var9.offset, 1000 - var9.offset); + if (var15 == -1) { + var13.close(); + var14.close(); + String var18 = new String(var9.array); + if (var18.startsWith("OFFLINE")) { // L: 101 + return 4; + } else if (var18.startsWith("WRONG")) { + return 7; // L: 105 + } else if (var18.startsWith("RELOAD")) { // L: 107 + return 3; // L: 108 + } else if (var18.startsWith("Not permitted for social network accounts.")) { // L: 110 + return 6; // L: 111 + } else { + var9.xteaDecryptAll(var6); // L: 113 + + while (var9.offset > 0 && var9.array[var9.offset - 1] == 0) { // L: 114 + --var9.offset; // L: 115 + } + + var18 = new String(var9.array, 0, var9.offset); // L: 117 + boolean var16; + if (var18 == null) { // L: 120 + var16 = false; // L: 121 + } else { + label83: { + try { + new URL(var18); + } catch (MalformedURLException var19) { // L: 127 + var16 = false; // L: 128 + break label83; // L: 129 + } + + var16 = true; // L: 131 + } + } + + if (var16) { // L: 133 + ScriptEvent.openURL(var18, true, false); // L: 134 + return 2; // L: 135 + } else { + return 5; // L: 137 + } + } + } + + var9.offset += var15; // L: 93 + } while(var9.offset < 1000); + + return 5; + } catch (Throwable var20) { // L: 139 + var20.printStackTrace(); // L: 140 + return 5; // L: 141 + } + } + + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IB)I", - garbageValue = "34" + garbageValue = "-53" ) @Export("iLog") public static int iLog(int var0) { - int var1 = 0; // L: 60 - if (var0 < 0 || var0 >= 65536) { // L: 61 - var0 >>>= 16; // L: 62 - var1 += 16; // L: 63 + int var1 = 0; // L: 85 + if (var0 < 0 || var0 >= 65536) { // L: 86 + var0 >>>= 16; // L: 87 + var1 += 16; // L: 88 } - if (var0 >= 256) { // L: 65 - var0 >>>= 8; // L: 66 - var1 += 8; // L: 67 + if (var0 >= 256) { // L: 90 + var0 >>>= 8; // L: 91 + var1 += 8; // L: 92 } - if (var0 >= 16) { // L: 69 - var0 >>>= 4; // L: 70 - var1 += 4; // L: 71 + if (var0 >= 16) { // L: 94 + var0 >>>= 4; // L: 95 + var1 += 4; // L: 96 } - if (var0 >= 4) { // L: 73 - var0 >>>= 2; // L: 74 - var1 += 2; // L: 75 + if (var0 >= 4) { // L: 98 + var0 >>>= 2; // L: 99 + var1 += 2; // L: 100 } - if (var0 >= 1) { // L: 77 - var0 >>>= 1; // L: 78 - ++var1; // L: 79 + if (var0 >= 1) { // L: 102 + var0 >>>= 1; // L: 103 + ++var1; // L: 104 } - return var0 + var1; // L: 81 + return var0 + var1; // L: 106 } - - @ObfuscatedName("kf") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "345981332" - ) - static void method3072() { - for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11881 - int var1 = var0.group; // L: 11882 - if (class155.loadInterface(var1)) { // L: 11883 - boolean var2 = true; // L: 11884 - Widget[] var3 = Widget.Widget_interfaceComponents[var1]; // L: 11885 - - int var4; - for (var4 = 0; var4 < var3.length; ++var4) { // L: 11886 - if (var3[var4] != null) { // L: 11887 - var2 = var3[var4].isIf3; // L: 11888 - break; - } - } - - if (!var2) { // L: 11892 - var4 = (int)var0.key; // L: 11893 - Widget var5 = class127.getWidget(var4); // L: 11894 - if (var5 != null) { // L: 11895 - class346.invalidateWidget(var5); - } - } - } - } - - } // L: 11899 } diff --git a/runescape-client/src/main/java/class144.java b/runescape-client/src/main/java/class144.java index 2691c6746a..7d7d67a382 100644 --- a/runescape-client/src/main/java/class144.java +++ b/runescape-client/src/main/java/class144.java @@ -1,135 +1,169 @@ -import java.io.IOException; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ew") +@ObfuscatedName("ef") public abstract class class144 extends Node { - @ObfuscatedName("o") - public static short[][] field1629; + @ObfuscatedName("nz") + @ObfuscatedSignature( + descriptor = "Lki;" + ) + @Export("mousedOverWidgetIf1") + static Widget mousedOverWidgetIf1; class144() { - } + } // L: 49 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "23" + descriptor = "(Lpx;I)V", + garbageValue = "1212008489" ) - abstract void vmethod3152(Buffer var1); + abstract void vmethod3037(Buffer var1); - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lea;I)V", - garbageValue = "1764669808" + descriptor = "(Let;I)V", + garbageValue = "1640110130" ) - abstract void vmethod3153(ClanChannel var1); + abstract void vmethod3032(ClanChannel var1); - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lln;Lln;ZIB)V", + descriptor = "(Lcr;B)V", garbageValue = "64" ) - static void method3080(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { - if (Login.clearLoginScreen) { // L: 159 - if (var3 == 4) { // L: 160 - Ignored.method6828(4); // L: 161 - } + @Export("runScriptEvent") + public static void runScriptEvent(ScriptEvent var0) { + class10.runScript(var0, 500000, 475000); // L: 108 + } // L: 109 - } else { - if (var3 == 0) { // L: 165 - class348.method6505(var2); // L: 166 - } else { - Ignored.method6828(var3); // L: 169 - } + @ObfuscatedName("hc") + @ObfuscatedSignature( + descriptor = "(ZLpc;I)V", + garbageValue = "1354871323" + ) + @Export("loadRegions") + static final void loadRegions(boolean var0, PacketBuffer var1) { + Client.isInInstance = var0; // L: 5556 + int var3; + int var4; + int var5; + int var6; + int var7; + int var8; + if (!Client.isInInstance) { // L: 5557 + int var2 = var1.method7576(); // L: 5558 + var3 = var1.readUnsignedShort(); // L: 5559 + var4 = var1.readUnsignedShort(); // L: 5560 + class138.xteaKeys = new int[var4][4]; // L: 5561 - Rasterizer2D.Rasterizer2D_clear(); // L: 171 - byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 172 - class17.leftTitleSprite = Interpreter.method1889(var4); // L: 173 - ViewportMouse.rightTitleSprite = class17.leftTitleSprite.mirrorHorizontally(); // L: 174 - class260.method5174(var1, Client.worldProperties); // L: 175 - Login.titleboxSprite = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 176 - Login.titlebuttonSprite = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 177 - class296.field3496 = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); // L: 178 - class259.field2887 = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); // L: 179 - AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); // L: 180 - Login.runesSprite = class93.method2386(var1, "runes", ""); // L: 181 - class92.title_muteSprite = class93.method2386(var1, "title_mute", ""); // L: 182 - WorldMapSection2.options_buttons_0Sprite = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 183 - class93.field1254 = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 184 - class54.options_buttons_2Sprite = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 185 - ParamComposition.field1983 = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 186 - AbstractSocket.field4275 = WorldMapSection2.options_buttons_0Sprite.subWidth; // L: 187 - Occluder.field2687 = WorldMapSection2.options_buttons_0Sprite.subHeight; // L: 188 - class341.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); // L: 189 - if (var2) { // L: 190 - Login.Login_username = ""; // L: 191 - Login.Login_password = ""; // L: 192 - Login.field904 = new String[8]; // L: 193 - Login.field903 = 0; // L: 194 - } - - WorldMapID.field2386 = 0; // L: 196 - HealthBar.otp = ""; // L: 197 - Login.field907 = true; // L: 198 - Login.worldSelectOpen = false; // L: 199 - if (!class131.clientPreferences.method2279()) { // L: 200 - Archive var5 = class16.archive6; // L: 201 - int var6 = var5.getGroupId("scape main"); // L: 203 - int var7 = var5.getFileId(var6, ""); // L: 204 - NPCComposition.method3530(2, var5, var6, var7, 255, false); // L: 205 - } else { - Actor.method2183(2); // L: 208 - } - - if (NetCache.NetCache_socket != null) { // L: 210 - try { - Buffer var11 = new Buffer(4); // L: 212 - var11.writeByte(3); // L: 213 - var11.writeMedium(0); // L: 214 - NetCache.NetCache_socket.write(var11.array, 0, 4); // L: 215 - } catch (IOException var10) { - try { - NetCache.NetCache_socket.close(); // L: 219 - } catch (Exception var9) { // L: 221 - } - - ++NetCache.NetCache_ioExceptions; // L: 222 - NetCache.NetCache_socket = null; // L: 223 + for (var5 = 0; var5 < var4; ++var5) { // L: 5562 + for (var6 = 0; var6 < 4; ++var6) { // L: 5563 + class138.xteaKeys[var5][var6] = var1.readInt(); // L: 5564 } } - Login.clearLoginScreen = true; // L: 226 - Login.xPadding = (InvDefinition.canvasWidth - 765) / 2; // L: 227 - Login.loginBoxX = Login.xPadding + 202; // L: 228 - HealthBarDefinition.loginBoxCenter = Login.loginBoxX + 180; // L: 229 - class17.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 230 - ViewportMouse.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 231 - Decimator.logoSprite.drawAt(Login.xPadding + 382 - Decimator.logoSprite.subWidth / 2, 18); // L: 232 - } - } // L: 163 233 + class241.regions = new int[var4]; // L: 5567 + class83.regionMapArchiveIds = new int[var4]; // L: 5568 + class17.regionLandArchiveIds = new int[var4]; // L: 5569 + InterfaceParent.regionLandArchives = new byte[var4][]; // L: 5570 + FloorUnderlayDefinition.regionMapArchives = new byte[var4][]; // L: 5571 + boolean var16 = false; // L: 5572 + if (Client.field493) { // L: 5573 + if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { // L: 5574 + var16 = true; + } - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-9" - ) - public static int method3081(int var0) { - return class400.field4391[var0 & 16383]; // L: 32 - } + if (var3 / 8 == 48 && var2 / 8 == 148) { // L: 5575 + var16 = true; + } + } - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "18" - ) - public static int method3082(byte[] var0, int var1, int var2) { - int var3 = -1; // L: 47 + var4 = 0; // L: 5577 - for (int var4 = var1; var4 < var2; ++var4) { // L: 48 - var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 49 + for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { // L: 5578 + for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) { // L: 5579 + var8 = var7 + (var6 << 8); // L: 5580 + if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 5581 + class241.regions[var4] = var8; // L: 5582 + class83.regionMapArchiveIds[var4] = Message.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5583 + class17.regionLandArchiveIds[var4] = Message.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5584 + ++var4; // L: 5585 + } + } + } + + class329.method5875(var3, var2, true); // L: 5588 + } else { + boolean var15 = var1.method7546() == 1; // L: 5591 + var3 = var1.method7554(); // L: 5592 + var4 = var1.method7554(); // L: 5593 + var5 = var1.readUnsignedShort(); // L: 5594 + var1.importIndex(); // L: 5595 + + int var9; + for (var6 = 0; var6 < 4; ++var6) { // L: 5596 + for (var7 = 0; var7 < 13; ++var7) { // L: 5597 + for (var8 = 0; var8 < 13; ++var8) { // L: 5598 + var9 = var1.readBits(1); // L: 5599 + if (var9 == 1) { + Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 5600 + } else { + Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 5601 + } + } + } + } + + var1.exportIndex(); // L: 5605 + class138.xteaKeys = new int[var5][4]; // L: 5606 + + for (var6 = 0; var6 < var5; ++var6) { // L: 5607 + for (var7 = 0; var7 < 4; ++var7) { // L: 5608 + class138.xteaKeys[var6][var7] = var1.readInt(); // L: 5609 + } + } + + class241.regions = new int[var5]; // L: 5612 + class83.regionMapArchiveIds = new int[var5]; // L: 5613 + class17.regionLandArchiveIds = new int[var5]; // L: 5614 + InterfaceParent.regionLandArchives = new byte[var5][]; // L: 5615 + FloorUnderlayDefinition.regionMapArchives = new byte[var5][]; // L: 5616 + var5 = 0; // L: 5617 + + for (var6 = 0; var6 < 4; ++var6) { // L: 5618 + for (var7 = 0; var7 < 13; ++var7) { // L: 5619 + for (var8 = 0; var8 < 13; ++var8) { // L: 5620 + var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 5621 + if (var9 != -1) { // L: 5622 + int var10 = var9 >> 14 & 1023; // L: 5623 + int var11 = var9 >> 3 & 2047; // L: 5624 + int var12 = (var10 / 8 << 8) + var11 / 8; // L: 5625 + + int var13; + for (var13 = 0; var13 < var5; ++var13) { // L: 5626 + if (class241.regions[var13] == var12) { + var12 = -1; // L: 5627 + break; // L: 5628 + } + } + + if (var12 != -1) { // L: 5630 + class241.regions[var5] = var12; // L: 5631 + var13 = var12 >> 8 & 255; // L: 5632 + int var14 = var12 & 255; // L: 5633 + class83.regionMapArchiveIds[var5] = Message.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5634 + class17.regionLandArchiveIds[var5] = Message.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5635 + ++var5; // L: 5636 + } + } + } + } + } + + class329.method5875(var3, var4, !var15); // L: 5642 } - var3 = ~var3; // L: 51 - return var3; // L: 52 - } + } // L: 5644 } diff --git a/runescape-client/src/main/java/class145.java b/runescape-client/src/main/java/class145.java index 8db7b7fd62..d1da2121a2 100644 --- a/runescape-client/src/main/java/class145.java +++ b/runescape-client/src/main/java/class145.java @@ -1,49 +1,47 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("er") +@ObfuscatedName("ee") public class class145 { - @ObfuscatedName("eq") - @ObfuscatedSignature( - descriptor = "Llx;" - ) - @Export("archive8") - static Archive archive8; - @ObfuscatedName("v") + @ObfuscatedName("ik") @ObfuscatedGetter( - longValue = -8660248817658951919L + intValue = -627241765 ) - long field1633; - @ObfuscatedName("c") + static int field1690; + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = 945677273558696457L + longValue = -4087609161665050259L ) - long field1635; - @ObfuscatedName("i") + long field1683; + @ObfuscatedName("q") + @ObfuscatedGetter( + longValue = 1088515563671951847L + ) + long field1688; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llk;" + descriptor = "Llo;" ) - IterableNodeDeque field1632; + IterableNodeDeque field1685; @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpx;)V" ) public class145(Buffer var1) { - this.field1635 = -1L; // L: 10 - this.field1632 = new IterableNodeDeque(); // L: 11 - this.method3084(var1); // L: 19 + this.field1688 = -1L; // L: 10 + this.field1685 = new IterableNodeDeque(); // L: 11 + this.method2985(var1); // L: 19 } // L: 20 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "1488842408" + descriptor = "(Lpx;B)V", + garbageValue = "-84" ) - void method3084(Buffer var1) { - this.field1633 = var1.readLong(); // L: 23 - this.field1635 = var1.readLong(); // L: 24 + void method2985(Buffer var1) { + this.field1683 = var1.readLong(); // L: 23 + this.field1688 = var1.readLong(); // L: 24 for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 25 26 36 Object var3; @@ -63,88 +61,41 @@ public class class145 { var3 = new class141(this); } - ((class144)var3).vmethod3152(var1); // L: 34 - this.field1632.addFirst((Node)var3); // L: 35 + ((class144)var3).vmethod3037(var1); // L: 34 + this.field1685.addFirst((Node)var3); // L: 35 } } // L: 38 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lea;I)V", - garbageValue = "1969966641" + descriptor = "(Let;I)V", + garbageValue = "1678529975" ) - public void method3086(ClanChannel var1) { - if (var1.key == this.field1633 && var1.field1656 == this.field1635) { // L: 41 - for (class144 var2 = (class144)this.field1632.last(); var2 != null; var2 = (class144)this.field1632.previous()) { // L: 42 - var2.vmethod3153(var1); // L: 43 + public void method2987(ClanChannel var1) { + if (this.field1683 == var1.key && var1.field1709 == this.field1688) { // L: 41 + for (class144 var2 = (class144)this.field1685.last(); var2 != null; var2 = (class144)this.field1685.previous()) { // L: 42 + var2.vmethod3032(var1); // L: 43 } - ++var1.field1656; // L: 45 + ++var1.field1709; // L: 45 } else { throw new RuntimeException(""); } } // L: 46 - @ObfuscatedName("l") + @ObfuscatedName("js") @ObfuscatedSignature( - descriptor = "(IIZI)Ljava/lang/String;", - garbageValue = "803323107" + descriptor = "(II)Z", + garbageValue = "708009599" ) - static String method3085(int var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { // L: 110 - if (var2 && var0 >= 0) { // L: 111 - int var3 = 2; // L: 112 - - for (int var4 = var0 / var1; var4 != 0; ++var3) { // L: 113 114 116 - var4 /= var1; // L: 115 - } - - char[] var5 = new char[var3]; // L: 118 - var5[0] = '+'; // L: 119 - - for (int var6 = var3 - 1; var6 > 0; --var6) { // L: 120 - int var7 = var0; // L: 121 - var0 /= var1; // L: 122 - int var8 = var7 - var0 * var1; // L: 123 - if (var8 >= 10) { // L: 124 - var5[var6] = (char)(var8 + 87); - } else { - var5[var6] = (char)(var8 + 48); // L: 125 - } - } - - return new String(var5); // L: 127 - } else { - return Integer.toString(var0, var1); + static boolean method2991(int var0) { + for (int var1 = 0; var1 < Client.field719; ++var1) { // L: 11734 + if (Client.field721[var1] == var0) { // L: 11735 + return true; } - } else { - throw new IllegalArgumentException("" + var1); } + + return false; // L: 11737 } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-62" - ) - @Export("runWidgetOnLoadListener") - static void runWidgetOnLoadListener(int var0) { - if (var0 != -1) { // L: 4722 - if (class155.loadInterface(var0)) { // L: 4723 - Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 4724 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 4725 - Widget var3 = var1[var2]; // L: 4726 - if (var3.onLoad != null) { // L: 4727 - ScriptEvent var4 = new ScriptEvent(); // L: 4728 - var4.widget = var3; // L: 4729 - var4.args = var3.onLoad; // L: 4730 - Interpreter.runScript(var4, 5000000, 0); // L: 4731 - } - } - - } - } - } // L: 4734 } diff --git a/runescape-client/src/main/java/class146.java b/runescape-client/src/main/java/class146.java index 06a35cb99e..109c178579 100644 --- a/runescape-client/src/main/java/class146.java +++ b/runescape-client/src/main/java/class146.java @@ -3,76 +3,137 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("et") +@ObfuscatedName("es") public class class146 extends class128 { - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1180397183 + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lmx;" ) - int field1645; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -176284947 + @Export("ItemDefinition_fontPlain11") + public static Font ItemDefinition_fontPlain11; + @ObfuscatedName("iv") + @ObfuscatedSignature( + descriptor = "[Lqr;" ) - int field1640; + @Export("mapMarkerSprites") + static SpritePixels[] mapMarkerSprites; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 51449257 + ) + int field1692; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 1435457431 + ) + int field1695; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Les;" + descriptor = "Leh;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Les;)V" + descriptor = "(Leh;)V" ) class146(class131 var1) { this.this$0 = var1; // L: 271 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-413979452" + descriptor = "(Lpx;I)V", + garbageValue = "-611912046" ) - void vmethod3168(Buffer var1) { - this.field1645 = var1.readInt(); // L: 274 - this.field1640 = var1.readInt(); // L: 275 + void vmethod3040(Buffer var1) { + this.field1692 = var1.readInt(); // L: 274 + this.field1695 = var1.readInt(); // L: 275 } // L: 276 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lex;S)V", - garbageValue = "-10316" + descriptor = "(Lek;B)V", + garbageValue = "-73" ) - void vmethod3162(ClanSettings var1) { - var1.method2968(this.field1645, this.field1640); // L: 279 + void vmethod3041(ClanSettings var1) { + var1.method2909(this.field1692, this.field1695); // L: 279 } // L: 280 - @ObfuscatedName("v") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IB)Lgj;", - garbageValue = "0" + descriptor = "(I)Lbx;", + garbageValue = "-280328153" ) - @Export("getObjectDefinition") - public static ObjectComposition getObjectDefinition(int var0) { - ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); // L: 73 - if (var1 != null) { // L: 74 + @Export("getNextWorldListWorld") + static World getNextWorldListWorld() { + return World.World_listCount < World.World_count ? World.World_worlds[++World.World_listCount - 1] : null; // L: 252 253 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "605367947" + ) + static final int method2993() { + return ViewportMouse.ViewportMouse_x; // L: 102 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(II)Lds;", + garbageValue = "1375495552" + ) + static class122 method2997(int var0) { + class122 var1 = (class122)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var0); // L: 362 + if (var1 != null) { // L: 363 return var1; } else { - byte[] var2 = WorldMapData_0.ObjectDefinition_archive.takeFile(6, var0); // L: 75 - var1 = new ObjectComposition(); // L: 76 - var1.id = var0; // L: 77 - if (var2 != null) { // L: 78 - var1.decode(new Buffer(var2)); + var1 = PendingSpawn.method2161(SequenceDefinition.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); // L: 364 + if (var1 != null) { // L: 365 + SequenceDefinition.SequenceDefinition_cachedModel.put(var1, (long)var0); } - var1.postDecode(); // L: 79 - if (var1.isSolid) { // L: 80 - var1.interactType = 0; // L: 81 - var1.boolean1 = false; // L: 82 - } - - ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); // L: 84 - return var1; // L: 85 + return var1; // L: 366 } } + + @ObfuscatedName("kn") + @ObfuscatedSignature( + descriptor = "(Lki;B)Lki;", + garbageValue = "-106" + ) + static Widget method2992(Widget var0) { + Widget var2 = var0; // L: 11947 + int var4 = UrlRequester.getWidgetFlags(var0); // L: 11950 + int var3 = var4 >> 17 & 7; // L: 11952 + int var5 = var3; // L: 11954 + Widget var1; + if (var3 == 0) { // L: 11955 + var1 = null; // L: 11956 + } else { + int var6 = 0; + + while (true) { + if (var6 >= var5) { + var1 = var2; // L: 11966 + break; + } + + var2 = class92.getWidget(var2.parentId); // L: 11960 + if (var2 == null) { // L: 11961 + var1 = null; // L: 11962 + break; // L: 11963 + } + + ++var6; // L: 11959 + } + } + + Widget var7 = var1; // L: 11968 + if (var1 == null) { // L: 11969 + var7 = var0.parent; + } + + return var7; // L: 11970 + } } diff --git a/runescape-client/src/main/java/class147.java b/runescape-client/src/main/java/class147.java index c5d639299e..e9f7fbcea0 100644 --- a/runescape-client/src/main/java/class147.java +++ b/runescape-client/src/main/java/class147.java @@ -3,71 +3,62 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ee") +@ObfuscatedName("eg") public class class147 extends class128 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - @Export("KitDefinition_modelsArchive") - public static AbstractArchive KitDefinition_modelsArchive; - @ObfuscatedName("n") - @Export("Tiles_shapes") - static byte[][][] Tiles_shapes; - @ObfuscatedName("ih") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -882300729 + intValue = 1715614877 ) - @Export("cameraPitch") - static int cameraPitch; - @ObfuscatedName("v") + @Export("KitDefinition_fileCount") + public static int KitDefinition_fileCount; + @ObfuscatedName("ej") @ObfuscatedGetter( - intValue = -1886878919 + longValue = 7229837819444879765L ) - int field1651; + static long field1704; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 876557161 + ) + int field1699; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Les;" + descriptor = "Leh;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Les;)V" + descriptor = "(Leh;)V" ) class147(class131 var1) { this.this$0 = var1; - this.field1651 = -1; // L: 144 + this.field1699 = -1; // L: 144 } // L: 146 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-413979452" + descriptor = "(Lpx;I)V", + garbageValue = "-611912046" ) - void vmethod3168(Buffer var1) { - this.field1651 = var1.readUnsignedShort(); // L: 149 + void vmethod3040(Buffer var1) { + this.field1699 = var1.readUnsignedShort(); // L: 149 } // L: 150 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lex;S)V", - garbageValue = "-10316" + descriptor = "(Lek;B)V", + garbageValue = "-73" ) - void vmethod3162(ClanSettings var1) { - var1.method2965(this.field1651); // L: 153 + void vmethod3041(ClanSettings var1) { + var1.method2894(this.field1699); // L: 153 } // L: 154 - @ObfuscatedName("c") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ldt;FI)F", - garbageValue = "-952832501" + descriptor = "(IB)I", + garbageValue = "107" ) - static float method3106(class117 var0, float var1) { - if (var0 == null) { // L: 191 - return 0.0F; // L: 192 - } else { - float var2 = var1 - var0.field1422; // L: 194 - return var0.field1415[3] + (var0.field1415[2] + (var0.field1415[1] + var2 * var0.field1415[0]) * var2) * var2; // L: 195 - } + public static int method3000(int var0) { + return class271.field3220[var0]; // L: 49 } } diff --git a/runescape-client/src/main/java/class149.java b/runescape-client/src/main/java/class149.java index 00e02cb2dd..c97a71d9e8 100644 --- a/runescape-client/src/main/java/class149.java +++ b/runescape-client/src/main/java/class149.java @@ -2,227 +2,33 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eu") +@ObfuscatedName("ex") public class class149 { - @ObfuscatedName("q") + @ObfuscatedName("hr") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-55422083" + descriptor = "Lmx;" ) - static final void method3138(String var0) { - Actor.addGameMessage(30, "", var0); // L: 102 - } // L: 103 + @Export("fontPlain12") + static Font fontPlain12; - @ObfuscatedName("gv") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lcb;IB)V", - garbageValue = "-21" + descriptor = "(I)V", + garbageValue = "-1924718791" ) - @Export("updateActorSequence") - static final void updateActorSequence(Actor var0, int var1) { - if (var0.field1143 >= Client.cycle) { // L: 3919 - UserComparator8.method2578(var0); - } else { - int var3; - int var4; - int var5; - int var7; - int var11; - if (var0.field1163 >= Client.cycle) { // L: 3920 - if (var0.field1163 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > class163.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 3921 - var11 = var0.field1163 - var0.field1143; // L: 3922 - var3 = Client.cycle - var0.field1143; // L: 3923 - var4 = var0.field1150 * 64 + var0.field1129 * 128; // L: 3924 - var5 = var0.field1150 * 64 + var0.field1160 * 128; // L: 3925 - int var12 = var0.field1150 * 64 + var0.field1132 * 128; // L: 3926 - var7 = var0.field1150 * 64 + var0.field1161 * 128; // L: 3927 - var0.x = (var12 * var3 + var4 * (var11 - var3)) / var11; // L: 3928 - var0.y = (var3 * var7 + var5 * (var11 - var3)) / var11; // L: 3929 - } - - var0.field1179 = 0; // L: 3931 - var0.orientation = var0.field1135; // L: 3932 - var0.rotation = var0.orientation; // L: 3933 - } else { - var0.movementSequence = var0.idleSequence; // L: 3936 - if (var0.pathLength == 0) { // L: 3937 - var0.field1179 = 0; // L: 3938 - } else { - label286: { - if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3941 - SequenceDefinition var2 = class163.SequenceDefinition_get(var0.sequence); // L: 3942 - if (var0.field1170 > 0 && var2.field2159 == 0) { // L: 3943 - ++var0.field1179; // L: 3944 - break label286; // L: 3945 - } - - if (var0.field1170 <= 0 && var2.field2158 == 0) { // L: 3947 - ++var0.field1179; // L: 3948 - break label286; // L: 3949 - } - } - - var11 = var0.x; // L: 3952 - var3 = var0.y; // L: 3953 - var4 = var0.field1150 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 3954 - var5 = var0.field1150 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 3955 - if (var11 < var4) { // L: 3956 - if (var3 < var5) { // L: 3957 - var0.orientation = 1280; - } else if (var3 > var5) { // L: 3958 - var0.orientation = 1792; - } else { - var0.orientation = 1536; // L: 3959 - } - } else if (var11 > var4) { // L: 3961 - if (var3 < var5) { // L: 3962 - var0.orientation = 768; - } else if (var3 > var5) { // L: 3963 - var0.orientation = 256; - } else { - var0.orientation = 512; // L: 3964 - } - } else if (var3 < var5) { // L: 3966 - var0.orientation = 1024; - } else if (var3 > var5) { // L: 3967 - var0.orientation = 0; - } - - class193 var6 = var0.pathTraversed[var0.pathLength - 1]; // L: 3968 - if (var4 - var11 <= 256 && var4 - var11 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { // L: 3969 - var7 = var0.orientation - var0.rotation & 2047; // L: 3976 - if (var7 > 1024) { // L: 3977 - var7 -= 2048; - } - - int var8 = var0.walkBackSequence; // L: 3978 - if (var7 >= -256 && var7 <= 256) { // L: 3979 - var8 = var0.walkSequence; - } else if (var7 >= 256 && var7 < 768) { // L: 3980 - var8 = var0.walkRightSequence; - } else if (var7 >= -768 && var7 <= -256) { // L: 3981 - var8 = var0.walkLeftSequence; - } - - if (var8 == -1) { // L: 3982 - var8 = var0.walkSequence; - } - - var0.movementSequence = var8; // L: 3983 - int var9 = 4; // L: 3984 - boolean var10 = true; // L: 3985 - if (var0 instanceof NPC) { // L: 3986 - var10 = ((NPC)var0).definition.isClickable; - } - - if (var10) { // L: 3987 - if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1175 != 0) { // L: 3988 - var9 = 2; - } - - if (var0.pathLength > 2) { // L: 3989 - var9 = 6; - } - - if (var0.pathLength > 3) { // L: 3990 - var9 = 8; - } - - if (var0.field1179 > 0 && var0.pathLength > 1) { // L: 3991 - var9 = 8; // L: 3992 - --var0.field1179; // L: 3993 - } - } else { - if (var0.pathLength > 1) { // L: 3997 - var9 = 6; - } - - if (var0.pathLength > 2) { // L: 3998 - var9 = 8; - } - - if (var0.field1179 > 0 && var0.pathLength > 1) { // L: 3999 - var9 = 8; // L: 4000 - --var0.field1179; // L: 4001 - } - } - - if (var6 == class193.field2187) { // L: 4004 - var9 <<= 1; - } else if (var6 == class193.field2184) { // L: 4005 - var9 >>= 1; - } - - if (var9 >= 8 && var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { // L: 4006 - var0.movementSequence = var0.runSequence; - } - - if (var11 != var4 || var5 != var3) { // L: 4007 - if (var11 < var4) { // L: 4008 - var0.x += var9; // L: 4009 - if (var0.x > var4) { // L: 4010 - var0.x = var4; - } - } else if (var11 > var4) { // L: 4012 - var0.x -= var9; // L: 4013 - if (var0.x < var4) { // L: 4014 - var0.x = var4; - } - } - - if (var3 < var5) { // L: 4016 - var0.y += var9; // L: 4017 - if (var0.y > var5) { // L: 4018 - var0.y = var5; - } - } else if (var3 > var5) { // L: 4020 - var0.y -= var9; // L: 4021 - if (var0.y < var5) { // L: 4022 - var0.y = var5; - } - } - } - - if (var4 == var0.x && var5 == var0.y) { // L: 4025 - --var0.pathLength; // L: 4026 - if (var0.field1170 > 0) { // L: 4027 - --var0.field1170; - } - } - } else { - var0.x = var4; // L: 3970 - var0.y = var5; // L: 3971 - --var0.pathLength; // L: 3972 - if (var0.field1170 > 0) { // L: 3973 - --var0.field1170; - } - } - } - } - } - } - - if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 4030 - var0.sequence = -1; // L: 4031 - var0.spotAnimation = -1; // L: 4032 - var0.field1143 = 0; // L: 4033 - var0.field1163 = 0; // L: 4034 - var0.x = var0.pathX[0] * 128 + var0.field1150 * 64; // L: 4035 - var0.y = var0.field1150 * 64 + var0.pathY[0] * 128; // L: 4036 - var0.method2179(); // L: 4037 - } - - if (GrandExchangeEvents.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 4039 4040 - var0.sequence = -1; // L: 4041 - var0.spotAnimation = -1; // L: 4042 - var0.field1143 = 0; // L: 4043 - var0.field1163 = 0; // L: 4044 - var0.x = var0.field1150 * 64 + var0.pathX[0] * 128; // L: 4045 - var0.y = var0.pathY[0] * 128 + var0.field1150 * 64; // L: 4046 - var0.method2179(); // L: 4047 - } - - Skeleton.method4730(var0); // L: 4050 - GrandExchangeOfferWorldComparator.method6006(var0); // L: 4051 - } // L: 4052 + static void method3024() { + Tiles.Tiles_minPlane = 99; // L: 48 + Tiles.Tiles_underlays = new byte[4][104][104]; // L: 49 + Tiles.Tiles_overlays = new byte[4][104][104]; // L: 50 + Tiles.Tiles_shapes = new byte[4][104][104]; // L: 51 + RunException.field4812 = new byte[4][104][104]; // L: 52 + VerticalAlignment.field1993 = new int[4][105][105]; // L: 53 + NPC.field1259 = new byte[4][105][105]; // L: 54 + Interpreter.field839 = new int[105][105]; // L: 55 + class154.Tiles_hue = new int[104]; // L: 56 + MusicPatch.Tiles_saturation = new int[104]; // L: 57 + WallDecoration.Tiles_lightness = new int[104]; // L: 58 + Tiles.Tiles_hueMultiplier = new int[104]; // L: 59 + MenuAction.field866 = new int[104]; // L: 60 + } // L: 61 } diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java index d7ef5a0f0f..5a8bb19e66 100644 --- a/runescape-client/src/main/java/class15.java +++ b/runescape-client/src/main/java/class15.java @@ -12,10 +12,10 @@ import net.runelite.mapping.ObfuscatedSignature; import org.bouncycastle.crypto.tls.TlsClientProtocol; import org.bouncycastle.jce.provider.BouncyCastleProvider; -@ObfuscatedName("m") +@ObfuscatedName("g") public class class15 extends SSLSocketFactory { - @ObfuscatedName("v") - SecureRandom field76; + @ObfuscatedName("o") + SecureRandom field78; static { if (Security.getProvider("BC") == null) { // L: 40 @@ -25,52 +25,52 @@ public class class15 extends SSLSocketFactory { } // L: 41 public class15() { - this.field76 = new SecureRandom(); // L: 43 + this.field78 = new SecureRandom(); // L: 43 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;I)Ljavax/net/ssl/SSLSocket;", - garbageValue = "352726134" + garbageValue = "-2042805034" ) - SSLSocket method176(String var1, TlsClientProtocol var2) { - return new class12(this, var2, var1); // L: 81 + SSLSocket method169(String var1, TlsClientProtocol var2) { + return new class12(this, var2, var1); // L: 88 } public Socket createSocket(Socket var1, String var2, int var3, boolean var4) throws IOException { - if (var1 == null) { // L: 46 - var1 = new Socket(); // L: 47 + if (var1 == null) { // L: 47 + var1 = new Socket(); // L: 48 } - if (!var1.isConnected()) { // L: 49 - var1.connect(new InetSocketAddress(var2, var3)); // L: 50 + if (!var1.isConnected()) { // L: 50 + var1.connect(new InetSocketAddress(var2, var3)); // L: 51 } - TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field76); // L: 52 - return this.method176(var2, var5); // L: 53 - } - - public String[] getSupportedCipherSuites() { - return null; // L: 61 - } - - public Socket createSocket(String var1, int var2) throws IOException, UnknownHostException { - return null; // L: 65 - } - - public Socket createSocket(InetAddress var1, int var2) throws IOException { - return null; // L: 69 - } - - public Socket createSocket(InetAddress var1, int var2, InetAddress var3, int var4) throws IOException { - return null; // L: 77 - } - - public Socket createSocket(String var1, int var2, InetAddress var3, int var4) throws IOException, UnknownHostException { - return null; // L: 73 + TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field78); // L: 53 + return this.method169(var2, var5); // L: 54 } public String[] getDefaultCipherSuites() { - return null; // L: 57 + return null; // L: 59 + } + + public String[] getSupportedCipherSuites() { + return null; // L: 64 + } + + public Socket createSocket(String var1, int var2) throws IOException, UnknownHostException { + return null; // L: 69 + } + + public Socket createSocket(String var1, int var2, InetAddress var3, int var4) throws IOException, UnknownHostException { + return null; // L: 79 + } + + public Socket createSocket(InetAddress var1, int var2) throws IOException { + return null; // L: 74 + } + + public Socket createSocket(InetAddress var1, int var2, InetAddress var3, int var4) throws IOException { + return null; // L: 84 } } diff --git a/runescape-client/src/main/java/class150.java b/runescape-client/src/main/java/class150.java index 06852145fe..8e7c14685b 100644 --- a/runescape-client/src/main/java/class150.java +++ b/runescape-client/src/main/java/class150.java @@ -1,81 +1,70 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eg") +@ObfuscatedName("ei") public class class150 extends class128 { - @ObfuscatedName("ik") - @ObfuscatedSignature( - descriptor = "[Lqi;" - ) - @Export("headIconPkSprites") - static SpritePixels[] headIconPkSprites; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = -4465707830753509645L + longValue = 2165429326426467319L ) - long field1675; - @ObfuscatedName("c") - String field1670; + long field1722; + @ObfuscatedName("q") + String field1720; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Les;" + descriptor = "Leh;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Les;)V" + descriptor = "(Leh;)V" ) class150(class131 var1) { this.this$0 = var1; - this.field1675 = -1L; // L: 194 - this.field1670 = null; // L: 195 + this.field1722 = -1L; // L: 194 + this.field1720 = null; // L: 195 } // L: 197 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-413979452" + descriptor = "(Lpx;I)V", + garbageValue = "-611912046" ) - void vmethod3168(Buffer var1) { + void vmethod3040(Buffer var1) { if (var1.readUnsignedByte() != 255) { // L: 200 --var1.offset; // L: 201 - this.field1675 = var1.readLong(); // L: 202 + this.field1722 = var1.readLong(); // L: 202 } - this.field1670 = var1.readStringCp1252NullTerminatedOrNull(); // L: 204 + this.field1720 = var1.readStringCp1252NullTerminatedOrNull(); // L: 204 } // L: 205 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lex;S)V", - garbageValue = "-10316" + descriptor = "(Lek;B)V", + garbageValue = "-73" ) - void vmethod3162(ClanSettings var1) { - var1.method2996(this.field1675, this.field1670); // L: 208 + void vmethod3041(ClanSettings var1) { + var1.method2891(this.field1722, this.field1720); // L: 208 } // L: 209 - @ObfuscatedName("c") + @ObfuscatedName("lq") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-75" + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "773068902" ) - public static int method3150(int var0) { - var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); // L: 28 - var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); // L: 29 - var0 = var0 + (var0 >>> 4) & 252645135; // L: 30 - var0 += var0 >>> 8; // L: 31 - var0 += var0 >>> 16; // L: 32 - return var0 & 255; // L: 33 - } + static String method3026(String var0) { + PlayerType[] var1 = class118.PlayerType_values(); // L: 12681 - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "3" - ) - public static boolean method3149(int var0) { - return (var0 >> 30 & 1) != 0; // L: 37 + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 12682 + PlayerType var3 = var1[var2]; // L: 12683 + if (var3.modIcon != -1 && var0.startsWith(StudioGame.method5590(var3.modIcon))) { // L: 12685 12686 + var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 12687 + break; + } + } + + return var0; // L: 12694 } } diff --git a/runescape-client/src/main/java/class151.java b/runescape-client/src/main/java/class151.java index e6d2a219e6..a1a16be7f1 100644 --- a/runescape-client/src/main/java/class151.java +++ b/runescape-client/src/main/java/class151.java @@ -1,417 +1,59 @@ -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.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("en") +@ObfuscatedName("ey") public class class151 extends class144 { - @ObfuscatedName("v") - String field1678; - @ObfuscatedName("c") - byte field1677; - @ObfuscatedName("i") - byte field1676; + @ObfuscatedName("pn") + @ObfuscatedGetter( + intValue = 692320949 + ) + static int field1729; + @ObfuscatedName("o") + String field1728; + @ObfuscatedName("q") + byte field1725; + @ObfuscatedName("l") + byte field1727; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Lee;" ) final class145 this$0; @ObfuscatedSignature( - descriptor = "(Ler;)V" + descriptor = "(Lee;)V" ) class151(class145 var1) { this.this$0 = var1; // L: 155 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "23" + descriptor = "(Lpx;I)V", + garbageValue = "1212008489" ) - void vmethod3152(Buffer var1) { - this.field1678 = var1.readStringCp1252NullTerminatedOrNull(); // L: 158 - if (this.field1678 != null) { // L: 159 + void vmethod3037(Buffer var1) { + this.field1728 = var1.readStringCp1252NullTerminatedOrNull(); // L: 158 + if (this.field1728 != null) { // L: 159 var1.readUnsignedByte(); // L: 160 - this.field1677 = var1.readByte(); // L: 161 - this.field1676 = var1.readByte(); // L: 162 + this.field1725 = var1.readByte(); // L: 161 + this.field1727 = var1.readByte(); // L: 162 } } // L: 164 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lea;I)V", - garbageValue = "1764669808" + descriptor = "(Let;I)V", + garbageValue = "1640110130" ) - void vmethod3153(ClanChannel var1) { - var1.name = this.field1678; // L: 167 - if (this.field1678 != null) { // L: 168 - var1.field1654 = this.field1677; // L: 169 - var1.field1659 = this.field1676; // L: 170 + void vmethod3032(ClanChannel var1) { + var1.name = this.field1728; // L: 167 + if (this.field1728 != null) { // L: 168 + var1.field1711 = this.field1725; // L: 169 + var1.field1706 = this.field1727; // L: 170 } } // L: 172 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)Lgn;", - garbageValue = "-462688597" - ) - @Export("getParamDefinition") - public static ParamComposition getParamDefinition(int var0) { - ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); // L: 21 - if (var1 != null) { // L: 22 - return var1; - } else { - byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); // L: 23 - var1 = new ParamComposition(); // L: 24 - if (var2 != null) { // L: 25 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 26 - ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 27 - return var1; // L: 28 - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Lpz;I)V", - garbageValue = "960704527" - ) - @Export("performReflectionCheck") - public static void performReflectionCheck(PacketBuffer var0) { - ReflectionCheck var1 = (ReflectionCheck)class54.reflectionChecks.last(); // L: 35 - if (var1 != null) { // L: 36 - int var2 = var0.offset; // L: 37 - var0.writeInt(var1.id); // L: 38 - - for (int var3 = 0; var3 < var1.size; ++var3) { // L: 39 - if (var1.creationErrors[var3] != 0) { // L: 40 - var0.writeByte(var1.creationErrors[var3]); // L: 41 - } else { - try { - int var4 = var1.operations[var3]; // L: 45 - Field var5; - int var6; - if (var4 == 0) { // L: 46 - var5 = var1.fields[var3]; // L: 47 - var6 = Reflection.getInt(var5, (Object)null); // L: 48 - var0.writeByte(0); // L: 49 - var0.writeInt(var6); // L: 50 - } else if (var4 == 1) { // L: 52 - var5 = var1.fields[var3]; // L: 53 - Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 54 - var0.writeByte(0); // L: 55 - } else if (var4 == 2) { // L: 57 - var5 = var1.fields[var3]; // L: 58 - var6 = var5.getModifiers(); // L: 59 - var0.writeByte(0); // L: 60 - var0.writeInt(var6); // L: 61 - } - - Method var25; - if (var4 != 3) { // L: 63 - if (var4 == 4) { // L: 83 - var25 = var1.methods[var3]; // L: 84 - var6 = var25.getModifiers(); // L: 85 - var0.writeByte(0); // L: 86 - var0.writeInt(var6); // L: 87 - } - } else { - var25 = var1.methods[var3]; // L: 64 - byte[][] var10 = var1.arguments[var3]; // L: 65 - Object[] var7 = new Object[var10.length]; // L: 66 - - for (int var8 = 0; var8 < var10.length; ++var8) { // L: 67 - ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 68 - var7[var8] = var9.readObject(); // L: 69 - } - - Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 71 - if (var11 == null) { // L: 72 - var0.writeByte(0); - } else if (var11 instanceof Number) { // L: 73 - var0.writeByte(1); // L: 74 - var0.writeLong(((Number)var11).longValue()); // L: 75 - } else if (var11 instanceof String) { // L: 77 - var0.writeByte(2); // L: 78 - var0.writeStringCp1252NullTerminated((String)var11); // L: 79 - } else { - var0.writeByte(4); // L: 81 - } - } - } catch (ClassNotFoundException var13) { // L: 90 - var0.writeByte(-10); // L: 91 - } catch (InvalidClassException var14) { // L: 93 - var0.writeByte(-11); // L: 94 - } catch (StreamCorruptedException var15) { // L: 96 - var0.writeByte(-12); // L: 97 - } catch (OptionalDataException var16) { // L: 99 - var0.writeByte(-13); // L: 100 - } catch (IllegalAccessException var17) { // L: 102 - var0.writeByte(-14); // L: 103 - } catch (IllegalArgumentException var18) { // L: 105 - var0.writeByte(-15); // L: 106 - } catch (InvocationTargetException var19) { // L: 108 - var0.writeByte(-16); // L: 109 - } catch (SecurityException var20) { // L: 111 - var0.writeByte(-17); // L: 112 - } catch (IOException var21) { // L: 114 - var0.writeByte(-18); // L: 115 - } catch (NullPointerException var22) { // L: 117 - var0.writeByte(-19); // L: 118 - } catch (Exception var23) { // L: 120 - var0.writeByte(-20); // L: 121 - } catch (Throwable var24) { // L: 123 - var0.writeByte(-21); // L: 124 - } - } - } - - var0.writeCrc(var2); // L: 127 - var1.remove(); // L: 128 - } - } // L: 129 - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "1004666991" - ) - static int method3159(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 3525 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 3526 - return 1; // L: 3527 - } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 3529 - Interpreter.Interpreter_intStackSize -= 3; // L: 3530 - Client.publicChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3531 - GameEngine.privateChatMode = class166.method3343(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 3532 - if (GameEngine.privateChatMode == null) { // L: 3533 - GameEngine.privateChatMode = PrivateChatMode.field4739; - } - - Client.tradeChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3534 - PacketBufferNode var13 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2916, Client.packetWriter.isaacCipher); // L: 3536 - var13.packetBuffer.writeByte(Client.publicChatMode); // L: 3537 - var13.packetBuffer.writeByte(GameEngine.privateChatMode.field4740); // L: 3538 - var13.packetBuffer.writeByte(Client.tradeChatMode); // L: 3539 - Client.packetWriter.addNode(var13); // L: 3540 - return 1; // L: 3541 - } else { - PacketBufferNode var6; - int var7; - String var8; - int var9; - if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 3543 - var8 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3544 - Interpreter.Interpreter_intStackSize -= 2; // L: 3545 - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3546 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3547 - var6 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2928, Client.packetWriter.isaacCipher); // L: 3549 - var6.packetBuffer.writeByte(class425.stringCp1252NullTerminatedByteSize(var8) + 2); // L: 3550 - var6.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3551 - var6.packetBuffer.writeByte(var7 - 1); // L: 3552 - var6.packetBuffer.writeByte(var9); // L: 3553 - Client.packetWriter.addNode(var6); // L: 3554 - return 1; // L: 3555 - } else { - int var3; - Message var5; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 3557 - Interpreter.Interpreter_intStackSize -= 2; // L: 3558 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3559 - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3560 - var5 = class291.Messages_getByChannelAndID(var3, var7); // L: 3561 - if (var5 != null) { // L: 3562 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.count; // L: 3563 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.cycle; // L: 3564 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3565 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3566 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3567 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3568 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3571 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3572 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3573 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3574 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3575 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3576 - } - - return 1; // L: 3578 - } else { - Message var4; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 3580 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3581 - var4 = TileItem.Messages_getMessage(var3); // L: 3582 - if (var4 != null) { // L: 3583 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.type; // L: 3584 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.cycle; // L: 3585 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3586 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3587 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3588 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3589 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3592 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3593 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3594 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3595 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3596 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3597 - } - - return 1; // L: 3599 - } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 3601 - if (GameEngine.privateChatMode == null) { // L: 3602 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GameEngine.privateChatMode.field4740; // L: 3603 - } - - return 1; // L: 3604 - } else { - PacketBufferNode var12; - if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 3606 - var8 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3607 - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3608 - var12 = BufferedSource.method6908(var7, var8, Skills.clientLanguage, -1); // L: 3609 - Client.packetWriter.addNode(var12); // L: 3610 - return 1; // L: 3611 - } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3613 - class122.Interpreter_stringStackSize -= 2; // L: 3614 - var8 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize]; // L: 3615 - String var11 = Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize + 1]; // L: 3616 - var12 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2907, Client.packetWriter.isaacCipher); // L: 3618 - var12.packetBuffer.writeShort(0); // L: 3619 - int var10 = var12.packetBuffer.offset; // L: 3620 - var12.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3621 - class282.method5489(var12.packetBuffer, var11); // L: 3622 - var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); // L: 3623 - Client.packetWriter.addNode(var12); // L: 3624 - return 1; // L: 3625 - } else if (var0 == ScriptOpcodes.CHAT_SENDCLAN) { // L: 3627 - var8 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3628 - Interpreter.Interpreter_intStackSize -= 2; // L: 3629 - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3630 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3631 - var6 = BufferedSource.method6908(var7, var8, Skills.clientLanguage, var9); // L: 3632 - Client.packetWriter.addNode(var6); // L: 3633 - return 1; // L: 3634 - } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3636 - if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3643 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3644 - return 1; // L: 3645 - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3647 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3648 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = HitSplatDefinition.Messages_getHistorySize(var3); // L: 3649 - return 1; // L: 3650 - } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3652 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3653 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSectionType.Messages_getLastChatID(var3); // L: 3654 - return 1; // L: 3655 - } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3657 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3658 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SoundCache.method779(var3); // L: 3659 - return 1; // L: 3660 - } else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3662 - var8 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3663 - class420.doCheat(var8); // L: 3664 - return 1; // L: 3665 - } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3667 - Client.field728 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3668 - return 1; // L: 3669 - } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3671 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = Client.field728; // L: 3672 - return 1; // L: 3673 - } else if (var0 == ScriptOpcodes.WRITECONSOLE) { // L: 3675 - var8 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 3676 - System.out.println(var8); // L: 3677 - return 1; // L: 3678 - } else if (var0 == 5024) { // L: 3680 - --Interpreter.Interpreter_intStackSize; // L: 3681 - return 1; // L: 3682 - } else if (var0 == 5025) { // L: 3684 - ++Interpreter.Interpreter_intStackSize; // L: 3685 - return 1; // L: 3686 - } else if (var0 == 5030) { // L: 3688 - Interpreter.Interpreter_intStackSize -= 2; // L: 3689 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3690 - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3691 - var5 = class291.Messages_getByChannelAndID(var3, var7); // L: 3692 - if (var5 != null) { // L: 3693 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.count; // L: 3694 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.cycle; // L: 3695 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3696 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3697 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3698 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3699 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3700 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3701 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3704 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3705 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3706 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3707 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3708 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3709 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3710 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3711 - } - - return 1; // L: 3713 - } else if (var0 == 5031) { // L: 3715 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3716 - var4 = TileItem.Messages_getMessage(var3); // L: 3717 - if (var4 != null) { // L: 3718 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.type; // L: 3719 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.cycle; // L: 3720 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3721 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3722 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3723 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3724 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3725 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3726 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3729 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3730 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3731 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3732 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3733 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3734 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 3735 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3736 - } - - return 1; // L: 3738 - } else { - return 2; // L: 3740 - } - } else { - if (GrandExchangeEvents.localPlayer != null && GrandExchangeEvents.localPlayer.username != null) { // L: 3638 - var8 = GrandExchangeEvents.localPlayer.username.getName(); - } else { - var8 = ""; // L: 3639 - } - - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var8; // L: 3640 - return 1; // L: 3641 - } - } - } - } - } - } } diff --git a/runescape-client/src/main/java/class152.java b/runescape-client/src/main/java/class152.java index ee8d9eca6e..f2887bc453 100644 --- a/runescape-client/src/main/java/class152.java +++ b/runescape-client/src/main/java/class152.java @@ -3,99 +3,126 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ez") +@ObfuscatedName("ep") public class class152 extends class128 { @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lac;" + descriptor = "Lan;" ) @Export("soundCache") public static SoundCache soundCache; - @ObfuscatedName("ew") - @ObfuscatedSignature( - descriptor = "Llx;" - ) - @Export("archive12") - static Archive archive12; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1118863201 + intValue = -1265615631 ) - int field1683; - @ObfuscatedName("c") + int field1731; + @ObfuscatedName("q") @ObfuscatedGetter( - longValue = -4335085775687334719L + longValue = 811865021811254987L ) - long field1682; + long field1732; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Les;" + descriptor = "Leh;" ) final class131 this$0; @ObfuscatedSignature( - descriptor = "(Les;)V" + descriptor = "(Leh;)V" ) class152(class131 var1) { this.this$0 = var1; // L: 307 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-413979452" + descriptor = "(Lpx;I)V", + garbageValue = "-611912046" ) - void vmethod3168(Buffer var1) { - this.field1683 = var1.readInt(); // L: 310 - this.field1682 = var1.readLong(); // L: 311 + void vmethod3040(Buffer var1) { + this.field1731 = var1.readInt(); // L: 310 + this.field1732 = var1.readLong(); // L: 311 } // L: 312 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lex;S)V", - garbageValue = "-10316" + descriptor = "(Lek;B)V", + garbageValue = "-73" ) - void vmethod3162(ClanSettings var1) { - var1.method2978(this.field1683, this.field1682); // L: 315 + void vmethod3041(ClanSettings var1) { + var1.method2889(this.field1731, this.field1732); // L: 315 } // L: 316 + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1235895203" + ) + public static boolean method3039(int var0) { + return (var0 >> 22 & 1) != 0; // L: 21 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1863816537" + ) + static void method3044() { + Messages.Messages_channels.clear(); // L: 50 + Messages.Messages_hashTable.clear(); // L: 51 + Messages.Messages_queue.clear(); // L: 52 + Messages.Messages_count = 0; // L: 53 + } // L: 54 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IIZI)Ljava/lang/String;", + garbageValue = "-2058943082" + ) + static String method3046(int var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { // L: 111 + if (var2 && var0 >= 0) { // L: 112 + int var3 = 2; // L: 113 + + for (int var4 = var0 / var1; var4 != 0; ++var3) { // L: 114 115 117 + var4 /= var1; // L: 116 + } + + char[] var5 = new char[var3]; // L: 119 + var5[0] = '+'; // L: 120 + + for (int var6 = var3 - 1; var6 > 0; --var6) { // L: 121 + int var7 = var0; // L: 122 + var0 /= var1; // L: 123 + int var8 = var7 - var0 * var1; // L: 124 + if (var8 >= 10) { // L: 125 + var5[var6] = (char)(var8 + 87); + } else { + var5[var6] = (char)(var8 + 48); // L: 126 + } + } + + return new String(var5); // L: 128 + } else { + return Integer.toString(var0, var1); + } + } else { + throw new IllegalArgumentException("" + var1); + } + } + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lln;Lln;I)Z", - garbageValue = "-1343677207" + descriptor = "(Lki;IIII)V", + garbageValue = "-48842919" ) - public static boolean method3170(AbstractArchive var0, AbstractArchive var1) { - WorldMapElement.WorldMapElement_archive = var1; // L: 44 - if (!var0.isFullyLoaded()) { // L: 45 - return false; // L: 46 + @Export("Widget_setKeyRate") + static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { + if (var0.field3476 == null) { // L: 1012 + throw new RuntimeException(); // L: 1013 } else { - WorldMapElement.WorldMapElement_count = var0.getGroupFileCount(35); // L: 48 - WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; // L: 49 - - for (int var2 = 0; var2 < WorldMapElement.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].method3381(); // L: 55 - } - } - - return true; // L: 58 + var0.field3476[var1] = var2; // L: 1015 + var0.field3481[var1] = var3; // L: 1016 } - } - - @ObfuscatedName("lb") - @ObfuscatedSignature( - descriptor = "(Lky;I)Ljava/lang/String;", - garbageValue = "2139867076" - ) - @Export("Widget_getSpellActionName") - static String Widget_getSpellActionName(Widget var0) { - if (WorldMapID.Widget_unpackTargetMask(class326.getWidgetFlags(var0)) == 0) { // L: 12480 - return null; - } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 12481 12482 12484 - } - } + } // L: 1017 } diff --git a/runescape-client/src/main/java/class154.java b/runescape-client/src/main/java/class154.java index 3294a6e19f..db879e656d 100644 --- a/runescape-client/src/main/java/class154.java +++ b/runescape-client/src/main/java/class154.java @@ -1,161 +1,84 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eh") +@ObfuscatedName("ez") public class class154 extends class166 { - @ObfuscatedName("rl") - @ObfuscatedSignature( - descriptor = "Lex;" - ) - @Export("guestClanSettings") - static ClanSettings guestClanSettings; - @ObfuscatedName("se") - @ObfuscatedGetter( - intValue = 1598240235 - ) - static int field1691; - @ObfuscatedName("id") - @ObfuscatedGetter( - intValue = 71444527 - ) - @Export("cameraZ") - static int cameraZ; @ObfuscatedName("v") - String field1688; + @Export("Tiles_hue") + static int[] Tiles_hue; + @ObfuscatedName("o") + String field1738; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lev;" + descriptor = "Leq;" ) final class155 this$0; @ObfuscatedSignature( - descriptor = "(Lev;Ljava/lang/String;Ljava/lang/String;)V" + descriptor = "(Leq;Ljava/lang/String;Ljava/lang/String;)V" ) class154(class155 var1, String var2, String var3) { - super(var1, var2); // L: 389 - this.this$0 = var1; // L: 388 - this.field1688 = var3; // L: 390 - } // L: 391 + super(var1, var2); // L: 372 + this.this$0 = var1; // L: 371 + this.field1738 = var3; // L: 373 + } // L: 374 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1689964957" + garbageValue = "1005057629" ) - public int vmethod3341() { - return 1; // L: 394 + public int vmethod3227() { + return 1; // L: 377 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1535635597" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "59" ) - public String vmethod3333() { - return this.field1688; // L: 398 + public String vmethod3238() { + return this.field1738; // L: 382 } - @ObfuscatedName("i") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnj;FFFI)F", - garbageValue = "-1450671201" + descriptor = "(Llp;Llp;I)Z", + garbageValue = "169526997" ) - static float method3181(class389 var0, float var1, float var2, float var3) { - float var4 = class306.method5786(var0.field4364, var0.field4363, var1); // L: 116 - if (Math.abs(var4) < class114.field1382) { // L: 117 - return var1; + public static boolean method3059(AbstractArchive var0, AbstractArchive var1) { + GrandExchangeOfferWorldComparator.WorldMapElement_archive = var1; // L: 44 + if (!var0.isFullyLoaded()) { // L: 45 + return false; // L: 46 } else { - float var5 = class306.method5786(var0.field4364, var0.field4363, var2); // L: 118 - if (Math.abs(var5) < class114.field1382) { // L: 119 - return var2; - } else { - float var6 = 0.0F; // L: 120 - float var7 = 0.0F; // L: 121 - float var8 = 0.0F; // L: 122 - float var13 = 0.0F; // L: 127 - boolean var14 = true; // L: 128 - boolean var15 = false; // L: 129 + WorldMapElement.WorldMapElement_count = var0.getGroupFileCount(35); // L: 48 + class344.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; // L: 49 - do { - var15 = false; // L: 131 - if (var14) { // L: 132 - var6 = var1; // L: 133 - var13 = var4; // L: 134 - var7 = var2 - var1; // L: 135 - var8 = var7; // L: 136 - var14 = false; // L: 137 - } - - if (Math.abs(var13) < Math.abs(var5)) { // L: 139 - var1 = var2; // L: 140 - var2 = var6; // L: 141 - var6 = var1; // L: 142 - var4 = var5; // L: 143 - var5 = var13; // L: 144 - var13 = var4; // L: 145 - } - - float var16 = class114.field1380 * Math.abs(var2) + 0.5F * var3; // L: 147 - float var17 = 0.5F * (var6 - var2); // L: 148 - boolean var18 = Math.abs(var17) > var16 && var5 != 0.0F; // L: 149 - if (var18) { // L: 150 - if (Math.abs(var8) >= var16 && Math.abs(var4) > Math.abs(var5)) { // L: 151 - float var12 = var5 / var4; // L: 156 - float var9; - float var10; - if (var1 == var6) { // L: 157 - var9 = var12 * var17 * 2.0F; // L: 158 - var10 = 1.0F - var12; // L: 159 - } else { - var10 = var4 / var13; // L: 162 - float var11 = var5 / var13; // L: 163 - var9 = ((var10 - var11) * 2.0F * var17 * var10 - (var11 - 1.0F) * (var2 - var1)) * var12; // L: 164 - var10 = (var12 - 1.0F) * (var11 - 1.0F) * (var10 - 1.0F); // L: 165 - } - - if ((double)var9 > 0.0D) { // L: 167 - var10 = -var10; - } else { - var9 = -var9; // L: 168 - } - - var12 = var8; // L: 169 - var8 = var7; // L: 170 - if (2.0F * var9 < 3.0F * var17 * var10 - Math.abs(var16 * var10) && var9 < Math.abs(var12 * 0.5F * var10)) { // L: 171 - var7 = var9 / var10; // L: 172 - } else { - var7 = var17; // L: 175 - var8 = var17; // L: 176 - } - } else { - var7 = var17; // L: 152 - var8 = var17; // L: 153 - } - - var1 = var2; // L: 179 - var4 = var5; // L: 180 - if (Math.abs(var7) > var16) { // L: 181 - var2 += var7; - } else if ((double)var17 > 0.0D) { // L: 182 - var2 += var16; - } else { - var2 -= var16; // L: 183 - } - - var5 = class306.method5786(var0.field4364, var0.field4363, var2); // L: 184 - if ((double)(var5 * (var13 / Math.abs(var13))) > 0.0D) { // L: 185 - var14 = true; // L: 186 - var15 = true; // L: 187 - } else { - var15 = true; // L: 190 - } - } - } while(var15); - - return var2; // L: 194 + for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { // L: 50 + byte[] var3 = var0.takeFile(35, var2); // L: 51 + class344.WorldMapElement_cached[var2] = new WorldMapElement(var2); // L: 52 + if (var3 != null) { // L: 53 + class344.WorldMapElement_cached[var2].decode(new Buffer(var3)); // L: 54 + class344.WorldMapElement_cached[var2].method3291(); // L: 55 + } } + + return true; // L: 58 + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Lpt;IIB)I", + garbageValue = "52" + ) + static int method3061(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 } } } diff --git a/runescape-client/src/main/java/class155.java b/runescape-client/src/main/java/class155.java index 74d49fa8a3..29a67420af 100644 --- a/runescape-client/src/main/java/class155.java +++ b/runescape-client/src/main/java/class155.java @@ -8,70 +8,77 @@ 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; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -@ObfuscatedName("ev") +@ObfuscatedName("eq") public class class155 { - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -2129786845 - ) - int field1694; - @ObfuscatedName("o") - String field1702; - @ObfuscatedName("r") + @ObfuscatedName("le") @ObfuscatedSignature( - descriptor = "Lcw;" + descriptor = "Lki;" ) - UrlRequest field1696; - @ObfuscatedName("p") - String field1704; + @Export("hoveredItemContainer") + static Widget hoveredItemContainer; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -1553344027 + ) + int field1744; + @ObfuscatedName("v") + String field1745; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lcb;" + ) + UrlRequest field1746; + @ObfuscatedName("c") + String field1742; @ObfuscatedName("w") - float[] field1705; - @ObfuscatedName("k") - ArrayList field1706; - @ObfuscatedName("d") - ArrayList field1707; - @ObfuscatedName("m") - ArrayList field1708; - @ObfuscatedName("u") - Map field1709; + float[] field1749; + @ObfuscatedName("b") + ArrayList field1748; @ObfuscatedName("t") - Map field1710; + ArrayList field1750; + @ObfuscatedName("g") + ArrayList field1751; + @ObfuscatedName("x") + Map field1743; + @ObfuscatedName("n") + Map field1753; public class155() { - this.field1694 = -1; // L: 24 - this.field1704 = null; // L: 27 - this.field1705 = new float[4]; // L: 28 - this.field1706 = new ArrayList(); // L: 29 - this.field1707 = new ArrayList(); // L: 30 - this.field1708 = new ArrayList(); // L: 31 - this.field1709 = new HashMap(); // L: 32 - this.field1710 = new HashMap(); // L: 33 - } // L: 385 + this.field1744 = -1; // L: 24 + this.field1742 = null; // L: 27 + this.field1749 = new float[4]; // L: 28 + this.field1748 = new ArrayList(); // L: 29 + this.field1750 = new ArrayList(); // L: 30 + this.field1751 = new ArrayList(); // L: 31 + this.field1743 = new HashMap(); // L: 32 + this.field1753 = new HashMap(); // L: 33 + } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lck;I)Z", - garbageValue = "903767211" + descriptor = "(Ljava/lang/String;Lce;B)Z", + garbageValue = "57" ) - public boolean method3201(String var1, UrlRequester var2) { + public boolean method3085(String var1, UrlRequester var2) { if (var1 != null && !var1.isEmpty()) { // L: 36 if (var2 == null) { // L: 39 return false; // L: 40 } else { - this.method3192(); // L: 42 + this.method3073(); // L: 42 try { - this.field1702 = var1; // L: 44 - this.field1696 = var2.request(new URL(this.field1702)); // L: 45 - this.field1694 = 0; // L: 46 + this.field1745 = var1; // L: 44 + this.field1746 = var2.request(new URL(this.field1745)); // L: 45 + this.field1744 = 0; // L: 46 return true; // L: 47 } catch (MalformedURLException var4) { // L: 49 - this.method3192(); // L: 50 - this.field1694 = 100; // L: 51 + this.method3073(); // L: 50 + this.field1744 = 100; // L: 51 return false; // L: 52 } } @@ -80,18 +87,18 @@ public class class155 { } } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lck;I)V", - garbageValue = "2123246139" + descriptor = "(Lce;I)V", + garbageValue = "2008517320" ) - public void method3184(UrlRequester var1) { - switch(this.field1694) { // L: 57 + public void method3064(UrlRequester var1) { + switch(this.field1744) { // L: 57 case 0: - this.method3193(var1); + this.method3074(var1); break; // L: 64 case 1: - this.method3194(); // L: 59 + this.method3121(); // L: 59 break; default: return; // L: 62 @@ -99,152 +106,152 @@ public class class155 { } // L: 67 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2027263418" + garbageValue = "649568402" ) - public int method3230() { - return this.field1694; // L: 70 + public int method3067() { + return this.field1744; // L: 70 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)I", - garbageValue = "125" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-1638920385" ) - public int method3189(String var1) { - return this.field1709.containsKey(var1) ? (Integer)this.field1709.get(var1) : -1; // L: 74 + public int method3066(String var1) { + return this.field1743.containsKey(var1) ? (Integer)this.field1743.get(var1) : -1; // L: 74 } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1588699273" + descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", + garbageValue = "-57" ) - public String method3223(String var1) { - return (String)(this.field1710.containsKey(var1) ? this.field1710.get(var1) : null); // L: 78 + public String method3097(String var1) { + return (String)((String)(this.field1753.containsKey(var1) ? this.field1753.get(var1) : null)); // L: 78 } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)Ljava/util/ArrayList;", - garbageValue = "1" + descriptor = "(I)Ljava/util/ArrayList;", + garbageValue = "1949744865" ) - public ArrayList method3187() { - return this.field1707; // L: 82 + public ArrayList method3110() { + return this.field1750; // L: 82 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/ArrayList;", + garbageValue = "1585296838" + ) + public ArrayList method3069() { + return this.field1751; // L: 86 } @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Ljava/util/ArrayList;", - garbageValue = "1812482567" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-304867639" ) - public ArrayList method3229() { - return this.field1708; // L: 86 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-121" - ) - public String method3188() { - return this.field1704; // L: 90 - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(I)[F", - garbageValue = "1243511271" - ) - public float[] method3190() { - return this.field1705; // L: 94 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)Ljava/util/ArrayList;", - garbageValue = "969924942" - ) - public ArrayList method3191() { - return this.field1706; // L: 98 + public String method3075() { + return this.field1742; // L: 90 } @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "938648382" + descriptor = "(B)[F", + garbageValue = "63" ) - void method3192() { - this.field1696 = null; // L: 102 - this.field1704 = null; // L: 103 - this.field1705[0] = 0.0F; // L: 104 - this.field1705[1] = 0.0F; // L: 105 - this.field1705[2] = 1.0F; // L: 106 - this.field1705[3] = 1.0F; // L: 107 - this.field1706.clear(); // L: 108 - this.field1707.clear(); // L: 109 - this.field1708.clear(); // L: 110 - this.field1709.clear(); // L: 111 - this.field1710.clear(); // L: 112 + public float[] method3071() { + return this.field1749; // L: 94 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/ArrayList;", + garbageValue = "126443556" + ) + public ArrayList method3072() { + return this.field1748; // L: 98 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1659374882" + ) + void method3073() { + this.field1746 = null; // L: 102 + this.field1742 = null; // L: 103 + this.field1749[0] = 0.0F; // L: 104 + this.field1749[1] = 0.0F; // L: 105 + this.field1749[2] = 1.0F; // L: 106 + this.field1749[3] = 1.0F; // L: 107 + this.field1748.clear(); // L: 108 + this.field1750.clear(); // L: 109 + this.field1751.clear(); // L: 110 + this.field1743.clear(); // L: 111 + this.field1753.clear(); // L: 112 } // L: 113 - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lck;B)V", - garbageValue = "69" + descriptor = "(Lce;B)V", + garbageValue = "107" ) - void method3193(UrlRequester var1) { - if (this.field1696 != null && this.field1696.isDone()) { // L: 116 - byte[] var2 = this.field1696.getResponse(); // L: 119 + void method3074(UrlRequester var1) { + if (this.field1746 != null && this.field1746.isDone()) { // L: 116 + byte[] var2 = this.field1746.getResponse(); // L: 119 if (var2 == null) { // L: 120 - this.method3192(); // L: 121 - this.field1694 = 100; // L: 122 + this.method3073(); // L: 121 + this.field1744 = 100; // L: 122 } else { JSONObject var3; try { - class399 var4 = new class399(var2); // L: 127 - var3 = var4.method7156(); // L: 128 + class400 var4 = new class400(var2); // L: 127 + var3 = var4.method6947(); // L: 128 var3 = var3.getJSONObject("message"); // L: 129 } catch (Exception var9) { // L: 131 - this.method3192(); // L: 132 - this.field1694 = 102; // L: 133 + this.method3073(); // L: 132 + this.field1744 = 102; // L: 133 return; // L: 134 } try { - this.method3195(var3.getJSONArray("images"), var1); // L: 137 + this.method3076(var3.getJSONArray("images"), var1); // L: 137 } catch (Exception var8) { // L: 139 - this.field1707.clear(); // L: 140 + this.field1750.clear(); // L: 140 } try { - this.method3196(var3.getJSONArray("labels")); // L: 143 + this.method3098(var3.getJSONArray("labels")); // L: 143 } catch (Exception var7) { // L: 145 - this.field1708.clear(); // L: 146 + this.field1751.clear(); // L: 146 } try { - this.method3197(var3.getJSONObject("behaviour")); // L: 149 + this.method3083(var3.getJSONObject("behaviour")); // L: 149 } catch (Exception var6) { // L: 151 - this.field1704 = null; // L: 152 - this.field1705[0] = 0.0F; // L: 153 - this.field1705[1] = 0.0F; // L: 154 - this.field1705[2] = 1.0F; // L: 155 - this.field1705[3] = 1.0F; // L: 156 - this.field1706.clear(); // L: 157 + this.field1742 = null; // L: 152 + this.field1749[0] = 0.0F; // L: 153 + this.field1749[1] = 0.0F; // L: 154 + this.field1749[2] = 1.0F; // L: 155 + this.field1749[3] = 1.0F; // L: 156 + this.field1748.clear(); // L: 157 } try { - this.method3240(var3.getJSONObject("meta")); // L: 160 + this.method3079(var3.getJSONObject("meta")); // L: 160 } catch (Exception var5) { // L: 162 - this.field1709.clear(); // L: 163 - this.field1710.clear(); // L: 164 + this.field1743.clear(); // L: 163 + this.field1753.clear(); // L: 164 } - this.field1694 = this.field1707.size() > 0 ? 1 : 2; // L: 166 - this.field1696 = null; // L: 167 + this.field1744 = this.field1750.size() > 0 ? 1 : 2; // L: 166 + this.field1746 = null; // L: 167 } } } // L: 117 123 168 @@ -252,51 +259,51 @@ public class class155 { @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1711663898" + garbageValue = "533215283" ) - void method3194() { - Iterator var1 = this.field1707.iterator(); // L: 171 + void method3121() { + Iterator var1 = this.field1750.iterator(); // L: 171 class160 var2; do { if (!var1.hasNext()) { - var1 = this.field1707.iterator(); // L: 179 + var1 = this.field1750.iterator(); // L: 179 - while (var1.hasNext()) { // L: 190 + while (var1.hasNext()) { var2 = (class160)var1.next(); // L: 180 - if (var2.field1737 != null) { // L: 182 - byte[] var3 = var2.field1737.getResponse(); // L: 183 + if (var2.field1783 != null) { // L: 182 + byte[] var3 = var2.field1783.getResponse(); // L: 183 if (var3 != null && var3.length > 0) { // L: 184 - this.field1694 = 2; // L: 185 + this.field1744 = 2; // L: 185 return; // L: 186 } } } - this.method3192(); // L: 191 - this.field1694 = 101; // L: 192 + this.method3073(); // L: 191 + this.field1744 = 101; // L: 192 return; // L: 193 } var2 = (class160)var1.next(); // L: 172 - } while(var2.field1737 == null || var2.field1737.isDone()); // L: 174 + } while(var2.field1783 == null || var2.field1783.isDone()); // L: 174 } // L: 175 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONArray;Lck;B)V", - garbageValue = "-22" + descriptor = "(Lorg/json/JSONArray;Lce;B)V", + garbageValue = "120" ) - void method3195(JSONArray var1, UrlRequester var2) throws JSONException { + void method3076(JSONArray var1, UrlRequester var2) throws JSONException { if (var1 != null) { // L: 196 for (int var3 = 0; var3 < var1.length(); ++var3) { // L: 197 try { JSONObject var4 = var1.getJSONObject(var3); // L: 199 class160 var5 = new class160(this); // L: 200 - var5.field1737 = var2.request(new URL(var4.getString("src"))); // L: 201 - var5.field1735 = HorizontalAlignment.method3495(var4, "placement"); // L: 202 - this.field1707.add(var5); // L: 203 + var5.field1783 = var2.request(new URL(var4.getString("src"))); // L: 201 + var5.field1782 = ChatChannel.method1965(var4, "placement"); // L: 202 + this.field1750.add(var5); // L: 203 } catch (MalformedURLException var6) { // L: 205 } } @@ -304,206 +311,230 @@ public class class155 { } } // L: 207 - @ObfuscatedName("d") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(Lorg/json/JSONArray;I)V", - garbageValue = "1024784917" + garbageValue = "-867893619" ) - void method3196(JSONArray var1) throws JSONException { + void method3098(JSONArray var1) throws JSONException { if (var1 != null) { // L: 210 for (int var2 = 0; var2 < var1.length(); ++var2) { // L: 211 JSONObject var3 = var1.getJSONObject(var2); // L: 212 class162 var4 = new class162(this); // L: 213 - var4.field1758 = var3.getString("text"); // L: 214 - String var7 = var3.getString("align_x"); // L: 217 - byte var6; - if (var7.equals("centre")) { // L: 219 - var6 = 1; // L: 220 - } else if (!var7.equals("bottom") && !var7.equals("right")) { // L: 223 - var6 = 0; // L: 227 - } else { - var6 = 2; // L: 224 - } - - var4.field1755 = var6; // L: 229 - String var10 = var3.getString("align_y"); // L: 232 - byte var9; - if (var10.equals("centre")) { // L: 234 - var9 = 1; // L: 235 - } else if (!var10.equals("bottom") && !var10.equals("right")) { // L: 238 - var9 = 0; // L: 242 - } else { - var9 = 2; // L: 239 - } - - var4.field1756 = var9; // L: 244 - var4.field1752 = var3.getInt("font"); // L: 245 - var4.field1754 = HorizontalAlignment.method3495(var3, "placement"); - this.field1708.add(var4); + var4.field1803 = var3.getString("text"); // L: 214 + var4.field1811 = class131.method2828(var3.getString("align_x")); // L: 215 + var4.field1806 = class131.method2828(var3.getString("align_y")); // L: 216 + var4.field1807 = var3.getInt("font"); // L: 217 + var4.field1804 = ChatChannel.method1965(var3, "placement"); // L: 218 + this.field1751.add(var4); // L: 219 } } - } + } // L: 221 - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(Lorg/json/JSONObject;I)V", - garbageValue = "222428607" + garbageValue = "-1307418854" ) - void method3197(JSONObject var1) throws JSONException { - if (var1 != null) { // L: 252 - this.field1705 = HorizontalAlignment.method3495(var1, "clickbounds"); - this.field1704 = var1.getString("endpoint"); - String[] var2 = JSONObject.getNames(var1); + void method3083(JSONObject var1) throws JSONException { + if (var1 != null) { // L: 224 + this.field1749 = ChatChannel.method1965(var1, "clickbounds"); // L: 225 + this.field1742 = var1.getString("endpoint"); // L: 226 + String[] var2 = JSONObject.getNames(var1); // L: 227 - for (int var3 = 0; var3 < var1.length(); ++var3) { - if (!var2[var3].equals("clickbounds") && !var2[var3].equals("endpoint")) { + for (int var3 = 0; var3 < var1.length(); ++var3) { // L: 228 + if (!var2[var3].equals("clickbounds") && !var2[var3].equals("endpoint")) { // L: 229 try { - int var4 = var1.getInt(var2[var3]); - this.field1706.add(new class163(this, var2[var3], var4)); + int var4 = var1.getInt(var2[var3]); // L: 231 + this.field1748.add(new class163(this, var2[var3], var4)); // L: 232 } catch (Exception var8) { try { - String var5 = var1.getString(var2[var3]); // L: 264 - if (var5.equals("true")) { - this.field1706.add(new class163(this, var2[var3], 1)); - } else if (var5.equals("false")) { // L: 268 - this.field1706.add(new class163(this, var2[var3], 0)); // L: 269 + String var5 = var1.getString(var2[var3]); // L: 236 + if (var5.equals("true")) { // L: 237 + this.field1748.add(new class163(this, var2[var3], 1)); // L: 238 + } else if (var5.equals("false")) { // L: 240 + this.field1748.add(new class163(this, var2[var3], 0)); // L: 241 } else { - this.field1706.add(new class154(this, var2[var3], var5)); // L: 272 + this.field1748.add(new class154(this, var2[var3], var5)); // L: 244 } - } catch (Exception var7) { // L: 275 + } catch (Exception var7) { // L: 247 } } } } } - } // L: 279 + } // L: 251 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Lorg/json/JSONObject;B)V", + garbageValue = "1" + ) + void method3079(JSONObject var1) throws JSONException { + String[] var2 = JSONObject.getNames(var1); // L: 254 + + for (int var3 = 0; var3 < var1.length(); ++var3) { // L: 255 + try { + int var4 = var1.getInt(var2[var3]); // L: 257 + this.field1743.put(var2[var3], var4); // L: 258 + } catch (Exception var8) { + try { + String var5 = var1.getString(var2[var3]); // L: 262 + if (var5.equals("true")) { // L: 263 + this.field1743.put(var2[var3], 1); // L: 264 + } else if (var5.equals("false")) { // L: 266 + this.field1743.put(var2[var3], 0); // L: 267 + } else { + this.field1753.put(var2[var3], var5); // L: 270 + } + } catch (Exception var7) { // L: 273 + } + } + } + + } // L: 276 @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lorg/json/JSONObject;I)V", - garbageValue = "1700168973" + descriptor = "(ILbb;ZI)I", + garbageValue = "1124617312" ) - void method3240(JSONObject var1) throws JSONException { - String[] var2 = JSONObject.getNames(var1); // L: 282 - - for (int var3 = 0; var3 < var1.length(); ++var3) { // L: 283 - try { - int var4 = var1.getInt(var2[var3]); // L: 285 - this.field1709.put(var2[var3], var4); // L: 286 - } catch (Exception var8) { - try { - String var5 = var1.getString(var2[var3]); // L: 290 - if (var5.equals("true")) { // L: 291 - this.field1709.put(var2[var3], 1); // L: 292 - } else if (var5.equals("false")) { // L: 294 - this.field1709.put(var2[var3], 0); // L: 295 - } else { - this.field1710.put(var2[var3], var5); // L: 298 - } - } catch (Exception var7) { // L: 301 - } - } - } - - } // L: 304 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)[Lkl;", - garbageValue = "-124826849" - ) - static GameBuild[] method3185() { - return new GameBuild[]{GameBuild.WIP, GameBuild.RC, GameBuild.BUILDLIVE, GameBuild.LIVE}; // L: 13 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-49" - ) - @Export("loadInterface") - public static boolean loadInterface(int var0) { - if (WorldMapSectionType.Widget_loadedInterfaces[var0]) { // L: 246 - return true; - } else if (!Widget.Widget_archive.tryLoadGroup(var0)) { // L: 247 - return false; + static int method3124(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 2124 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.cycle; // L: 2125 + return 1; // L: 2126 } else { - int var1 = Widget.Widget_archive.getGroupFileCount(var0); // L: 248 - if (var1 == 0) { // L: 249 - WorldMapSectionType.Widget_loadedInterfaces[var0] = true; // L: 250 - return true; // L: 251 + int var3; + int var4; + if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 2128 + class12.Interpreter_intStackSize -= 2; // L: 2129 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 2130 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2131 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Message.method1079(var3, var4); // L: 2132 + return 1; // L: 2133 + } else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 2135 + class12.Interpreter_intStackSize -= 2; // L: 2136 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 2137 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2138 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class290.ItemContainer_getCount(var3, var4); // L: 2139 + return 1; // L: 2140 + } else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 2142 + class12.Interpreter_intStackSize -= 2; // L: 2143 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 2144 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2145 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Skeleton.method4019(var3, var4); // L: 2146 + return 1; // L: 2147 + } else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 2149 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2150 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = DirectByteArrayCopier.getInvDefinition(var3).size; // L: 2151 + return 1; // L: 2152 + } else if (var0 == ScriptOpcodes.STAT) { // L: 2154 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2155 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 2156 + return 1; // L: 2157 + } else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 2159 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2160 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 2161 + return 1; // L: 2162 + } else if (var0 == ScriptOpcodes.STAT_XP) { // L: 2164 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2165 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 2166 + return 1; // L: 2167 } else { - if (Widget.Widget_interfaceComponents[var0] == null) { // L: 253 - Widget.Widget_interfaceComponents[var0] = new Widget[var1]; - } - - for (int var2 = 0; var2 < var1; ++var2) { // L: 254 - if (Widget.Widget_interfaceComponents[var0][var2] == null) { // L: 255 - byte[] var3 = Widget.Widget_archive.takeFile(var0, var2); // L: 256 - if (var3 != null) { // L: 257 - Widget.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 258 - Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 259 - if (var3[0] == -1) { // L: 260 - Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); - } else { - Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 261 - } - } + int var5; + if (var0 == ScriptOpcodes.COORD) { // L: 2169 + var3 = class128.Client_plane; // L: 2170 + var4 = (ModelData0.localPlayer.x >> 7) + SecureRandomCallable.baseX; // L: 2171 + var5 = (ModelData0.localPlayer.y >> 7) + GrandExchangeOfferOwnWorldComparator.baseY; // L: 2172 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 2173 + return 1; // L: 2174 + } else if (var0 == ScriptOpcodes.COORDX) { // L: 2176 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2177 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 2178 + return 1; // L: 2179 + } else if (var0 == ScriptOpcodes.COORDZ) { // L: 2181 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2182 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 >> 28; // L: 2183 + return 1; // L: 2184 + } else if (var0 == ScriptOpcodes.COORDY) { // L: 2186 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2187 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 & 16383; // L: 2188 + return 1; // L: 2189 + } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 2191 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 2192 + return 1; // L: 2193 + } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 2195 + class12.Interpreter_intStackSize -= 2; // L: 2196 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] + 32768; // L: 2197 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2198 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Message.method1079(var3, var4); // L: 2199 + return 1; // L: 2200 + } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 2202 + class12.Interpreter_intStackSize -= 2; // L: 2203 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] + 32768; // L: 2204 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2205 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class290.ItemContainer_getCount(var3, var4); // L: 2206 + return 1; // L: 2207 + } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 2209 + class12.Interpreter_intStackSize -= 2; // L: 2210 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] + 32768; // L: 2211 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2212 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Skeleton.method4019(var3, var4); // L: 2213 + return 1; // L: 2214 + } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 2216 + if (Client.staffModLevel >= 2) { // L: 2217 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.staffModLevel; + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2218 } - } - WorldMapSectionType.Widget_loadedInterfaces[var0] = true; // L: 265 - return true; // L: 266 + return 1; // L: 2219 + } else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 2221 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 2222 + return 1; // L: 2223 + } else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 2225 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.worldId; // L: 2226 + return 1; // L: 2227 + } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 2229 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 2230 + return 1; // L: 2231 + } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 2233 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.weight; // L: 2234 + return 1; // L: 2235 + } else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 2237 + if (Client.playerMod) { // L: 2238 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2239 + } + + return 1; // L: 2240 + } else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 2242 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 2243 + return 1; // L: 2244 + } else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 2246 + class12.Interpreter_intStackSize -= 4; // L: 2247 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 2248 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2249 + var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 2250 + int var6 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 3]; // L: 2251 + var3 += var4 << 14; // L: 2252 + var3 += var5 << 28; // L: 2253 + var3 += var6; // L: 2254 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3; // L: 2255 + return 1; // L: 2256 + } else if (var0 == 3326) { // L: 2258 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.field492; // L: 2259 + return 1; // L: 2260 + } else if (var0 == 3327) { // L: 2262 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.field681; // L: 2263 + return 1; // L: 2264 + } else { + return 2; // L: 2266 + } } } } - - @ObfuscatedName("kn") - @ObfuscatedSignature( - descriptor = "([Lky;II)V", - garbageValue = "-609081385" - ) - @Export("runComponentCloseListeners") - static final void runComponentCloseListeners(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11723 - Widget var3 = var0[var2]; // L: 11724 - if (var3 != null) { // L: 11725 - if (var3.type == 0) { // L: 11726 - if (var3.children != null) { // L: 11727 - runComponentCloseListeners(var3.children, var1); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11728 - if (var4 != null) { // L: 11729 - MouseRecorder.runIntfCloseListeners(var4.group, var1); - } - } - - ScriptEvent var5; - if (var1 == 0 && var3.onDialogAbort != null) { // L: 11731 - var5 = new ScriptEvent(); // L: 11732 - var5.widget = var3; // L: 11733 - var5.args = var3.onDialogAbort; // L: 11734 - ClanSettings.runScriptEvent(var5); // L: 11735 - } - - if (var1 == 1 && var3.onSubChange != null) { // L: 11737 - if (var3.childIndex >= 0) { // L: 11738 - Widget var6 = class127.getWidget(var3.id); // L: 11739 - if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 11740 - continue; - } - } - - var5 = new ScriptEvent(); // L: 11744 - var5.widget = var3; // L: 11745 - var5.args = var3.onSubChange; // L: 11746 - ClanSettings.runScriptEvent(var5); // L: 11747 - } - } - } - - } // L: 11750 } diff --git a/runescape-client/src/main/java/class158.java b/runescape-client/src/main/java/class158.java index 2179d2c532..6d7fa8f3b4 100644 --- a/runescape-client/src/main/java/class158.java +++ b/runescape-client/src/main/java/class158.java @@ -2,12 +2,12 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fo") +@ObfuscatedName("fy") public interface class158 { - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "34380601" + garbageValue = "-479610962" ) @Export("useRotation") int useRotation(); diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index c3ef8e5d9d..a466268349 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -1,87 +1,68 @@ -import java.io.File; -import java.io.IOException; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("u") +@ObfuscatedName("x") public class class16 implements ThreadFactory { - @ObfuscatedName("eo") - @ObfuscatedSignature( - descriptor = "Llx;" + @ObfuscatedName("bu") + @ObfuscatedGetter( + intValue = 172876195 ) - @Export("archive6") - static Archive archive6; - @ObfuscatedName("v") - final ThreadGroup field77; - @ObfuscatedName("c") - final AtomicInteger field78; + static int field81; + @ObfuscatedName("es") + @ObfuscatedSignature( + descriptor = "Lle;" + ) + @Export("archive13") + static Archive archive13; + @ObfuscatedName("o") + final ThreadGroup field84; + @ObfuscatedName("q") + final AtomicInteger field80; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ld;" + descriptor = "Lt;" ) final class14 this$0; @ObfuscatedSignature( - descriptor = "(Ld;)V" + descriptor = "(Lt;)V" ) class16(class14 var1) { - this.this$0 = var1; // L: 67 - this.field78 = new AtomicInteger(1); // L: 65 - SecurityManager var2 = System.getSecurityManager(); // L: 68 - this.field77 = var2 != null ? var2.getThreadGroup() : Thread.currentThread().getThreadGroup(); // L: 69 - } // L: 70 + this.this$0 = var1; // L: 68 + this.field80 = new AtomicInteger(1); // L: 66 + SecurityManager var2 = System.getSecurityManager(); // L: 69 + this.field84 = var2 != null ? var2.getThreadGroup() : Thread.currentThread().getThreadGroup(); // L: 70 + } // L: 71 public Thread newThread(Runnable var1) { - Thread var2 = new Thread(this.field77, var1, this.this$0.field69 + "-rest-request-" + this.field78.getAndIncrement(), 0L); // L: 73 - var2.setDaemon(true); // L: 74 - var2.setPriority(5); // L: 75 - return var2; // L: 76 + Thread var2 = new Thread(this.field84, var1, this.this$0.field74 + "-rest-request-" + this.field80.getAndIncrement(), 0L); // L: 75 + var2.setDaemon(true); // L: 76 + var2.setPriority(5); // L: 77 + return var2; // L: 78 } - @ObfuscatedName("i") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/io/File;Ljava/io/File;I)V", - garbageValue = "2082256408" + descriptor = "(Llp;B)V", + garbageValue = "1" ) - static void method194(File var0, File var1) { - try { - AccessFile var2 = new AccessFile(class28.JagexCache_locationFile, "rw", 10000L); // L: 216 - Buffer var3 = new Buffer(500); // L: 217 - var3.writeByte(3); // L: 218 - var3.writeByte(var1 != null ? 1 : 0); // L: 219 - var3.writeCESU8(var0.getPath()); // L: 220 - if (var1 != null) { - var3.writeCESU8(""); // L: 221 + public static void method179(AbstractArchive var0) { + } // L: 16 + + @ObfuscatedName("fm") + @ObfuscatedSignature( + descriptor = "(Lgq;IIII)V", + garbageValue = "1179464267" + ) + static void method182(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && class12.clientPreferences.method2239() != 0) { // L: 3762 + if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 3763 + MouseHandler.method588(var0.soundEffects[var1], var2, var3); // L: 3764 } - - var2.write(var3.array, 0, var3.offset); // L: 222 - var2.close(); // L: 223 - } catch (IOException var4) { // L: 225 - var4.printStackTrace(); // L: 226 } - - } // L: 228 - - @ObfuscatedName("fb") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1157813230" - ) - @Export("forceDisconnect") - static final void forceDisconnect(int var0) { - ItemLayer.logOut(); // L: 2941 - switch(var0) { // L: 2942 - case 1: - Ignored.method6828(24); // L: 2954 - class4.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 2955 - break; - case 2: - Ignored.method6828(24); // L: 2946 - class4.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 2947 - } - - } // L: 2960 + } // L: 3765 } diff --git a/runescape-client/src/main/java/class160.java b/runescape-client/src/main/java/class160.java index cc69838243..f4d294e2e6 100644 --- a/runescape-client/src/main/java/class160.java +++ b/runescape-client/src/main/java/class160.java @@ -1,105 +1,261 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fu") +@ObfuscatedName("fd") public class class160 { - @ObfuscatedName("ps") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lcj;" + descriptor = "Lcb;" ) - @Export("varcs") - static Varcs varcs; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lcw;" - ) - public UrlRequest field1737; - @ObfuscatedName("c") - public float[] field1735; + public UrlRequest field1783; + @ObfuscatedName("q") + public float[] field1782; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lev;" + descriptor = "Leq;" ) final class155 this$0; @ObfuscatedSignature( - descriptor = "(Lev;)V" + descriptor = "(Leq;)V" ) class160(class155 var1) { this.this$0 = var1; - this.field1735 = new float[4]; // L: 326 - } // L: 328 + this.field1782 = new float[4]; // L: 308 + } // L: 310 - @ObfuscatedName("an") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-1437558717" + descriptor = "(IB)Lfa;", + garbageValue = "31" ) - static int method3279(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3744 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.getWindowedMode(); // L: 3745 - return 1; // L: 3746 + public static FloorUnderlayDefinition method3171(int var0) { + FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); // L: 21 + if (var1 != null) { // L: 22 + return var1; } else { - int var3; - if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3748 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3749 - if (var3 == 1 || var3 == 2) { // L: 3750 - class131.setWindowedMode(var3); - } + byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); // L: 23 + var1 = new FloorUnderlayDefinition(); // L: 24 + if (var2 != null) { // L: 25 + var1.decode(new Buffer(var2), var0); + } - return 1; // L: 3751 - } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3753 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class131.clientPreferences.method2251(); // L: 3754 - return 1; // L: 3755 - } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3757 - if (var0 == 5310) { // L: 3764 - --Interpreter.Interpreter_intStackSize; // L: 3765 - return 1; // L: 3766 - } else if (var0 == 5311) { // L: 3768 - Interpreter.Interpreter_intStackSize -= 2; // L: 3769 - return 1; // L: 3770 - } else if (var0 == 5312) { // L: 3772 - --Interpreter.Interpreter_intStackSize; // L: 3773 - return 1; // L: 3774 - } else if (var0 == 5350) { // L: 3776 - class122.Interpreter_stringStackSize -= 2; // L: 3777 - --Interpreter.Interpreter_intStackSize; // L: 3778 - return 1; // L: 3779 - } else if (var0 == 5351) { // L: 3781 - --class122.Interpreter_stringStackSize; // L: 3782 - return 1; // L: 3783 - } else { - return 2; // L: 3785 + var1.postDecode(); // L: 26 + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); // L: 27 + return var1; // L: 28 + } + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(II)Ldl;", + garbageValue = "-638516469" + ) + static class118 method3169(int var0) { + class118 var1 = (class118)class291.findEnumerated(HealthBar.method2333(), var0); // L: 35 + if (var1 == null) { + var1 = class118.field1498; // L: 36 + } + + return var1; // L: 37 + } + + @ObfuscatedName("je") + @ObfuscatedSignature( + descriptor = "(Lki;IIB)V", + garbageValue = "43" + ) + @Export("Widget_addToMenu") + static final void Widget_addToMenu(Widget var0, int var1, int var2) { + if (var0.buttonType == 1) { // L: 11008 + Projectile.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 11009 + } + + String var3; + if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 11012 + var3 = TriBool.Widget_getSpellActionName(var0); // L: 11013 + if (var3 != null) { // L: 11014 + Projectile.insertMenuItemNoShift(var3, class166.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 11015 + } + } + + if (var0.buttonType == 3) { // L: 11019 + Projectile.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 11020 + } + + if (var0.buttonType == 4) { // L: 11023 + Projectile.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 11024 + } + + if (var0.buttonType == 5) { // L: 11027 + Projectile.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 11028 + } + + if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 11031 + Projectile.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 11032 + } + + int var4; + int var5; + int var19; + if (var0.type == 2) { // L: 11035 + var19 = 0; // L: 11036 + + for (var4 = 0; var4 < var0.height; ++var4) { // L: 11037 + for (var5 = 0; var5 < var0.width; ++var5) { // L: 11038 + int var6 = (var0.paddingX + 32) * var5; // L: 11039 + int var7 = (var0.paddingY + 32) * var4; // L: 11040 + if (var19 < 20) { // L: 11041 + var6 += var0.inventoryXOffsets[var19]; // L: 11042 + var7 += var0.inventoryYOffsets[var19]; // L: 11043 + } + + if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { // L: 11045 + Client.dragItemSlotDestination = var19; // L: 11046 + class155.hoveredItemContainer = var0; // L: 11047 + if (var0.itemIds[var19] > 0) { // L: 11048 + label328: { + ItemComposition var8 = FileSystem.ItemDefinition_get(var0.itemIds[var19] - 1); // L: 11049 + boolean var9; + int var10; + if (Client.isItemSelected == 1) { // L: 11051 + var10 = UrlRequester.getWidgetFlags(var0); // L: 11053 + var9 = (var10 >> 30 & 1) != 0; // L: 11055 + if (var9) { // L: 11057 + if (var0.id != class20.selectedItemWidget || var19 != PcmPlayer.selectedItemSlot) { // L: 11058 + Projectile.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class166.colorStartTag(16748608) + var8.name, 31, var8.id, var19, var0.id); // L: 11059 + } + break label328; + } + } + + if (Client.isSpellSelected) { // L: 11066 + var10 = UrlRequester.getWidgetFlags(var0); // L: 11068 + var9 = (var10 >> 30 & 1) != 0; // L: 11070 + if (var9) { // L: 11072 + if ((class113.selectedSpellFlags & 16) == 16) { // L: 11073 + Projectile.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class166.colorStartTag(16748608) + var8.name, 32, var8.id, var19, var0.id); // L: 11074 + } + break label328; + } + } + + String[] var22 = var8.inventoryActions; // L: 11080 + var10 = -1; // L: 11081 + boolean var11; + if (Client.shiftClickDrop) { // L: 11082 + var11 = Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 11085 + if (var11) { // L: 11087 + var10 = var8.getShiftClickIndex(); // L: 11088 + } + } + + int var12 = UrlRequester.getWidgetFlags(var0); // L: 11092 + var11 = (var12 >> 30 & 1) != 0; // L: 11094 + if (var11) { // L: 11096 + for (int var13 = 4; var13 >= 3; --var13) { // L: 11097 + if (var10 != var13) { // L: 11098 + class321.addWidgetItemMenuItem(var0, var8, var19, var13, false); // L: 11099 + } + } + } + + int var14 = UrlRequester.getWidgetFlags(var0); // L: 11103 + boolean var24 = (var14 >> 31 & 1) != 0; // L: 11105 + if (var24) { // L: 11107 + Projectile.insertMenuItemNoShift("Use", class166.colorStartTag(16748608) + var8.name, 38, var8.id, var19, var0.id); // L: 11108 + } + + int var16 = UrlRequester.getWidgetFlags(var0); // L: 11112 + boolean var15 = (var16 >> 30 & 1) != 0; // L: 11114 + int var17; + if (var15) { // L: 11116 + for (var17 = 2; var17 >= 0; --var17) { // L: 11117 + if (var17 != var10) { // L: 11118 + class321.addWidgetItemMenuItem(var0, var8, var19, var17, false); // L: 11119 + } + } + + if (var10 >= 0) { // L: 11121 + class321.addWidgetItemMenuItem(var0, var8, var19, var10, true); // L: 11122 + } + } + + var22 = var0.itemActions; // L: 11125 + if (var22 != null) { // L: 11126 + for (var17 = 4; var17 >= 0; --var17) { // L: 11127 + if (var22[var17] != null) { // L: 11128 + byte var18 = 0; // L: 11129 + if (var17 == 0) { // L: 11130 + var18 = 39; + } + + if (var17 == 1) { // L: 11131 + var18 = 40; + } + + if (var17 == 2) { // L: 11132 + var18 = 41; + } + + if (var17 == 3) { // L: 11133 + var18 = 42; + } + + if (var17 == 4) { // L: 11134 + var18 = 43; + } + + Projectile.insertMenuItemNoShift(var22[var17], class166.colorStartTag(16748608) + var8.name, var18, var8.id, var19, var0.id); // L: 11135 + } + } + } + + Projectile.insertMenuItemNoShift("Examine", class166.colorStartTag(16748608) + var8.name, 1005, var8.id, var19, var0.id); // L: 11140 + } + } + } + + ++var19; // L: 11146 + } + } + } + + if (var0.isIf3) { // L: 11150 + if (Client.isSpellSelected) { // L: 11151 + var4 = UrlRequester.getWidgetFlags(var0); // L: 11153 + boolean var25 = (var4 >> 21 & 1) != 0; // L: 11155 + if (var25 && (class113.selectedSpellFlags & 32) == 32) { // L: 11157 + Projectile.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 11158 } } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3758 - if (var3 == 1 || var3 == 2) { // L: 3759 - class131.clientPreferences.method2250(var3); // L: 3760 + for (var19 = 9; var19 >= 5; --var19) { // L: 11163 + String var21 = class193.method3801(var0, var19); // L: 11164 + if (var21 != null) { // L: 11165 + Projectile.insertMenuItemNoShift(var21, var0.dataText, 1007, var19 + 1, var0.childIndex, var0.id); // L: 11166 + } } - return 1; // L: 3762 - } - } - } + var3 = TriBool.Widget_getSpellActionName(var0); // L: 11170 + if (var3 != null) { // L: 11171 + Projectile.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 11172 + } - @ObfuscatedName("mk") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "-75" - ) - static String method3280(String var0) { - PlayerType[] var1 = WorldMapManager.PlayerType_values(); // L: 12632 + for (var4 = 4; var4 >= 0; --var4) { // L: 11175 + String var20 = class193.method3801(var0, var4); // L: 11176 + if (var20 != null) { // L: 11177 + class175.insertMenuItem(var20, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 11178 + } + } - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 12633 - PlayerType var3 = var1[var2]; // L: 12634 - if (var3.modIcon != -1 && var0.startsWith(Script.method1990(var3.modIcon))) { // L: 12636 12637 - var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 12638 - break; + var5 = UrlRequester.getWidgetFlags(var0); // L: 11183 + boolean var23 = (var5 & 1) != 0; // L: 11185 + if (var23) { // L: 11187 + Projectile.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 11188 + } } } - return var0; // L: 12645 - } + } // L: 11193 } diff --git a/runescape-client/src/main/java/class162.java b/runescape-client/src/main/java/class162.java index 9380356122..47a07c8285 100644 --- a/runescape-client/src/main/java/class162.java +++ b/runescape-client/src/main/java/class162.java @@ -3,74 +3,140 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fi") +@ObfuscatedName("fv") public class class162 { @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("Widget_modelsArchive") static AbstractArchive Widget_modelsArchive; - @ObfuscatedName("f") - public String field1758; - @ObfuscatedName("b") - public float[] field1754; - @ObfuscatedName("n") + @ObfuscatedName("pt") @ObfuscatedGetter( - intValue = 1781750243 + intValue = 415868235 ) - public int field1755; + static int field1810; + @ObfuscatedName("k") + public String field1803; + @ObfuscatedName("a") + public float[] field1804; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1916139913 + ) + public int field1811; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 311501729 + ) + public int field1806; @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -608154281 + intValue = 1324402861 ) - public int field1756; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -454180149 - ) - public int field1752; + public int field1807; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lev;" + descriptor = "Leq;" ) final class155 this$0; @ObfuscatedSignature( - descriptor = "(Lev;)V" + descriptor = "(Leq;)V" ) class162(class155 var1) { this.this$0 = var1; - this.field1754 = new float[4]; // L: 336 - this.field1755 = 1; // L: 337 - this.field1756 = 1; // L: 338 - this.field1752 = 0; // L: 339 - } // L: 341 + this.field1804 = new float[4]; // L: 318 + this.field1811 = 1; // L: 319 + this.field1806 = 1; // L: 320 + this.field1807 = 0; // L: 321 + } // L: 323 - @ObfuscatedName("t") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "17" + descriptor = "(I)V", + garbageValue = "-734766672" ) - @Export("hslToRgb") - static final int hslToRgb(int var0, int var1, int var2) { - if (var2 > 179) { // L: 955 - var1 /= 2; + public static void method3209() { + if (KeyHandler.KeyHandler_instance != null) { // L: 124 + synchronized(KeyHandler.KeyHandler_instance) { // L: 125 + KeyHandler.KeyHandler_instance = null; // L: 126 + } // L: 127 } - if (var2 > 192) { // L: 956 - var1 /= 2; - } + } // L: 129 - if (var2 > 217) { // L: 957 - var1 /= 2; - } + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(B)Ljm;", + garbageValue = "124" + ) + public static PacketBufferNode method3208() { + PacketBufferNode var0 = FloorOverlayDefinition.method3700(); + var0.clientPacket = null; + var0.clientPacketLength = 0; + var0.packetBuffer = new PacketBuffer(5000); + return var0; + } - if (var2 > 243) { // L: 958 - var1 /= 2; - } + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;IZB)Z", + garbageValue = "-8" + ) + static boolean method3207(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { // L: 39 + boolean var3 = false; // L: 40 + boolean var4 = false; // L: 41 + int var5 = 0; // L: 42 + int var6 = var0.length(); // L: 43 - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 959 - return var3; // L: 960 + for (int var7 = 0; var7 < var6; ++var7) { // L: 44 + char var8 = var0.charAt(var7); // L: 45 + if (var7 == 0) { // L: 46 + if (var8 == '-') { // L: 47 + var3 = true; // L: 48 + continue; + } + + if (var8 == '+') { // L: 51 + continue; + } + } + + int var10; + if (var8 >= '0' && var8 <= '9') { // L: 53 + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { // L: 54 + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { // L: 55 + return false; // L: 56 + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { // L: 57 + return false; + } + + if (var3) { // L: 58 + var10 = -var10; + } + + int var9 = var10 + var5 * var1; // L: 59 + if (var9 / var1 != var5) { // L: 60 + return false; + } + + var5 = var9; // L: 61 + var4 = true; // L: 62 + } + + return var4; // L: 64 + } else { + throw new IllegalArgumentException("" + var1); + } } } diff --git a/runescape-client/src/main/java/class163.java b/runescape-client/src/main/java/class163.java index 038e374c20..27f8c32a03 100644 --- a/runescape-client/src/main/java/class163.java +++ b/runescape-client/src/main/java/class163.java @@ -1,225 +1,44 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fa") +@ObfuscatedName("ff") public class class163 extends class166 { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -2137509577 + intValue = 604155557 ) - int field1761; + int field1812; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lev;" + descriptor = "Leq;" ) final class155 this$0; @ObfuscatedSignature( - descriptor = "(Lev;Ljava/lang/String;I)V" + descriptor = "(Leq;Ljava/lang/String;I)V" ) class163(class155 var1, String var2, int var3) { - super(var1, var2); // L: 372 - this.this$0 = var1; // L: 371 - this.field1761 = var3; // L: 373 - } // L: 374 + super(var1, var2); // L: 354 + this.this$0 = var1; // L: 353 + this.field1812 = var3; // L: 355 + } // L: 356 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1689964957" + garbageValue = "1005057629" ) - public int vmethod3341() { - return 0; // L: 377 + public int vmethod3227() { + return 0; // L: 359 } - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "31414" + descriptor = "(I)I", + garbageValue = "-1932276755" ) - public int vmethod3334() { - return this.field1761; // L: 381 + public int vmethod3228() { + return this.field1812; // L: 364 } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "([BILjava/lang/CharSequence;I)I", - garbageValue = "760271805" - ) - public static int method3321(byte[] var0, int var1, CharSequence var2) { - int var3 = var2.length(); - int var4 = var1; - - for (int var5 = 0; var5 < var3; ++var5) { - char var6 = var2.charAt(var5); - if (var6 <= 127) { // L: 13 - var0[var4++] = (byte)var6; - } else if (var6 <= 2047) { - var0[var4++] = (byte)(192 | var6 >> 6); - var0[var4++] = (byte)(128 | var6 & '?'); - } else { - var0[var4++] = (byte)(224 | var6 >> '\f'); - var0[var4++] = (byte)(128 | var6 >> 6 & 63); - var0[var4++] = (byte)(128 | var6 & '?'); - } - } - - return var4 - var1; - } - - @ObfuscatedName("v") - public static final int method3320(double var0, double var2, double var4) { - double var6 = var4; // L: 9 - double var8 = var4; // L: 10 - double var10 = var4; // L: 11 - if (var2 != 0.0D) { // L: 12 - double var12; - if (var4 < 0.5D) { // L: 14 - var12 = (1.0D + var2) * var4; - } else { - 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 (6.0D * var16 < 1.0D) { // L: 22 - var6 = var14 + 6.0D * (var12 - var14) * var16; - } else if (2.0D * var16 < 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 (2.0D * var0 < 1.0D) { // L: 27 - var8 = var12; - } else if (var0 * 3.0D < 2.0D) { - var8 = var14 + (0.6666666666666666D - var0) * (var12 - var14) * 6.0D; // L: 28 - } else { - var8 = var14; // L: 29 - } - - if (6.0D * var20 < 1.0D) { // L: 30 - var10 = var14 + var20 * (var12 - var14) * 6.0D; - } else if (var20 * 2.0D < 1.0D) { // L: 31 - var10 = var12; - } else if (3.0D * var20 < 2.0D) { // L: 32 - var10 = var14 + (var12 - var14) * (0.6666666666666666D - var20) * 6.0D; - } else { - var10 = var14; // L: 33 - } - } - - int var22 = (int)(256.0D * var6); // 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("v") - @ObfuscatedSignature( - descriptor = "(Lln;Lln;ZLmd;I)V", - garbageValue = "845693367" - ) - public static void method3318(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { - SoundCache.ItemDefinition_archive = var0; // L: 84 - AttackOption.ItemDefinition_modelArchive = var1; // L: 85 - DevicePcmPlayerProvider.ItemDefinition_inMembersWorld = var2; // L: 86 - class293.ItemDefinition_fileCount = SoundCache.ItemDefinition_archive.getGroupFileCount(10); // L: 87 - ParamComposition.ItemDefinition_fontPlain11 = var3; // L: 88 - } // L: 89 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IB)Lgw;", - garbageValue = "-26" - ) - @Export("SequenceDefinition_get") - public static SequenceDefinition SequenceDefinition_get(int var0) { - SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); // L: 52 - if (var1 != null) { // L: 53 - return var1; - } else { - byte[] var2 = class11.SequenceDefinition_archive.takeFile(12, var0); // L: 54 - var1 = new SequenceDefinition(); // L: 55 - if (var2 != null) { // L: 56 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 57 - SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); // L: 58 - return var1; // L: 59 - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Lln;Lln;IIB)Lmd;", - garbageValue = "3" - ) - public static Font method3322(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { - byte[] var5 = var0.takeFile(var2, var3); // L: 71 - boolean var4; - if (var5 == null) { // L: 72 - var4 = false; // L: 73 - } else { - WorldMapArea.SpriteBuffer_decode(var5); // L: 76 - var4 = true; // L: 77 - } - - return !var4 ? null : ViewportMouse.method5090(var1.takeFile(var2, var3)); // L: 79 80 - } - - @ObfuscatedName("hb") - @ObfuscatedSignature( - descriptor = "(Lct;I)V", - garbageValue = "-2096027290" - ) - static final void method3315(PendingSpawn var0) { - long var1 = 0L; // L: 7731 - int var3 = -1; // L: 7732 - int var4 = 0; // L: 7733 - int var5 = 0; // L: 7734 - if (var0.type == 0) { // L: 7735 - var1 = ArchiveLoader.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 1) { // L: 7736 - var1 = ArchiveLoader.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 2) { // L: 7737 - var1 = ArchiveLoader.scene.getGameObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 3) { - var1 = ArchiveLoader.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); // L: 7738 - } - - if (var1 != 0L) { // L: 7739 - int var6 = ArchiveLoader.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 7740 - var3 = FileSystem.Entity_unpackID(var1); // L: 7741 - var4 = var6 & 31; // L: 7742 - var5 = var6 >> 6 & 3; // L: 7743 - } - - var0.objectId = var3; // L: 7745 - var0.field1105 = var4; // L: 7746 - var0.field1104 = var5; // L: 7747 - } // L: 7748 } diff --git a/runescape-client/src/main/java/class166.java b/runescape-client/src/main/java/class166.java index 6b20195baf..ed5759f095 100644 --- a/runescape-client/src/main/java/class166.java +++ b/runescape-client/src/main/java/class166.java @@ -2,99 +2,65 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fy") +@ObfuscatedName("fq") public abstract class class166 { - @ObfuscatedName("er") - @ObfuscatedSignature( - descriptor = "Llx;" - ) - @Export("archive13") - static Archive archive13; - @ObfuscatedName("f") - String field1784; + @ObfuscatedName("k") + String field1830; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lev;" + descriptor = "Leq;" ) final class155 this$0; @ObfuscatedSignature( - descriptor = "(Lev;Ljava/lang/String;)V" + descriptor = "(Leq;Ljava/lang/String;)V" ) class166(class155 var1, String var2) { - this.this$0 = var1; // L: 349 - this.field1784 = var2; // L: 350 - } // L: 351 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1689964957" - ) - public abstract int vmethod3341(); - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1535635597" - ) - public String vmethod3333() { - return null; // L: 360 - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "31414" - ) - public int vmethod3334() { - return -1; // L: 364 - } + this.this$0 = var1; // L: 331 + this.field1830 = var2; // L: 332 + } // L: 333 @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1565195200" + descriptor = "(I)I", + garbageValue = "1005057629" ) - public String method3336() { - return this.field1784; // L: 354 + public abstract int vmethod3227(); + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "59" + ) + public String vmethod3238() { + return null; // L: 342 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1932276755" + ) + public int vmethod3228() { + return -1; // L: 346 } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)Lqa;", - garbageValue = "29" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1796730209" ) - public static PrivateChatMode method3343(int var0) { - PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field4739, PrivateChatMode.field4741, PrivateChatMode.field4738}; // L: 18 - PrivateChatMode[] var2 = var1; // L: 20 - - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 21 - PrivateChatMode var4 = var2[var3]; // L: 22 - if (var0 == var4.field4740) { // L: 24 - return var4; - } - } - - return null; // L: 28 + public String method3226() { + return this.field1830; // L: 336 } - @ObfuscatedName("fi") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-1" + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "32" ) - static int method3342() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1468 - int var0 = 0; // L: 1469 - - for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1470 - var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1471 - } - - return var0 * 10000 / Client.field782; // L: 1473 - } else { - return 10000; - } + @Export("colorStartTag") + static String colorStartTag(int var0) { + return ""; // L: 22 } } diff --git a/runescape-client/src/main/java/class168.java b/runescape-client/src/main/java/class168.java index b0a7b71a69..a265ee0365 100644 --- a/runescape-client/src/main/java/class168.java +++ b/runescape-client/src/main/java/class168.java @@ -1,148 +1,98 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fj") +@ObfuscatedName("fn") public class class168 { - @ObfuscatedName("i") - public short[] field1791; - @ObfuscatedName("f") - public short[] field1790; + @ObfuscatedName("l") + public short[] field1847; + @ObfuscatedName("k") + public short[] field1844; class168(int var1) { - ItemComposition var2 = class19.ItemDefinition_get(var1); // L: 12 - if (var2.method3722()) { // L: 13 - this.field1791 = new short[var2.recolorTo.length]; // L: 14 - System.arraycopy(var2.recolorTo, 0, this.field1791, 0, this.field1791.length); // L: 15 + ItemComposition var2 = FileSystem.ItemDefinition_get(var1); // L: 12 + if (var2.method3636()) { // L: 13 + this.field1847 = new short[var2.recolorTo.length]; // L: 14 + System.arraycopy(var2.recolorTo, 0, this.field1847, 0, this.field1847.length); // L: 15 } - if (var2.method3708()) { // L: 17 - this.field1790 = new short[var2.retextureTo.length]; // L: 18 - System.arraycopy(var2.retextureTo, 0, this.field1790, 0, this.field1790.length); // L: 19 + if (var2.method3637()) { // L: 17 + this.field1844 = new short[var2.retextureTo.length]; // L: 18 + System.arraycopy(var2.retextureTo, 0, this.field1844, 0, this.field1844.length); // L: 19 } } // L: 21 - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "-32" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1006940319" ) - static int method3353(int var0, Script var1, boolean var2) { - int var4; - int var9; - if (var0 == ScriptOpcodes.CC_CREATE) { // L: 478 - Interpreter.Interpreter_intStackSize -= 3; // L: 479 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 480 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 481 - int var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 482 - if (var4 == 0) { // L: 483 - throw new RuntimeException(); // L: 484 - } else { - Widget var6 = class127.getWidget(var9); // L: 486 - if (var6.children == null) { // L: 487 - var6.children = new Widget[var11 + 1]; - } + static String method3253() { + String var0; + if (class12.clientPreferences.method2257()) { // L: 268 + String var2 = Login.Login_username; // L: 270 + int var4 = var2.length(); // L: 273 + char[] var5 = new char[var4]; // L: 275 - if (var6.children.length <= var11) { // L: 488 - Widget[] var7 = new Widget[var11 + 1]; // L: 489 + for (int var6 = 0; var6 < var4; ++var6) { // L: 276 + var5[var6] = '*'; + } - for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 490 - var7[var8] = var6.children[var8]; + String var3 = new String(var5); // L: 277 + var0 = var3; // L: 281 + } else { + var0 = Login.Login_username; // L: 283 + } + + return var0; // L: 284 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "([BB)V", + garbageValue = "24" + ) + @Export("ByteArrayPool_release") + public static synchronized void ByteArrayPool_release(byte[] var0) { + if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < ByteArrayPool.field4210) { // L: 116 + ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 117 + } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < ByteArrayPool.field4219) { // L: 120 + ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 121 + } else if (var0.length == 10000 && ByteArrayPool.ByteArrayPool_largeCount < ByteArrayPool.field4220) { // L: 124 + ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 125 + } else if (var0.length == 30000 && ByteArrayPool.field4217 < ByteArrayPool.field4221) { // L: 128 + ByteArrayPool.field4225[++ByteArrayPool.field4217 - 1] = var0; // L: 129 + } else { + if (class131.ByteArrayPool_arrays != null) { // L: 132 + for (int var1 = 0; var1 < FileSystem.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 133 + if (var0.length == FileSystem.ByteArrayPool_alternativeSizes[var1] && GrandExchangeEvents.ByteArrayPool_altSizeArrayCounts[var1] < class131.ByteArrayPool_arrays[var1].length) { // L: 134 + class131.ByteArrayPool_arrays[var1][GrandExchangeEvents.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 135 + return; // L: 136 } - - var6.children = var7; // L: 491 - } - - if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 493 - throw new RuntimeException("" + (var11 - 1)); - } else { - Widget var12 = new Widget(); // L: 494 - var12.type = var4; // L: 495 - var12.parentId = var12.id = var6.id; // L: 496 - var12.childIndex = var11; // L: 497 - var12.isIf3 = true; // L: 498 - var6.children[var11] = var12; // L: 499 - if (var2) { // L: 500 - WorldMapID.scriptDotWidget = var12; - } else { - Interpreter.scriptActiveWidget = var12; // L: 501 - } - - class346.invalidateWidget(var6); // L: 502 - return 1; // L: 503 } } - } else { - Widget var3; - if (var0 == ScriptOpcodes.CC_DELETE) { // L: 505 - var3 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 506 - Widget var10 = class127.getWidget(var3.id); // L: 507 - var10.children[var3.childIndex] = null; // L: 508 - class346.invalidateWidget(var10); // L: 509 - return 1; // L: 510 - } else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 512 - var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 513 - var3.children = null; // L: 514 - class346.invalidateWidget(var3); // L: 515 - return 1; // L: 516 - } else if (var0 == 103) { // L: 518 - Interpreter.Interpreter_intStackSize -= 3; // L: 519 - return 1; // L: 520 - } else if (var0 == 104) { // L: 522 - --Interpreter.Interpreter_intStackSize; // L: 523 - return 1; // L: 524 - } else if (var0 != ScriptOpcodes.CC_FIND) { // L: 526 - if (var0 == ScriptOpcodes.IF_FIND) { // L: 539 - var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 540 - if (var3 != null) { // L: 541 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 542 - if (var2) { // L: 543 - WorldMapID.scriptDotWidget = var3; - } else { - Interpreter.scriptActiveWidget = var3; // L: 544 - } - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 546 - } - return 1; // L: 547 - } else if (var0 == 202) { // L: 549 - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] = 0; // L: 550 - return 1; // L: 551 - } else if (var0 == 203) { // L: 553 - Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize + 1] = 0; // L: 554 - return 1; // L: 555 - } else { - return 2; // L: 557 - } - } else { - Interpreter.Interpreter_intStackSize -= 2; // L: 527 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 528 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 529 - Widget var5 = ItemComposition.getWidgetChild(var9, var4); // L: 530 - if (var5 != null && var4 != -1) { // L: 531 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 532 - if (var2) { // L: 533 - WorldMapID.scriptDotWidget = var5; - } else { - Interpreter.scriptActiveWidget = var5; // L: 534 - } - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 536 - } + } + } // L: 118 122 126 130 140 - return 1; // L: 537 + @ObfuscatedName("lp") + @ObfuscatedSignature( + descriptor = "(IIZI)V", + garbageValue = "-1667178418" + ) + static final void method3251(int var0, int var1, boolean var2) { + if (Client.currentClanChannels[var0] != null) { // L: 12490 + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method3005()) { // L: 12491 + ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 12492 + PacketBufferNode var4 = WallDecoration.getPacketBufferNode(ClientPacket.field2993, Client.packetWriter.isaacCipher); // L: 12493 + var4.packetBuffer.writeByte(4 + class392.stringCp1252NullTerminatedByteSize(var3.username.getName())); // L: 12494 + var4.packetBuffer.writeByte(var0); // L: 12495 + var4.packetBuffer.writeShort(var1); // L: 12496 + var4.packetBuffer.writeBoolean(var2); // L: 12497 + var4.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); // L: 12498 + Client.packetWriter.addNode(var4); // L: 12499 } } - } - - @ObfuscatedName("jx") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-127" - ) - static boolean method3351() { - return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 11179 - } + } // L: 12500 } diff --git a/runescape-client/src/main/java/class17.java b/runescape-client/src/main/java/class17.java index 38b7c6c982..cc52945ff9 100644 --- a/runescape-client/src/main/java/class17.java +++ b/runescape-client/src/main/java/class17.java @@ -1,5 +1,8 @@ +import java.lang.management.GarbageCollectorMXBean; +import java.lang.management.ManagementFactory; import java.security.Principal; import java.security.cert.Certificate; +import java.util.Iterator; import javax.net.ssl.SSLPeerUnverifiedException; import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSessionContext; @@ -9,32 +12,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("t") +@ObfuscatedName("n") class class17 implements SSLSession { + @ObfuscatedName("ta") + @ObfuscatedGetter( + intValue = 1306614653 + ) + static int field88; @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lqi;" + descriptor = "Llp;" ) - @Export("leftTitleSprite") - static SpritePixels leftTitleSprite; - @ObfuscatedName("r") - @Export("musicTrackBoolean") - public static boolean musicTrackBoolean; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - @Export("Widget_fontsArchive") - static AbstractArchive Widget_fontsArchive; - @ObfuscatedName("fu") - @Export("worldHost") - static String worldHost; - @ObfuscatedName("no") - @ObfuscatedGetter( - intValue = -2098489797 - ) - @Export("selectedSpellFlags") - static int selectedSpellFlags; + @Export("NpcDefinition_modelArchive") + public static AbstractArchive NpcDefinition_modelArchive; + @ObfuscatedName("ai") + static String field89; + @ObfuscatedName("hh") + @Export("regionLandArchiveIds") + static int[] regionLandArchiveIds; // $FF: synthetic field @ObfuscatedSignature( descriptor = "Lw;" @@ -45,208 +40,137 @@ class class17 implements SSLSession { descriptor = "(Lw;)V" ) class17(class12 var1) { - this.this$1 = var1; // L: 115 + this.this$1 = var1; // L: 131 } public int getApplicationBufferSize() { - return 0; // L: 117 - } - - public String getCipherSuite() { - throw new UnsupportedOperationException(); // L: 121 - } - - public byte[] getId() { - throw new UnsupportedOperationException(); // L: 129 - } - - public long getCreationTime() { - throw new UnsupportedOperationException(); // L: 125 - } - - public Certificate[] getLocalCertificates() { - throw new UnsupportedOperationException(); // L: 137 - } - - public Principal getLocalPrincipal() { - throw new UnsupportedOperationException(); // L: 141 - } - - public X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException { - return null; // L: 149 - } - - public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException { - return this.this$1.field62; // L: 153 - } - - public int getPeerPort() { - return 0; // L: 161 - } - - public Principal getPeerPrincipal() throws SSLPeerUnverifiedException { - return null; // L: 165 - } - - public void putValue(String var1, Object var2) { - throw new UnsupportedOperationException(); // L: 193 - } - - public int getPacketBufferSize() { - throw new UnsupportedOperationException(); // L: 145 - } - - public String[] getValueNames() { - throw new UnsupportedOperationException(); // L: 181 - } - - public boolean isValid() { - throw new UnsupportedOperationException(); // L: 189 - } - - public void removeValue(String var1) { - throw new UnsupportedOperationException(); // L: 197 - } - - public SSLSessionContext getSessionContext() { - throw new UnsupportedOperationException(); // L: 173 - } - - public String getProtocol() { - throw new UnsupportedOperationException(); // L: 169 - } - - public long getLastAccessedTime() { - throw new UnsupportedOperationException(); // L: 133 - } - - public void invalidate() { - throw new UnsupportedOperationException(); // L: 185 + return 0; // L: 134 } public String getPeerHost() { - throw new UnsupportedOperationException(); // L: 157 + throw new UnsupportedOperationException(); // L: 184 + } + + public long getCreationTime() { + throw new UnsupportedOperationException(); // L: 144 + } + + public String getCipherSuite() { + throw new UnsupportedOperationException(); // L: 139 + } + + public long getLastAccessedTime() { + throw new UnsupportedOperationException(); // L: 154 + } + + public void removeValue(String var1) { + throw new UnsupportedOperationException(); // L: 234 + } + + public int getPacketBufferSize() { + throw new UnsupportedOperationException(); // L: 169 + } + + public X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException { + return null; // L: 174 + } + + public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException { + return this.this$1.field63; // L: 179 + } + + public int getPeerPort() { + return 0; // L: 189 + } + + public Principal getPeerPrincipal() throws SSLPeerUnverifiedException { + return null; // L: 194 + } + + public byte[] getId() { + throw new UnsupportedOperationException(); // L: 149 + } + + public String[] getValueNames() { + throw new UnsupportedOperationException(); // L: 214 + } + + public void invalidate() { + throw new UnsupportedOperationException(); // L: 219 + } + + public boolean isValid() { + throw new UnsupportedOperationException(); // L: 224 + } + + public SSLSessionContext getSessionContext() { + throw new UnsupportedOperationException(); // L: 204 + } + + public Principal getLocalPrincipal() { + throw new UnsupportedOperationException(); // L: 164 } public Object getValue(String var1) { - throw new UnsupportedOperationException(); // L: 177 + throw new UnsupportedOperationException(); // L: 209 } - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(ILnw;Llx;I)V", - garbageValue = "-71140418" - ) - static void method256(int var0, ArchiveDisk var1, Archive var2) { - byte[] var3 = null; // L: 18 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - for (ArchiveDiskAction var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var5 != null; var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 20 - if ((long)var0 == var5.key && var1 == var5.archiveDisk && var5.type == 0) { // L: 21 - var3 = var5.data; // L: 22 - break; // L: 23 - } - } - } - - if (var3 != null) { // L: 27 - var2.load(var1, var0, var3, true); // L: 28 - } else { - byte[] var4 = var1.read(var0); // L: 31 - var2.load(var1, var0, var4, true); // L: 32 - } - } // L: 29 33 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IS)Z", - garbageValue = "-20872" - ) - @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 + public String getProtocol() { + throw new UnsupportedOperationException(); // L: 199 } - @ObfuscatedName("gg") + public void putValue(String var1, Object var2) { + throw new UnsupportedOperationException(); // L: 229 + } + + public Certificate[] getLocalCertificates() { + throw new UnsupportedOperationException(); // L: 159 + } + + @ObfuscatedName("a") + public static int method236(long var0) { + return (int)(var0 >>> 0 & 127L); // L: 60 + } + + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(IIIIZI)V", - garbageValue = "1219931698" + descriptor = "(I)I", + garbageValue = "1814027423" ) - @Export("setViewportShape") - static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { - if (var2 < 1) { // L: 4702 - var2 = 1; - } + @Export("getGcDuration") + protected static int getGcDuration() { + int var0 = 0; // L: 602 + if (WorldMapData_1.garbageCollector == null || !WorldMapData_1.garbageCollector.isValid()) { // L: 603 + try { + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 605 - if (var3 < 1) { // L: 4703 - var3 = 1; - } - - int var5 = var3 - 334; // L: 4704 - int var6; - if (var5 < 0) { // L: 4706 - var6 = Client.field760; - } else if (var5 >= 100) { // L: 4707 - var6 = Client.field761; - } else { - var6 = (Client.field761 - Client.field760) * var5 / 100 + Client.field760; // L: 4708 - } - - int var7 = var3 * var6 * 512 / (var2 * 334); // L: 4709 - int var8; - int var9; - short var15; - if (var7 < Client.field766) { // L: 4710 - var15 = Client.field766; // L: 4711 - var6 = var15 * var2 * 334 / (var3 * 512); // L: 4712 - if (var6 > Client.field765) { // L: 4713 - var6 = Client.field765; // L: 4714 - var8 = var3 * var6 * 512 / (var15 * 334); // L: 4715 - var9 = (var2 - var8) / 2; // L: 4716 - if (var4) { // L: 4717 - Rasterizer2D.Rasterizer2D_resetClip(); // L: 4718 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 4719 - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 4720 + while (var1.hasNext()) { + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 606 + if (var2.isValid()) { // L: 608 + WorldMapData_1.garbageCollector = var2; // L: 609 + GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 610 + GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 611 + } } - - var0 += var9; // L: 4722 - var2 -= var9 * 2; // L: 4723 + } catch (Throwable var11) { // L: 616 } - } else if (var7 > Client.field666) { // L: 4726 - var15 = Client.field666; // L: 4727 - var6 = var15 * var2 * 334 / (var3 * 512); // L: 4728 - if (var6 < Client.field764) { // L: 4729 - var6 = Client.field764; // L: 4730 - var8 = var15 * var2 * 334 / (var6 * 512); // L: 4731 - var9 = (var3 - var8) / 2; // L: 4732 - if (var4) { // L: 4733 - Rasterizer2D.Rasterizer2D_resetClip(); // L: 4734 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 4735 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 4736 + } + + if (WorldMapData_1.garbageCollector != null) { // L: 618 + long var9 = class113.method2624(); // L: 619 + long var3 = WorldMapData_1.garbageCollector.getCollectionTime(); // L: 620 + if (GameEngine.garbageCollectorLastCollectionTime != -1L) { // L: 621 + long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 622 + long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 623 + if (0L != var7) { // L: 624 + var0 = (int)(var5 * 100L / var7); } - - var1 += var9; // L: 4738 - var3 -= var9 * 2; // L: 4739 - } - } - - Client.viewportZoom = var3 * var6 / 334; // L: 4742 - if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 4743 - int[] var14 = new int[9]; // L: 4745 - - for (var9 = 0; var9 < var14.length; ++var9) { // L: 4746 - int var10 = var9 * 32 + 15 + 128; // L: 4747 - int var11 = var10 * 3 + 600; // L: 4750 - int var13 = Rasterizer3D.Rasterizer3D_sine[var10]; // L: 4753 - int var12 = class13.method164(var11, var3); // L: 4754 - var14[var9] = var13 * var12 >> 16; // L: 4755 } - Scene.Scene_buildVisiblityMap(var14, 500, 800, var2 * 334 / var3, 334); // L: 4757 + GameEngine.garbageCollectorLastCollectionTime = var3; // L: 626 + GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 627 } - Client.viewportOffsetX = var0; // L: 4760 - Client.viewportOffsetY = var1; // L: 4761 - Client.viewportWidth = var2; // L: 4762 - Client.viewportHeight = var3; // L: 4763 - } // L: 4764 + return var0; // L: 629 + } } diff --git a/runescape-client/src/main/java/class175.java b/runescape-client/src/main/java/class175.java index 96fb40b3b2..0a80a04d9f 100644 --- a/runescape-client/src/main/java/class175.java +++ b/runescape-client/src/main/java/class175.java @@ -2,121 +2,107 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fz") +@ObfuscatedName("fu") public class class175 { - @ObfuscatedName("b") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lpz;II)Z", - garbageValue = "-1279876475" + descriptor = "Llp;" ) - @Export("updateExternalPlayer") - static boolean updateExternalPlayer(PacketBuffer var0, int var1) { - int var2 = var0.readBits(2); // L: 376 - int var3; - int var4; - int var7; - int var8; - int var9; - int var10; - if (var2 == 0) { // L: 377 - if (var0.readBits(1) != 0) { // L: 378 - updateExternalPlayer(var0, var1); - } + @Export("SpotAnimationDefinition_modelArchive") + public static AbstractArchive SpotAnimationDefinition_modelArchive; + @ObfuscatedName("ib") + @ObfuscatedSignature( + descriptor = "Lgm;" + ) + @Export("scene") + static Scene scene; - var3 = var0.readBits(13); // L: 379 - var4 = var0.readBits(13); // L: 380 - boolean var12 = var0.readBits(1) == 1; // L: 381 - if (var12) { // L: 382 - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2044568477" + ) + public static void method3380() { + WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); // L: 47 + } // L: 48 - if (Client.players[var1] != null) { // L: 383 - throw new RuntimeException(); // L: 384 - } else { - Player var11 = Client.players[var1] = new Player(); // L: 386 - var11.index = var1; // L: 387 - if (Players.field1276[var1] != null) { // L: 388 - var11.read(Players.field1276[var1]); - } - - var11.orientation = Players.Players_orientations[var1]; // L: 389 - var11.targetIndex = Players.Players_targetIndices[var1]; // L: 390 - var7 = Players.Players_regions[var1]; // L: 391 - var8 = var7 >> 28; // L: 392 - var9 = var7 >> 14 & 255; // L: 393 - var10 = var7 & 255; // L: 394 - var11.pathTraversed[0] = Players.field1286[var1]; // L: 395 - var11.plane = (byte)var8; // L: 396 - var11.resetPath((var9 << 13) + var3 - GrandExchangeOfferOwnWorldComparator.baseX, (var10 << 13) + var4 - VarcInt.baseY); // L: 397 - var11.field1070 = false; // L: 398 - return true; // L: 399 - } - } else if (var2 == 1) { // L: 401 - var3 = var0.readBits(2); // L: 402 - var4 = Players.Players_regions[var1]; // L: 403 - Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455); // L: 404 - return false; // L: 405 - } else { - int var5; - int var6; - if (var2 == 2) { // L: 407 - var3 = var0.readBits(5); // L: 408 - var4 = var3 >> 3; // L: 409 - var5 = var3 & 7; // L: 410 - var6 = Players.Players_regions[var1]; // L: 411 - var7 = (var6 >> 28) + var4 & 3; // L: 412 - var8 = var6 >> 14 & 255; // L: 413 - var9 = var6 & 255; // L: 414 - if (var5 == 0) { // L: 415 - --var8; // L: 416 - --var9; // L: 417 - } - - if (var5 == 1) { // L: 419 - --var9; - } - - if (var5 == 2) { // L: 420 - ++var8; // L: 421 - --var9; // L: 422 - } - - if (var5 == 3) { // L: 424 - --var8; - } - - if (var5 == 4) { // L: 425 - ++var8; - } - - if (var5 == 5) { // L: 426 - --var8; // L: 427 - ++var9; // L: 428 - } - - if (var5 == 6) { // L: 430 - ++var9; - } - - if (var5 == 7) { // L: 431 - ++var8; // L: 432 - ++var9; // L: 433 - } - - Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 435 - return false; // L: 436 - } else { - var3 = var0.readBits(18); // L: 438 - var4 = var3 >> 16; // L: 439 - var5 = var3 >> 8 & 255; // L: 440 - var6 = var3 & 255; // L: 441 - var7 = Players.Players_regions[var1]; // L: 442 - var8 = (var7 >> 28) + var4 & 3; // L: 443 - var9 = var5 + (var7 >> 14) & 255; // L: 444 - var10 = var6 + var7 & 255; // L: 445 - Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 446 - return false; // L: 447 - } - } + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(III)Lbo;", + garbageValue = "-586854513" + ) + @Export("Messages_getByChannelAndID") + 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("a") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-482569171" + ) + public static void method3379() { + HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 77 + HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 78 + } // L: 79 + + @ObfuscatedName("iu") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", + garbageValue = "1857595187" + ) + @Export("insertMenuItem") + static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { + if (!Client.isMenuOpen) { // L: 9911 + if (Client.menuOptionsCount < 500) { // L: 9912 + Client.menuActions[Client.menuOptionsCount] = var0; // L: 9913 + Client.menuTargets[Client.menuOptionsCount] = var1; // L: 9914 + Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 9915 + Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 9916 + Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 9917 + Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 9918 + Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 9919 + ++Client.menuOptionsCount; // L: 9920 + } + + } + } // L: 9922 + + @ObfuscatedName("im") + @ObfuscatedSignature( + descriptor = "(IIIIIIIIB)V", + garbageValue = "0" + ) + @Export("drawWidgets") + static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (WorldMapDecoration.loadInterface(var0)) { // L: 10200 + BuddyRankComparator.field1408 = null; // L: 10207 + ViewportMouse.drawInterface(NetSocket.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 10208 + if (BuddyRankComparator.field1408 != null) { // L: 10209 + ViewportMouse.drawInterface(BuddyRankComparator.field1408, -1412584499, var1, var2, var3, var4, class151.field1729, class162.field1810, var7); // L: 10210 + BuddyRankComparator.field1408 = null; // L: 10211 + } + + } else { + if (var7 != -1) { // L: 10201 + Client.field652[var7] = true; + } else { + for (int var8 = 0; var8 < 100; ++var8) { // L: 10203 + Client.field652[var8] = true; + } + } + + } + } // L: 10205 10213 + + @ObfuscatedName("km") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1703551260" + ) + static final void method3373() { + Client.field691 = Client.cycleCntr; // L: 12434 + Tiles.field997 = true; // L: 12435 + } // L: 12436 } diff --git a/runescape-client/src/main/java/class18.java b/runescape-client/src/main/java/class18.java index 839e07ca33..3b3de4626a 100644 --- a/runescape-client/src/main/java/class18.java +++ b/runescape-client/src/main/java/class18.java @@ -1,95 +1,127 @@ import java.util.Comparator; import java.util.Map.Entry; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("g") +@ObfuscatedName("e") class class18 implements Comparator { @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1555742103 + @ObfuscatedSignature( + descriptor = "Llp;" ) - static int field95; - @ObfuscatedName("lw") - @ObfuscatedGetter( - intValue = -1798104043 - ) - @Export("Client_plane") - static int Client_plane; + @Export("KitDefinition_archive") + static AbstractArchive KitDefinition_archive; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lr;" + descriptor = "Ly;" ) final class10 this$0; @ObfuscatedSignature( - descriptor = "(Lr;)V" + descriptor = "(Ly;)V" ) class18(class10 var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 40 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Ljava/util/Map$Entry;Ljava/util/Map$Entry;B)I", - garbageValue = "14" + garbageValue = "105" ) - int method257(Entry var1, Entry var2) { - return ((Float)var2.getValue()).compareTo((Float)var1.getValue()); + int method239(Entry var1, Entry var2) { + return ((Float)var2.getValue()).compareTo((Float)var1.getValue()); // L: 42 } public int compare(Object var1, Object var2) { - return this.method257((Entry)var1, (Entry)var2); + return this.method239((Entry)var1, (Entry)var2); // L: 46 } public boolean equals(Object var1) { return super.equals(var1); // L: 50 } - @ObfuscatedName("i") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lln;IIIZB)V", - garbageValue = "0" + descriptor = "(IB)I", + garbageValue = "-106" ) - public static void method266(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { - class273.musicPlayerStatus = 1; // L: 40 - class273.musicTrackArchive = var0; // L: 41 - AccessFile.musicTrackGroupId = var1; // L: 42 - class273.musicTrackFileId = var2; // L: 43 - class273.musicTrackVolume = var3; // L: 44 - class17.musicTrackBoolean = var4; // L: 45 - class273.pcmSampleLength = 10000; // L: 46 - } // L: 47 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)[Ldf;", - garbageValue = "1077936192" - ) - static class118[] method258() { - return new class118[]{class118.field1433, class118.field1430, class118.field1431, class118.field1432, class118.field1434, class118.field1429}; // L: 25 + @Export("getVarbit") + public static int getVarbit(int var0) { + VarbitComposition var1 = class1.method9(var0); + int var2 = var1.baseVar; // L: 25 + int var3 = var1.startBit; + int var4 = var1.endBit; + int var5 = Varps.Varps_masks[var4 - var3]; + return Varps.Varps_main[var2] >> var3 & var5; } - @ObfuscatedName("ll") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIS)V", - garbageValue = "-14104" + descriptor = "(IIB)I", + garbageValue = "87" ) - static final void method264(int var0, int var1) { - if (Client.currentClanChannels[var0] != null) { // L: 12423 - if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method3119()) { // L: 12424 - ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 12425 - if (var2.rank == -1) { // L: 12426 - PacketBufferNode var3 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2953, Client.packetWriter.isaacCipher); // L: 12427 - var3.packetBuffer.writeByte(3 + class425.stringCp1252NullTerminatedByteSize(var2.username.getName())); // L: 12428 - var3.packetBuffer.writeByte(var0); // L: 12429 - var3.packetBuffer.writeShort(var1); // L: 12430 - var3.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); // L: 12431 - Client.packetWriter.addNode(var3); // L: 12432 - } + static int method243(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 } + + var1 = 127 - var1; // L: 23 + return var1; // L: 24 + } 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 } - } // L: 12433 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lpc;I)I", + garbageValue = "-1204366603" + ) + static int method249(PacketBuffer var0) { + int var1 = var0.readBits(2); // L: 187 + int var2; + if (var1 == 0) { // L: 189 + var2 = 0; + } else if (var1 == 1) { + var2 = var0.readBits(5); // L: 190 + } else if (var1 == 2) { // L: 191 + var2 = var0.readBits(8); + } else { + var2 = var0.readBits(11); // L: 192 + } + + return var2; // L: 193 + } + + @ObfuscatedName("kt") + @ObfuscatedSignature( + descriptor = "(Lki;IIIB)V", + garbageValue = "-44" + ) + @Export("drawCompass") + static final void drawCompass(Widget var0, int var1, int var2, int var3) { + SpriteMask var4 = var0.getSpriteMask(false); // L: 12373 + if (var4 != null) { // L: 12374 + if (Client.minimapState < 3) { // L: 12375 + SoundSystem.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: 12376 + } + + } + } // L: 12377 } diff --git a/runescape-client/src/main/java/class182.java b/runescape-client/src/main/java/class182.java index 09c2156cd5..34e5cbc0ee 100644 --- a/runescape-client/src/main/java/class182.java +++ b/runescape-client/src/main/java/class182.java @@ -2,22 +2,65 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gb") +@ObfuscatedName("gj") public class class182 extends DualNode { - @ObfuscatedName("uv") - @ObfuscatedSignature( - descriptor = "Lnw;" - ) - @Export("masterDisk") - static ArchiveDisk masterDisk; - @ObfuscatedName("ep") - @ObfuscatedSignature( - descriptor = "Llx;" - ) - @Export("archive4") - static Archive archive4; + @ObfuscatedName("ud") + @Export("foundItemIds") + static short[] foundItemIds; static { new EvictingDualNodeHashTable(64); // L: 9 } // L: 10 + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(ILbb;ZI)I", + garbageValue = "1933917063" + ) + static int method3473(int var0, Script var1, boolean var2) { + if (var0 != 3700 && var0 != 3701) { // L: 2697 + if (var0 == 3702) { // L: 2702 + ++class12.Interpreter_intStackSize; // L: 2703 + return 1; // L: 2704 + } else { + return 2; // L: 2706 + } + } else { + --class12.Interpreter_intStackSize; // L: 2698 + --class9.Interpreter_stringStackSize; // L: 2699 + return 1; // L: 2700 + } + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(ILbb;ZI)I", + garbageValue = "1317447781" + ) + static int method3472(int var0, Script var1, boolean var2) { + if (var0 >= 7200 && var0 < 7204) { // L: 4639 + class12.Interpreter_intStackSize -= 5; // L: 4640 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4641 + return 1; // L: 4642 + } else if (var0 == 7204) { // L: 4644 + class12.Interpreter_intStackSize -= 6; // L: 4645 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4646 + return 1; // L: 4647 + } else if (var0 >= 7205 && var0 < 7209) { // L: 4649 + Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1] = -1; // L: 4650 + return 1; // L: 4651 + } else if (var0 == 7209) { // L: 4653 + class12.Interpreter_intStackSize -= 2; // L: 4654 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4655 + return 1; // L: 4656 + } else if (var0 >= 7210 && var0 < 7214) { // L: 4658 + --class12.Interpreter_intStackSize; // L: 4659 + return 1; // L: 4660 + } else if (var0 == 7214) { // L: 4662 + class12.Interpreter_intStackSize -= 2; // L: 4663 + return 1; // L: 4664 + } else { + return 2; // L: 4666 + } + } } diff --git a/runescape-client/src/main/java/class19.java b/runescape-client/src/main/java/class19.java index 6135d4e437..1a071fc1f3 100644 --- a/runescape-client/src/main/java/class19.java +++ b/runescape-client/src/main/java/class19.java @@ -3,32 +3,32 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("x") +@ObfuscatedName("h") public class class19 { - @ObfuscatedName("v") + @ObfuscatedName("o") Future field102; - @ObfuscatedName("c") - String field100; + @ObfuscatedName("q") + String field99; class19(Future var1) { this.field102 = var1; // L: 10 } // L: 11 class19(String var1) { - this.method270(var1); // L: 14 + this.method266(var1); // L: 14 } // L: 15 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1907371435" + garbageValue = "1815687689" ) - void method270(String var1) { + void method266(String var1) { if (var1 == null) { // L: 18 var1 = ""; } - this.field100 = var1; // L: 19 + this.field99 = var1; // L: 19 if (this.field102 != null) { // L: 20 this.field102.cancel(true); // L: 21 this.field102 = null; // L: 22 @@ -36,42 +36,42 @@ public class class19 { } // L: 24 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(B)Ljava/lang/String;", - garbageValue = "11" + garbageValue = "124" ) - public final String method271() { - return this.field100; // L: 27 + public final String method251() { + return this.field99; // L: 27 } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-2045655469" + garbageValue = "945569393" ) - public boolean method283() { - return this.field100 != null || this.field102 == null; // L: 31 + public boolean method250() { + return this.field99 != null || this.field102 == null; // L: 31 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "126" + descriptor = "(I)Z", + garbageValue = "-2011901158" ) - public final boolean method268() { - return this.method283() ? true : this.field102.isDone(); // L: 35 36 + public final boolean method253() { + return this.method250() ? true : this.field102.isDone(); // L: 35 36 } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)Ly;", - garbageValue = "1665321496" + descriptor = "(B)Ld;", + garbageValue = "-37" ) - public final class21 method274() { - if (this.method283()) { // L: 40 - return new class21(this.field100); - } else if (!this.method268()) { + public final class21 method254() { + if (this.method250()) { // L: 40 + return new class21(this.field99); + } else if (!this.method253()) { return null; // L: 41 } else { try { @@ -79,138 +79,543 @@ public class class19 { } catch (Exception var3) { // L: 45 String var2 = "Error retrieving REST request reply"; // L: 46 System.err.println(var2 + "\r\n" + var3); // L: 47 - this.method270(var2); // L: 48 + this.method266(var2); // L: 48 return new class21(var2); // L: 49 } } } - @ObfuscatedName("c") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(II)Lgf;", - garbageValue = "-1420060608" + descriptor = "(II)Z", + garbageValue = "20278847" ) - @Export("ItemDefinition_get") - public static ItemComposition ItemDefinition_get(int var0) { - ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); // L: 92 - if (var1 != null) { // L: 93 - return var1; - } else { - byte[] var2 = SoundCache.ItemDefinition_archive.takeFile(10, var0); // L: 94 - var1 = new ItemComposition(); // L: 95 - var1.id = var0; // L: 96 - if (var2 != null) { // L: 97 - var1.decode(new Buffer(var2)); + public static boolean method257(int var0) { + return var0 >= 0 && var0 < 112 ? KeyHandler.field132[var0] : false; // L: 237 238 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(IIIIIILgm;Lgh;B)V", + garbageValue = "14" + ) + @Export("addObjects") + static final void addObjects(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: 345 346 347 + if (var0 < Tiles.Tiles_minPlane) { // L: 350 + Tiles.Tiles_minPlane = var0; } - var1.post(); // L: 98 - if (var1.noteTemplate != -1) { // L: 99 - var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); + ObjectComposition var8 = class82.getObjectDefinition(var3); // L: 351 + int var9; + int var10; + if (var4 != 1 && var4 != 3) { // L: 354 + var9 = var8.sizeX; // L: 359 + var10 = var8.sizeY; // L: 360 + } else { + var9 = var8.sizeY; // L: 355 + var10 = var8.sizeX; // L: 356 } - if (var1.notedId != -1) { // L: 100 - var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); + int var11; + int var12; + if (var9 + var1 <= 104) { // L: 366 + var11 = (var9 >> 1) + var1; // L: 367 + var12 = (var9 + 1 >> 1) + var1; // L: 368 + } else { + var11 = var1; // L: 371 + var12 = var1 + 1; // L: 372 } - if (var1.placeholderTemplate != -1) { // L: 101 - var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); + int var13; + int var14; + if (var10 + var2 <= 104) { // L: 374 + var13 = (var10 >> 1) + var2; // L: 375 + var14 = var2 + (var10 + 1 >> 1); // L: 376 + } else { + var13 = var2; // L: 379 + var14 = var2 + 1; // L: 380 } - if (!DevicePcmPlayerProvider.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 102 - var1.name = "Members object"; // L: 103 - var1.isTradable = false; // L: 104 + int[][] var15 = Tiles.Tiles_heights[var0]; // L: 382 + int var16 = var15[var12][var14] + var15[var11][var14] + var15[var12][var13] + var15[var11][var13] >> 2; // L: 383 + int var17 = (var1 << 7) + (var9 << 6); // L: 384 + int var18 = (var2 << 7) + (var10 << 6); // L: 385 + long var19 = VarbitComposition.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 386 + int var21 = var5 + (var4 << 6); // L: 387 + if (var8.int3 == 1) { // L: 388 + var21 += 256; + } - int var3; - for (var3 = 0; var3 < var1.groundActions.length; ++var3) { // L: 105 - var1.groundActions[var3] = null; // L: 106 + int var23; + int var24; + if (var8.hasSound()) { // L: 389 + ObjectSound var22 = new ObjectSound(); // L: 390 + var22.plane = var0; // L: 391 + var22.x = var1 * 128; // L: 392 + var22.y = var2 * 128; // L: 393 + var23 = var8.sizeX; // L: 394 + var24 = var8.sizeY; // L: 395 + if (var4 == 1 || var4 == 3) { // L: 396 + var23 = var8.sizeY; // L: 397 + var24 = var8.sizeX; // L: 398 } - for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { // L: 108 - if (var3 != 4) { // L: 109 - var1.inventoryActions[var3] = null; // L: 110 + var22.maxX = (var23 + var1) * 128; // L: 400 + var22.maxY = (var24 + var2) * 128; // L: 401 + var22.soundEffectId = var8.ambientSoundId; // L: 402 + var22.field817 = var8.int7 * 128; // L: 403 + var22.field813 = var8.int5; // L: 404 + var22.field808 = var8.int6; // L: 405 + var22.soundEffectIds = var8.soundEffectIds; // L: 406 + if (var8.transforms != null) { // L: 407 + var22.obj = var8; // L: 408 + var22.set(); // L: 409 + } + + ObjectSound.objectSounds.addFirst(var22); // L: 411 + if (var22.soundEffectIds != null) { // L: 412 + var22.field810 = var22.field813 + (int)(Math.random() * (double)(var22.field808 - var22.field813)); + } + } + + Object var34; + if (var5 == 22) { // L: 414 + if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 415 + if (var8.animationId == -1 && var8.transforms == null) { // L: 417 + var34 = var8.getEntity(22, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 418 } + + var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var34, var19, var21); // L: 419 + if (var8.interactType == 1 && var7 != null) { // L: 420 + var7.setBlockedByFloorDec(var1, var2); + } + } + } else if (var5 != 10 && var5 != 11) { // L: 423 + int[] var10000; + if (var5 >= 12) { // L: 444 + if (var8.animationId == -1 && var8.transforms == null) { // L: 446 + var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 447 + } - var1.shiftClickIndex = -2; // L: 113 - var1.team = 0; // L: 114 - if (var1.params != null) { // L: 115 - boolean var6 = false; // L: 116 + var6.method4176(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 448 + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 449 + var10000 = VerticalAlignment.field1993[var0][var1]; + var10000[var2] |= 2340; + } - for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 117 - ParamComposition var5 = class151.getParamDefinition((int)var4.key); // L: 118 - if (var5.autoDisable) { // L: 119 - var4.remove(); - } else { - var6 = true; // L: 120 + if (var8.interactType != 0 && var7 != null) { // L: 450 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } else if (var5 == 0) { // L: 453 + if (var8.animationId == -1 && var8.transforms == null) { // L: 455 + var34 = var8.getEntity(0, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 456 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field988[var4], 0, var19, var21); // L: 457 + if (var4 == 0) { // L: 458 + if (var8.clipped) { // L: 459 + NPC.field1259[var0][var1][var2] = 50; // L: 460 + NPC.field1259[var0][var1][var2 + 1] = 50; // L: 461 + } + + if (var8.modelClipped) { // L: 463 + var10000 = VerticalAlignment.field1993[var0][var1]; + var10000[var2] |= 585; + } + } else if (var4 == 1) { // L: 465 + if (var8.clipped) { // L: 466 + NPC.field1259[var0][var1][var2 + 1] = 50; // L: 467 + NPC.field1259[var0][var1 + 1][var2 + 1] = 50; // L: 468 + } + + if (var8.modelClipped) { // L: 470 + var10000 = VerticalAlignment.field1993[var0][var1]; + var10000[var2 + 1] |= 1170; + } + } else if (var4 == 2) { // L: 472 + if (var8.clipped) { // L: 473 + NPC.field1259[var0][var1 + 1][var2] = 50; // L: 474 + NPC.field1259[var0][var1 + 1][var2 + 1] = 50; // L: 475 + } + + if (var8.modelClipped) { // L: 477 + var10000 = VerticalAlignment.field1993[var0][var1 + 1]; + var10000[var2] |= 585; + } + } else if (var4 == 3) { // L: 479 + if (var8.clipped) { // L: 480 + NPC.field1259[var0][var1][var2] = 50; // L: 481 + NPC.field1259[var0][var1 + 1][var2] = 50; // L: 482 + } + + if (var8.modelClipped) { // L: 484 + var10000 = VerticalAlignment.field1993[var0][var1]; + var10000[var2] |= 1170; } } - if (!var6) { - var1.params = null; // L: 122 + if (var8.interactType != 0 && var7 != null) { // L: 486 + var7.method3749(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 487 + var6.method4180(var0, var1, var2, var8.int2); + } + + } else if (var5 == 1) { // L: 490 + if (var8.animationId == -1 && var8.transforms == null) { // L: 492 + var34 = var8.getEntity(1, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 493 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field989[var4], 0, var19, var21); // L: 494 + if (var8.clipped) { // L: 495 + if (var4 == 0) { // L: 496 + NPC.field1259[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { // L: 497 + NPC.field1259[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { // L: 498 + NPC.field1259[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { // L: 499 + NPC.field1259[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 501 + var7.method3749(var1, var2, var5, var4, var8.boolean1); + } + + } else { + int var28; + if (var5 == 2) { // L: 504 + var28 = var4 + 1 & 3; // L: 505 + Object var31; + Object var32; + if (var8.animationId == -1 && var8.transforms == null) { // L: 508 + var31 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 509 + var32 = var8.getEntity(2, var28, var15, var17, var16, var18); // L: 510 + } else { + var31 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 513 + var32 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 514 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var31, (Renderable)var32, Tiles.field988[var4], Tiles.field988[var28], var19, var21); // L: 516 + if (var8.modelClipped) { // L: 517 + if (var4 == 0) { // L: 518 + var10000 = VerticalAlignment.field1993[var0][var1]; // L: 519 + var10000[var2] |= 585; + var10000 = VerticalAlignment.field1993[var0][var1]; // L: 520 + var10000[1 + var2] |= 1170; + } else if (var4 == 1) { // L: 522 + var10000 = VerticalAlignment.field1993[var0][var1]; // L: 523 + var10000[var2 + 1] |= 1170; + var10000 = VerticalAlignment.field1993[var0][var1 + 1]; // L: 524 + var10000[var2] |= 585; + } else if (var4 == 2) { // L: 526 + var10000 = VerticalAlignment.field1993[var0][var1 + 1]; // L: 527 + var10000[var2] |= 585; + var10000 = VerticalAlignment.field1993[var0][var1]; // L: 528 + var10000[var2] |= 1170; + } else if (var4 == 3) { // L: 530 + var10000 = VerticalAlignment.field1993[var0][var1]; // L: 531 + var10000[var2] |= 1170; + var10000 = VerticalAlignment.field1993[var0][var1]; // L: 532 + var10000[var2] |= 585; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 535 + var7.method3749(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 536 + var6.method4180(var0, var1, var2, var8.int2); + } + + } else if (var5 == 3) { // L: 539 + if (var8.animationId == -1 && var8.transforms == null) { // L: 541 + var34 = var8.getEntity(3, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 542 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field989[var4], 0, var19, var21); // L: 543 + if (var8.clipped) { // L: 544 + if (var4 == 0) { // L: 545 + NPC.field1259[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { // L: 546 + NPC.field1259[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { // L: 547 + NPC.field1259[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { // L: 548 + NPC.field1259[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 550 + var7.method3749(var1, var2, var5, var4, var8.boolean1); + } + + } else if (var5 == 9) { // L: 553 + if (var8.animationId == -1 && var8.transforms == null) { // L: 555 + var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 556 + } + + var6.method4176(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 557 + if (var8.interactType != 0 && var7 != null) { // L: 558 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 559 + var6.method4180(var0, var1, var2, var8.int2); + } + + } else if (var5 == 4) { // L: 562 + if (var8.animationId == -1 && var8.transforms == null) { // L: 564 + var34 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 565 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field988[var4], 0, 0, 0, var19, var21); // L: 566 + } else { + Object var25; + long var29; + if (var5 == 5) { // L: 569 + var28 = 16; // L: 570 + var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 571 + if (0L != var29) { // L: 572 + var28 = class82.getObjectDefinition(NetSocket.Entity_unpackID(var29)).int2; + } + + if (var8.animationId == -1 && var8.transforms == null) { // L: 574 + var25 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 575 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field988[var4], 0, var28 * Tiles.field990[var4], var28 * Tiles.field991[var4], var19, var21); // L: 576 + } else if (var5 == 6) { // L: 579 + var28 = 8; // L: 580 + var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 581 + if (var29 != 0L) { // L: 582 + var28 = class82.getObjectDefinition(NetSocket.Entity_unpackID(var29)).int2 / 2; + } + + if (var8.animationId == -1 && var8.transforms == null) { // L: 584 + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 585 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var28 * Tiles.field995[var4], var28 * Tiles.field993[var4], var19, var21); // L: 586 + } else if (var5 == 7) { // L: 589 + var23 = var4 + 2 & 3; // L: 591 + if (var8.animationId == -1 && var8.transforms == null) { // L: 592 + var34 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 593 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, 256, var23, 0, 0, var19, var21); // L: 594 + } else if (var5 == 8) { // L: 597 + var28 = 8; // L: 598 + var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 599 + if (0L != var29) { // L: 600 + var28 = class82.getObjectDefinition(NetSocket.Entity_unpackID(var29)).int2 / 2; + } + + int var27 = var4 + 2 & 3; // L: 603 + Object var26; + if (var8.animationId == -1 && var8.transforms == null) { // L: 604 + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 605 + var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 606 + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 609 + var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 610 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var28 * Tiles.field995[var4], var28 * Tiles.field993[var4], var19, var21); // L: 612 + } } } + } else { + if (var8.animationId == -1 && var8.transforms == null) { // L: 425 + var34 = var8.getEntity(10, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 426 + } + + if (var34 != null && var6.method4176(var0, var1, var2, var16, var9, var10, (Renderable)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 427 428 + var23 = 15; // L: 429 + if (var34 instanceof Model) { // L: 430 + var23 = ((Model)var34).method4277() / 4; // L: 431 + if (var23 > 30) { // L: 432 + var23 = 30; + } + } + + for (var24 = 0; var24 <= var9; ++var24) { // L: 434 + for (int var33 = 0; var33 <= var10; ++var33) { // L: 435 + if (var23 > NPC.field1259[var0][var24 + var1][var33 + var2]) { // L: 436 + NPC.field1259[var0][var24 + var1][var33 + var2] = (byte)var23; + } + } + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 441 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } + } + } // L: 421 442 451 488 502 537 551 560 567 577 587 595 613 615 + + @ObfuscatedName("kx") + @ObfuscatedSignature( + descriptor = "(Lki;IIIB)V", + garbageValue = "-23" + ) + @Export("drawMinimap") + static final void drawMinimap(Widget var0, int var1, int var2, int var3) { + ArchiveLoader.playPcmPlayers(); // L: 12288 + SpriteMask var4 = var0.getSpriteMask(false); // L: 12289 + if (var4 != null) { // L: 12290 + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 12291 + if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 12292 + int var5 = Client.camAngleY & 2047; // L: 12293 + int var6 = ModelData0.localPlayer.x / 32 + 48; // L: 12294 + int var7 = 464 - ModelData0.localPlayer.y / 32; // L: 12295 + InterfaceParent.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 12296 + + int var8; + int var10; + int var16; + for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 12297 + var16 = Client.mapIconXs[var8] * 4 + 2 - ModelData0.localPlayer.x / 32; // L: 12298 + var10 = Client.mapIconYs[var8] * 4 + 2 - ModelData0.localPlayer.y / 32; // L: 12299 + PcmPlayer.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); // L: 12300 + } + + int var11; + int var12; + for (var8 = 0; var8 < 104; ++var8) { // L: 12302 + for (var16 = 0; var16 < 104; ++var16) { // L: 12303 + NodeDeque var14 = Client.groundItems[class128.Client_plane][var8][var16]; // L: 12304 + if (var14 != null) { // L: 12305 + var11 = var8 * 4 + 2 - ModelData0.localPlayer.x / 32; // L: 12306 + var12 = var16 * 4 + 2 - ModelData0.localPlayer.y / 32; // L: 12307 + PcmPlayer.drawSpriteOnMinimap(var1, var2, var11, var12, WallDecoration.mapDotSprites[0], var4); // L: 12308 + } + } + } + + for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 12312 + NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 12313 + if (var9 != null && var9.isVisible()) { // L: 12314 + NPCComposition var18 = var9.definition; // L: 12315 + if (var18 != null && var18.transforms != null) { // L: 12316 + var18 = var18.transform(); + } + + if (var18 != null && var18.drawMapDot && var18.isInteractable) { // L: 12317 + var11 = var9.x / 32 - ModelData0.localPlayer.x / 32; // L: 12318 + var12 = var9.y / 32 - ModelData0.localPlayer.y / 32; // L: 12319 + PcmPlayer.drawSpriteOnMinimap(var1, var2, var11, var12, WallDecoration.mapDotSprites[1], var4); // L: 12320 + } + } + } + + var8 = Players.Players_count; // L: 12324 + int[] var17 = Players.Players_indices; // L: 12325 + + for (var10 = 0; var10 < var8; ++var10) { // L: 12326 + Player var15 = Client.players[var17[var10]]; // L: 12327 + if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != ModelData0.localPlayer) { // L: 12328 + var12 = var15.x / 32 - ModelData0.localPlayer.x / 32; // L: 12329 + int var13 = var15.y / 32 - ModelData0.localPlayer.y / 32; // L: 12330 + if (var15.isFriend()) { // L: 12331 + PcmPlayer.drawSpriteOnMinimap(var1, var2, var12, var13, WallDecoration.mapDotSprites[3], var4); + } else if (ModelData0.localPlayer.team != 0 && var15.team != 0 && var15.team == ModelData0.localPlayer.team) { // L: 12332 + PcmPlayer.drawSpriteOnMinimap(var1, var2, var12, var13, WallDecoration.mapDotSprites[4], var4); + } else if (var15.isFriendsChatMember()) { // L: 12333 + PcmPlayer.drawSpriteOnMinimap(var1, var2, var12, var13, WallDecoration.mapDotSprites[5], var4); + } else if (var15.isClanMember()) { // L: 12334 + PcmPlayer.drawSpriteOnMinimap(var1, var2, var12, var13, WallDecoration.mapDotSprites[6], var4); + } else { + PcmPlayer.drawSpriteOnMinimap(var1, var2, var12, var13, WallDecoration.mapDotSprites[2], var4); // L: 12335 + } + } + } + + if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 12338 + if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 12339 + NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; // L: 12340 + if (var19 != null) { // L: 12341 + var11 = var19.x / 32 - ModelData0.localPlayer.x / 32; // L: 12342 + var12 = var19.y / 32 - ModelData0.localPlayer.y / 32; // L: 12343 + VarcInt.worldToMinimap(var1, var2, var11, var12, class146.mapMarkerSprites[1], var4); // L: 12344 + } + } + + if (Client.hintArrowType == 2) { // L: 12347 + var10 = Client.hintArrowX * 4 - SecureRandomCallable.baseX * 4 + 2 - ModelData0.localPlayer.x / 32; // L: 12348 + var11 = Client.hintArrowY * 4 - GrandExchangeOfferOwnWorldComparator.baseY * 4 + 2 - ModelData0.localPlayer.y / 32; // L: 12349 + VarcInt.worldToMinimap(var1, var2, var10, var11, class146.mapMarkerSprites[1], var4); // L: 12350 + } + + if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 12352 + Player var20 = Client.players[Client.hintArrowPlayerIndex]; // L: 12353 + if (var20 != null) { // L: 12354 + var11 = var20.x / 32 - ModelData0.localPlayer.x / 32; // L: 12355 + var12 = var20.y / 32 - ModelData0.localPlayer.y / 32; // L: 12356 + VarcInt.worldToMinimap(var1, var2, var11, var12, class146.mapMarkerSprites[1], var4); // L: 12357 + } + } + } + + if (Client.destinationX != 0) { // L: 12361 + var10 = Client.destinationX * 4 + 2 - ModelData0.localPlayer.x / 32; // L: 12362 + var11 = Client.destinationY * 4 + 2 - ModelData0.localPlayer.y / 32; // L: 12363 + PcmPlayer.drawSpriteOnMinimap(var1, var2, var10, var11, class146.mapMarkerSprites[0], var4); // L: 12364 + } + + if (!ModelData0.localPlayer.isHidden) { // L: 12366 + 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: 12368 } - ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 125 - return var1; // L: 126 + Client.field704[var3] = true; // L: 12369 } - } + } // L: 12370 - @ObfuscatedName("f") + @ObfuscatedName("kg") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "1009415810" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1927350228" ) - public static int method288(CharSequence var0) { - return class263.method5178(var0, 10, true); // L: 67 - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "-169885826" - ) - static int method286(int var0, Script var1, boolean var2) { - if (var0 >= 7200 && var0 < 7204) { // L: 4639 - Interpreter.Interpreter_intStackSize -= 5; // L: 4640 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4641 - return 1; // L: 4642 - } else if (var0 == 7204) { // L: 4644 - Interpreter.Interpreter_intStackSize -= 6; // L: 4645 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4646 - return 1; // L: 4647 - } else if (var0 >= 7205 && var0 < 7209) { // L: 4649 - Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4650 - return 1; // L: 4651 - } else if (var0 == 7209) { // L: 4653 - Interpreter.Interpreter_intStackSize -= 2; // L: 4654 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4655 - return 1; // L: 4656 - } else if (var0 >= 7210 && var0 < 7214) { // L: 4658 - --Interpreter.Interpreter_intStackSize; // L: 4659 - return 1; // L: 4660 - } else if (var0 == 7214) { // L: 4662 - Interpreter.Interpreter_intStackSize -= 2; // L: 4663 - return 1; // L: 4664 - } else { - return 2; // L: 4666 + @Export("clanKickUser") + static final void clanKickUser(String var0) { + if (PcmPlayer.friendsChat != null) { // L: 12439 + PacketBufferNode var1 = WallDecoration.getPacketBufferNode(ClientPacket.field2983, Client.packetWriter.isaacCipher); // L: 12440 + var1.packetBuffer.writeByte(class392.stringCp1252NullTerminatedByteSize(var0)); // L: 12441 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 12442 + Client.packetWriter.addNode(var1); // L: 12443 } - } - - @ObfuscatedName("gb") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-53" - ) - static final void method287() { - if (SoundSystem.field309) { // L: 3629 - for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 3631 - Player var1 = Client.players[Players.Players_indices[var0]]; // L: 3632 - var1.method2121(); // L: 3633 - } - - SoundSystem.field309 = false; // L: 3636 - } - - } // L: 3638 + } // L: 12444 } diff --git a/runescape-client/src/main/java/class193.java b/runescape-client/src/main/java/class193.java index 1386a69d83..6b51dc0960 100644 --- a/runescape-client/src/main/java/class193.java +++ b/runescape-client/src/main/java/class193.java @@ -2,63 +2,71 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gm") +@ObfuscatedName("gd") public enum class193 implements MouseWheel { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgm;" + descriptor = "Lgd;" ) - field2186((byte)-1), - @ObfuscatedName("c") + field2250((byte)-1), + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lgm;" + descriptor = "Lgd;" ) - field2184((byte)0), - @ObfuscatedName("i") + field2249((byte)0), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgm;" + descriptor = "Lgd;" ) - field2185((byte)1), - @ObfuscatedName("f") + field2251((byte)1), + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lgm;" + descriptor = "Lgd;" ) - field2187((byte)2); + field2248((byte)2); - @ObfuscatedName("ah") - protected static String field2189; - @ObfuscatedName("b") - public byte field2183; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lcc;" + ) + @Export("loginScreenRunesAnimation") + static LoginScreenAnimation loginScreenRunesAnimation; + @ObfuscatedName("a") + public byte field2252; class193(byte var3) { - this.field2183 = var3; // L: 14 + this.field2252 = var3; // L: 14 } // L: 15 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field2183; // L: 18 + return this.field2252; // L: 19 } - @ObfuscatedName("c") + @ObfuscatedName("ld") @ObfuscatedSignature( - descriptor = "(Lpi;I)Ljava/lang/String;", - garbageValue = "562183385" + descriptor = "(Lki;II)Ljava/lang/String;", + garbageValue = "-1588715753" ) - public static String method3883(Buffer var0) { - return WorldMapIcon_1.method3933(var0, 32767); // L: 60 + static String method3801(Widget var0, int var1) { + if (!MenuAction.method1880(UrlRequester.getWidgetFlags(var0), var1) && var0.onOp == null) { // L: 12513 + 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: 12514 12515 12517 + } } - @ObfuscatedName("l") + @ObfuscatedName("ls") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1188814406" + descriptor = "(II)V", + garbageValue = "-540726719" ) - public static void method3884() { - KitDefinition.KitDefinition_cached.clear(); // L: 130 - } // L: 131 + static void method3800(int var0) { + Client.oculusOrbState = var0; // L: 12665 + } // L: 12666 } diff --git a/runescape-client/src/main/java/class194.java b/runescape-client/src/main/java/class194.java index 709e130cc4..9fe5563465 100644 --- a/runescape-client/src/main/java/class194.java +++ b/runescape-client/src/main/java/class194.java @@ -1,27 +1,33 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("go") +@ObfuscatedName("gc") public class class194 { - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("directions") public static int[][] directions; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("distances") public static int[][] distances; - @ObfuscatedName("l") + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1497652731 + ) + public static int field2255; + @ObfuscatedName("s") @Export("bufferX") public static int[] bufferX; - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("bufferY") public static int[] bufferY; - @ObfuscatedName("m") + @ObfuscatedName("er") @ObfuscatedSignature( - descriptor = "Lpi;" + descriptor = "Lle;" ) - @Export("NetCache_responseArchiveBuffer") - public static Buffer NetCache_responseArchiveBuffer; + @Export("archive3") + static Archive archive3; static { directions = new int[128][128]; // L: 6 @@ -30,12 +36,97 @@ public class class194 { bufferY = new int[4096]; // L: 12 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIS)I", - garbageValue = "-32639" + descriptor = "(B)[Lja;", + garbageValue = "-67" ) - public static int method3890(int var0, int var1) { - return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; // L: 24 + public static class263[] method3807() { + return new class263[]{class263.field3071, class263.field3058, class263.field3060, class263.field3062, class263.field3068, class263.field3063, class263.field3059, class263.field3064, class263.field3066, class263.field3067}; // L: 17 } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;II[BII)I", + garbageValue = "-1426013528" + ) + @Export("encodeStringCp1252") + public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { + int var5 = var2 - var1; // L: 45 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 46 + char var7 = var0.charAt(var6 + var1); // L: 47 + if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 48 + var3[var6 + var4] = (byte)var7; + } else if (var7 == 8364) { // L: 49 + var3[var6 + var4] = -128; + } else if (var7 == 8218) { // L: 50 + var3[var6 + var4] = -126; + } else if (var7 == 402) { // L: 51 + var3[var6 + var4] = -125; + } else if (var7 == 8222) { // L: 52 + var3[var6 + var4] = -124; + } else if (var7 == 8230) { // L: 53 + var3[var6 + var4] = -123; + } else if (var7 == 8224) { // L: 54 + var3[var6 + var4] = -122; + } else if (var7 == 8225) { // L: 55 + var3[var6 + var4] = -121; + } else if (var7 == 710) { + var3[var6 + var4] = -120; // L: 56 + } else if (var7 == 8240) { // L: 57 + var3[var6 + var4] = -119; + } else if (var7 == 352) { // L: 58 + var3[var6 + var4] = -118; + } else if (var7 == 8249) { // L: 59 + var3[var6 + var4] = -117; + } else if (var7 == 338) { // L: 60 + var3[var6 + var4] = -116; + } else if (var7 == 381) { // L: 61 + var3[var6 + var4] = -114; + } else if (var7 == 8216) { // L: 62 + var3[var6 + var4] = -111; + } else if (var7 == 8217) { // L: 63 + var3[var6 + var4] = -110; + } else if (var7 == 8220) { // L: 64 + var3[var6 + var4] = -109; + } else if (var7 == 8221) { // L: 65 + var3[var6 + var4] = -108; + } else if (var7 == 8226) { // L: 66 + var3[var6 + var4] = -107; + } else if (var7 == 8211) { // L: 67 + var3[var6 + var4] = -106; + } else if (var7 == 8212) { + var3[var6 + var4] = -105; // L: 68 + } else if (var7 == 732) { // L: 69 + var3[var6 + var4] = -104; + } else if (var7 == 8482) { // L: 70 + var3[var6 + var4] = -103; + } else if (var7 == 353) { // L: 71 + var3[var6 + var4] = -102; + } else if (var7 == 8250) { // L: 72 + var3[var6 + var4] = -101; + } else if (var7 == 339) { // L: 73 + var3[var6 + var4] = -100; + } else if (var7 == 382) { // L: 74 + var3[var6 + var4] = -98; + } else if (var7 == 376) { // L: 75 + var3[var6 + var4] = -97; + } else { + var3[var6 + var4] = 63; // L: 76 + } + } + + return var5; // L: 78 + } + + @ObfuscatedName("kq") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-114" + ) + static final void method3804() { + Client.field690 = Client.cycleCntr; // L: 12429 + Decimator.ClanChat_inClanChat = true; // L: 12430 + } // L: 12431 } diff --git a/runescape-client/src/main/java/class196.java b/runescape-client/src/main/java/class196.java deleted file mode 100644 index 14ac967537..0000000000 --- a/runescape-client/src/main/java/class196.java +++ /dev/null @@ -1,152 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gx") -public class class196 { - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -1925953895 - ) - static int field2204; - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Lpe;I)Ljava/lang/String;", - garbageValue = "1101478665" - ) - public static String method3900(CharSequence var0, LoginType var1) { - if (var0 == null) { // L: 48 - return null; - } else { - int var2 = 0; // L: 49 - - int var3; - boolean var4; - char var5; - for (var3 = var0.length(); var2 < var3; ++var2) { // L: 50 53 63 - var5 = var0.charAt(var2); // L: 55 - var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; // L: 57 - if (!var4) { // L: 59 - break; - } - } - - while (var3 > var2) { // L: 67 - var5 = var0.charAt(var3 - 1); // L: 69 - var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; // L: 71 - if (!var4) { // L: 73 - break; - } - - --var3; // L: 77 - } - - int var11 = var3 - var2; // L: 79 - if (var11 >= 1 && var11 <= class204.method4255(var1)) { // L: 80 - StringBuilder var10 = new StringBuilder(var11); // L: 81 - - for (int var6 = var2; var6 < var3; ++var6) { // L: 82 - char var7 = var0.charAt(var6); // L: 83 - if (NetSocket.method3309(var7)) { // L: 84 - char var8; - switch(var7) { // L: 87 - case ' ': - case '-': - case '_': - case ' ': - var8 = '_'; // L: 97 - break; // L: 98 - case '#': - case '[': - case ']': - var8 = var7; // L: 91 - break; - case 'À': - case 'Á': - case 'Â': - case 'Ã': - case 'Ä': - case 'à': - case 'á': - case 'â': - case 'ã': - case 'ä': - var8 = 'a'; // L: 113 - break; // L: 114 - case 'Ç': - case 'ç': - var8 = 'c'; // L: 117 - break; // L: 118 - case 'È': - case 'É': - case 'Ê': - case 'Ë': - case 'è': - case 'é': - case 'ê': - case 'ë': - var8 = 'e'; // L: 135 - break; // L: 136 - case 'Í': - case 'Î': - case 'Ï': - case 'í': - case 'î': - case 'ï': - var8 = 'i'; // L: 125 - break; // L: 126 - case 'Ñ': - case 'ñ': - var8 = 'n'; // L: 167 - break; - case 'Ò': - case 'Ó': - case 'Ô': - case 'Õ': - case 'Ö': - case 'ò': - case 'ó': - case 'ô': - case 'õ': - case 'ö': - var8 = 'o'; // L: 147 - break; // L: 148 - case 'Ù': - case 'Ú': - case 'Û': - case 'Ü': - case 'ù': - case 'ú': - case 'û': - case 'ü': - var8 = 'u'; // L: 157 - break; // L: 158 - case 'ß': - var8 = 'b'; // L: 160 - break; // L: 161 - case 'ÿ': - case 'Ÿ': - var8 = 'y'; // L: 101 - break; // L: 102 - default: - var8 = Character.toLowerCase(var7); // L: 163 - } - - if (var8 != 0) { // L: 172 - var10.append(var8); // L: 173 - } - } - } - - if (var10.length() == 0) { // L: 175 - return null; - } else { - return var10.toString(); // L: 176 - } - } else { - return null; - } - } - } -} diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index d3ef816257..f3cfc60052 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("i") +@ObfuscatedName("l") public interface class2 { } diff --git a/runescape-client/src/main/java/class20.java b/runescape-client/src/main/java/class20.java index 7f3001d6c6..4c906d8e39 100644 --- a/runescape-client/src/main/java/class20.java +++ b/runescape-client/src/main/java/class20.java @@ -1,233 +1,77 @@ import java.io.IOException; import java.util.concurrent.Callable; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("a") +@ObfuscatedName("f") public class class20 implements Callable { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lr;" + @ObfuscatedName("ix") + @ObfuscatedGetter( + intValue = -1111023185 ) - final class10 field107; + @Export("selectedItemWidget") + static int selectedItemWidget; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Ly;" + ) + final class10 field106; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ld;" + descriptor = "Lt;" ) final class14 this$0; @ObfuscatedSignature( - descriptor = "(Ld;Lr;)V" + descriptor = "(Lt;Ly;)V" ) class20(class14 var1, class10 var2) { this.this$0 = var1; // L: 46 - this.field107 = var2; // L: 47 + this.field106 = var2; // L: 47 } // L: 48 public Object call() throws Exception { try { - while (this.field107.method86()) { // L: 52 - class93.method2384(10L); // L: 53 + while (this.field106.method79()) { // L: 53 + class241.method4815(10L); // L: 54 } - } catch (IOException var2) { // L: 56 - return new class21("Error servicing REST query: " + var2.getMessage()); // L: 57 + } catch (IOException var2) { // L: 57 + return new class21("Error servicing REST query: " + var2.getMessage()); // L: 58 } - return this.field107.method81(); // L: 59 + return this.field106.method82(); // L: 60 } - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lpi;IIIIIIB)V", - garbageValue = "1" + descriptor = "(Lki;B)I", + garbageValue = "-14" ) - @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: 169 - Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 170 - - while (true) { - var7 = var0.readUnsignedByte(); // L: 172 - if (var7 == 0) { // L: 173 - if (var1 == 0) { // L: 174 - int[] var14 = Tiles.Tiles_heights[0][var2]; // L: 175 - int var11 = var2 + var4 + 932731; // L: 178 - int var12 = var3 + var5 + 556238; // L: 179 - int var13 = UserComparator9.method2615(45365 + var11, var12 + 91923, 4) - 128 + (UserComparator9.method2615(10294 + var11, 37821 + var12, 2) - 128 >> 1) + (UserComparator9.method2615(var11, var12, 1) - 128 >> 2); // L: 181 - var13 = (int)(0.3D * (double)var13) + 35; // L: 182 - if (var13 < 10) { // L: 183 - var13 = 10; - } else if (var13 > 60) { // L: 184 - var13 = 60; - } - - var14[var3] = -var13 * 8; // L: 187 - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 189 - } - break; - } - - if (var7 == 1) { // L: 192 - int var8 = var0.readUnsignedByte(); // L: 193 - if (var8 == 1) { // L: 194 - var8 = 0; - } - - if (var1 == 0) { // L: 195 - 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: 196 - } - break; - } - - if (var7 <= 49) { // L: 199 - class14.Tiles_overlays[var1][var2][var3] = var0.readByte(); // L: 200 - class147.Tiles_shapes[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 201 - Tiles.field983[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 202 - } else if (var7 <= 81) { // L: 205 - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 206 - } else { - Tiles.Tiles_underlays[var1][var2][var3] = (byte)(var7 - 81); // L: 209 - } - } + static int method269(Widget var0) { + if (var0.type != 11) { // L: 1238 + Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize - 1] = ""; // L: 1239 + return 1; // L: 1240 } else { - while (true) { - var7 = var0.readUnsignedByte(); // L: 214 - if (var7 == 0) { // L: 215 - break; - } - - if (var7 == 1) { // L: 216 - var0.readUnsignedByte(); // L: 217 - break; - } - - if (var7 <= 49) { // L: 220 - var0.readUnsignedByte(); - } - } + String var1 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1242 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var0.method5523(var1); // L: 1243 + return 1; // L: 1244 } + } - } // L: 223 - - @ObfuscatedName("jm") + @ObfuscatedName("iy") @ObfuscatedSignature( - descriptor = "(Lcz;IIII)V", - garbageValue = "1063086800" + descriptor = "(I)V", + garbageValue = "-1249445157" ) - @Export("addPlayerToMenu") - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (GrandExchangeEvents.localPlayer != var0) { // L: 10123 - if (Client.menuOptionsCount < 400) { // L: 10124 - String var4; - int var7; - if (var0.skillLevel == 0) { // L: 10126 - String var5 = var0.actions[0] + var0.username + var0.actions[1]; // L: 10127 - var7 = var0.combatLevel; // L: 10129 - int var8 = GrandExchangeEvents.localPlayer.combatLevel; // L: 10130 - int var9 = var8 - var7; // L: 10132 - String var6; - if (var9 < -9) { // L: 10133 - var6 = UserComparator9.colorStartTag(16711680); // L: 10134 - } else if (var9 < -6) { // L: 10137 - var6 = UserComparator9.colorStartTag(16723968); // L: 10138 - } else if (var9 < -3) { // L: 10141 - var6 = UserComparator9.colorStartTag(16740352); // L: 10142 - } else if (var9 < 0) { // L: 10145 - var6 = UserComparator9.colorStartTag(16756736); // L: 10146 - } else if (var9 > 9) { // L: 10149 - var6 = UserComparator9.colorStartTag(65280); // L: 10150 - } else if (var9 > 6) { // L: 10153 - var6 = UserComparator9.colorStartTag(4259584); // L: 10154 - } else if (var9 > 3) { // L: 10157 - var6 = UserComparator9.colorStartTag(8453888); // L: 10158 - } else if (var9 > 0) { // L: 10161 - var6 = UserComparator9.colorStartTag(12648192); // L: 10162 - } else { - var6 = UserComparator9.colorStartTag(16776960); // L: 10165 - } - - var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; // L: 10167 - } else { - var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 10169 - } - - int var10; - if (Client.isItemSelected == 1) { // L: 10170 - class21.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator9.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 10171 - } else if (Client.isSpellSelected) { // L: 10174 - if ((class17.selectedSpellFlags & 8) == 8) { // L: 10175 - class21.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator9.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 10176 - } - } else { - for (var10 = 7; var10 >= 0; --var10) { // L: 10181 - if (Client.playerMenuActions[var10] != null) { // L: 10182 - short var11 = 0; // L: 10183 - if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { // L: 10184 - if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { // L: 10185 - continue; - } - - if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > GrandExchangeEvents.localPlayer.combatLevel) { // L: 10186 - var11 = 2000; // L: 10187 - } - - if (GrandExchangeEvents.localPlayer.team != 0 && var0.team != 0) { // L: 10189 - if (var0.team == GrandExchangeEvents.localPlayer.team) { // L: 10190 - var11 = 2000; - } else { - var11 = 0; // L: 10191 - } - } else if (Client.playerAttackOption == AttackOption.field1263 && var0.isClanMember()) { // L: 10193 - var11 = 2000; // L: 10194 - } - } else if (Client.playerOptionsPriorities[var10]) { // L: 10197 - var11 = 2000; - } - - boolean var12 = false; // L: 10198 - var7 = Client.playerMenuOpcodes[var10] + var11; // L: 10199 - class21.insertMenuItemNoShift(Client.playerMenuActions[var10], UserComparator9.colorStartTag(16777215) + var4, var7, var1, var2, var3); // L: 10200 - } - } - } - - for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { // L: 10205 - if (Client.menuOpcodes[var10] == 23) { // L: 10206 - Client.menuTargets[var10] = UserComparator9.colorStartTag(16777215) + var4; // L: 10207 - break; - } - } - - } - } - } // L: 10211 - - @ObfuscatedName("kt") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-124" - ) - static final void method294() { - PacketBufferNode var0 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2905, Client.packetWriter.isaacCipher); // L: 12135 - Client.packetWriter.addNode(var0); // L: 12136 - Interpreter.field842 = true; // L: 12137 - - for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 12138 - if (var1.type == 0 || var1.type == 3) { // L: 12139 - Script.closeInterface(var1, true); - } - } - - if (Client.meslayerContinueWidget != null) { // L: 12141 - class346.invalidateWidget(Client.meslayerContinueWidget); // L: 12142 - Client.meslayerContinueWidget = null; // L: 12143 - } - - Interpreter.field842 = false; // L: 12145 - } // L: 12146 + @Export("addCancelMenuEntry") + static void addCancelMenuEntry() { + HealthBar.method2336(); // L: 8702 + Client.menuActions[0] = "Cancel"; // L: 8703 + Client.menuTargets[0] = ""; // L: 8704 + Client.menuOpcodes[0] = 1006; // L: 8705 + Client.menuShiftClick[0] = false; // L: 8706 + Client.menuOptionsCount = 1; // L: 8707 + } // L: 8708 } diff --git a/runescape-client/src/main/java/class202.java b/runescape-client/src/main/java/class202.java new file mode 100644 index 0000000000..0541c868f5 --- /dev/null +++ b/runescape-client/src/main/java/class202.java @@ -0,0 +1,197 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gb") +public class class202 { + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "[Ldb;" + ) + class115[] field2406; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1286404393 + ) + int field2405; + + @ObfuscatedSignature( + descriptor = "(Lpx;I)V" + ) + class202(Buffer var1, int var2) { + this.field2406 = new class115[var2]; // L: 13 + this.field2405 = var1.readUnsignedByte(); // L: 14 + + for (int var3 = 0; var3 < this.field2406.length; ++var3) { // L: 15 + class115 var4 = new class115(this.field2405, var1, false); // L: 16 + this.field2406[var3] = var4; // L: 17 + } + + this.method3998(); // L: 19 + } // L: 20 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-95" + ) + void method3998() { + class115[] var1 = this.field2406; // L: 24 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 25 + class115 var3 = var1[var2]; // L: 26 + if (var3.field1455 >= 0) { // L: 28 + var3.field1447 = this.field2406[var3.field1455]; // L: 29 + } + } + + } // L: 34 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-911804190" + ) + public int method4003() { + return this.field2406.length; // L: 37 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(II)Ldb;", + garbageValue = "518391824" + ) + class115 method3997(int var1) { + return this.field2406[var1]; // L: 41 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)[Ldb;", + garbageValue = "-2127910453" + ) + class115[] method3999() { + return this.field2406; // L: 45 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Lds;II)V", + garbageValue = "1007899177" + ) + void method4000(class122 var1, int var2) { + this.method4014(var1, var2, (boolean[])null, false); // L: 49 + } // L: 50 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Lds;I[ZZS)V", + garbageValue = "30105" + ) + void method4014(class122 var1, int var2, boolean[] var3, boolean var4) { + int var5 = var1.method2753(); // L: 53 + int var6 = 0; // L: 54 + class115[] var7 = this.method3999(); // L: 56 + + for (int var8 = 0; var8 < var7.length; ++var8) { // L: 57 + class115 var9 = var7[var8]; // L: 58 + if (var3 == null || var4 == var3[var6]) { // L: 60 + var1.method2756(var2, var9, var6, var5); // L: 61 + } + + ++var6; // L: 63 + } + + } // L: 67 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;IZI)I", + garbageValue = "1525310482" + ) + static int method4016(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { // L: 76 + boolean var3 = false; // L: 77 + boolean var4 = false; // L: 78 + int var5 = 0; // L: 79 + int var6 = var0.length(); // L: 80 + + for (int var7 = 0; var7 < var6; ++var7) { // L: 81 + char var8 = var0.charAt(var7); // L: 82 + if (var7 == 0) { // L: 83 + if (var8 == '-') { // L: 84 + var3 = true; // L: 85 + continue; + } + + if (var8 == '+') { // L: 88 + continue; + } + } + + int var10; + if (var8 >= '0' && var8 <= '9') { // L: 90 + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { // L: 91 + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { // L: 92 + throw new NumberFormatException(); // L: 93 + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { // L: 94 + throw new NumberFormatException(); + } + + if (var3) { // L: 95 + var10 = -var10; + } + + int var9 = var10 + var5 * var1; // L: 96 + if (var9 / var1 != var5) { // L: 97 + throw new NumberFormatException(); + } + + var5 = var9; // L: 98 + var4 = true; // L: 99 + } + + if (!var4) { // L: 101 + throw new NumberFormatException(); + } else { + return var5; // L: 102 + } + } else { + throw new IllegalArgumentException("" + var1); + } + } + + @ObfuscatedName("hr") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "1406158008" + ) + @Export("getTileHeight") + static final int getTileHeight(int var0, int var1, int var2) { + int var3 = var0 >> 7; // L: 5490 + int var4 = var1 >> 7; // L: 5491 + if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 5492 + int var5 = var2; // L: 5493 + if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 5494 + var5 = var2 + 1; + } + + int var6 = var0 & 127; // L: 5495 + int var7 = var1 & 127; // L: 5496 + int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7; // L: 5497 + int var9 = var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; // L: 5498 + return var8 * (128 - var7) + var9 * var7 >> 7; // L: 5499 + } else { + return 0; + } + } +} diff --git a/runescape-client/src/main/java/class204.java b/runescape-client/src/main/java/class204.java deleted file mode 100644 index fe18a52a4c..0000000000 --- a/runescape-client/src/main/java/class204.java +++ /dev/null @@ -1,200 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gl") -public class class204 implements WorldMapSection { - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 899584583 - ) - int field2294; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 891163721 - ) - int field2287; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -789708035 - ) - int field2288; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1083583131 - ) - int field2289; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1662345179 - ) - int field2290; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 2097442135 - ) - int field2291; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -165365561 - ) - int field2295; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1619929283 - ) - int field2293; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -1300866769 - ) - int field2286; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -1331564349 - ) - int field2292; - - class204() { - } // L: 18 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Lgu;I)V", - garbageValue = "964088357" - ) - @Export("expandBounds") - public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field2290) { - var1.regionLowX = this.field2290; - } - - if (var1.regionHighX < this.field2290) { - var1.regionHighX = this.field2290; // L: 22 - } - - if (var1.regionLowY > this.field2291) { - var1.regionLowY = this.field2291; - } - - if (var1.regionHighY < this.field2291) { // L: 24 - var1.regionHighY = this.field2291; - } - - } // L: 25 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-1337137401" - ) - @Export("containsCoord") - public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.field2294 && var1 < this.field2294 + this.field2287) { // L: 28 - return var2 >= (this.field2288 << 6) + (this.field2295 << 3) && var2 <= (this.field2288 << 6) + (this.field2295 << 3) + 7 && var3 >= (this.field2289 << 6) + (this.field2293 << 3) && var3 <= (this.field2289 << 6) + (this.field2293 << 3) + 7; // L: 31 - } else { - return false; // L: 29 - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1769831605" - ) - @Export("containsPosition") - public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field2290 << 6) + (this.field2286 << 3) && var1 <= (this.field2290 << 6) + (this.field2286 << 3) + 7 && var2 >= (this.field2291 << 6) + (this.field2292 << 3) && var2 <= (this.field2291 << 6) + (this.field2292 << 3) + 7; // L: 35 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "1941144122" - ) - @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.field2290 * 64 - this.field2288 * 64) + (this.field2286 * 8 - this.field2295 * 8), var3 + (this.field2291 * 64 - this.field2289 * 64) + (this.field2292 * 8 - this.field2293 * 8)}; // L: 42 43 44 - return var4; // L: 45 - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(III)Lks;", - garbageValue = "-670243838" - ) - @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { // L: 49 - return null; // L: 50 - } else { - int var3 = this.field2288 * 64 - this.field2290 * 64 + (this.field2295 * 8 - this.field2286 * 8) + var1; // L: 52 - int var4 = var2 + (this.field2289 * 64 - this.field2291 * 64) + (this.field2293 * 8 - this.field2292 * 8); // L: 53 - return new Coord(this.field2294, var3, var4); // L: 54 - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-860121653" - ) - @Export("read") - public void read(Buffer var1) { - this.field2294 = var1.readUnsignedByte(); // L: 58 - this.field2287 = var1.readUnsignedByte(); // L: 59 - this.field2288 = var1.readUnsignedShort(); // L: 60 - this.field2295 = var1.readUnsignedByte(); // L: 61 - this.field2289 = var1.readUnsignedShort(); // L: 62 - this.field2293 = var1.readUnsignedByte(); // L: 63 - this.field2290 = var1.readUnsignedShort(); // L: 64 - this.field2286 = var1.readUnsignedByte(); // L: 65 - this.field2291 = var1.readUnsignedShort(); // L: 66 - this.field2292 = var1.readUnsignedByte(); // L: 67 - this.method4246(); // L: 68 - } // L: 69 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2032484679" - ) - void method4246() { - } // L: 71 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Lpe;B)I", - garbageValue = "-42" - ) - static final int method4255(LoginType var0) { - if (var0 == null) { // L: 16 - return 12; // L: 17 - } else { - switch(var0.field4557) { // L: 19 - case 1: - return 20; // L: 21 - default: - return 12; // L: 23 - } - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IZIZI)V", - garbageValue = "-1799343928" - ) - @Export("sortWorldList") - static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { - if (DevicePcmPlayerProvider.World_worlds != null) { // L: 171 - ObjectSound.doWorldSorting(0, DevicePcmPlayerProvider.World_worlds.length - 1, var0, var1, var2, var3); // L: 172 - } - - } // L: 174 -} diff --git a/runescape-client/src/main/java/class205.java b/runescape-client/src/main/java/class205.java deleted file mode 100644 index c6683dfe2c..0000000000 --- a/runescape-client/src/main/java/class205.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gz") -public class class205 { - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "9" - ) - public static void method4256() { - if (KeyHandler.KeyHandler_instance != null) { // L: 161 - synchronized(KeyHandler.KeyHandler_instance) { // L: 162 - KeyHandler.KeyHandler_instance = null; // L: 163 - } // L: 164 - } - - } // L: 166 -} diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java index 5107fd2e08..e3918ee40c 100644 --- a/runescape-client/src/main/java/class21.java +++ b/runescape-client/src/main/java/class21.java @@ -2,112 +2,195 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.io.OutputStreamWriter; import java.net.HttpURLConnection; +import java.net.URL; +import java.net.URLConnection; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("y") +@ObfuscatedName("d") public class class21 { - @ObfuscatedName("rp") + @ObfuscatedName("rv") @ObfuscatedSignature( - descriptor = "Lea;" + descriptor = "Lqb;" ) - @Export("guestClanChannel") - static ClanChannel guestClanChannel; - @ObfuscatedName("ta") + @Export("privateChatMode") + static PrivateChatMode privateChatMode; + @ObfuscatedName("k") + @Export("Interpreter_intLocals") + static int[] Interpreter_intLocals; + @ObfuscatedName("if") + @ObfuscatedSignature( + descriptor = "[Lqr;" + ) + @Export("headIconHintSprites") + static SpritePixels[] headIconHintSprites; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1164104803 + intValue = -2092446837 ) - static int field116; - @ObfuscatedName("hi") - @Export("regions") - static int[] regions; - @ObfuscatedName("jc") - @ObfuscatedGetter( - intValue = 98002171 - ) - @Export("cameraYaw") - static int cameraYaw; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -824857787 - ) - final int field111; - @ObfuscatedName("c") - final String field109; + final int field114; + @ObfuscatedName("q") + final String field115; class21(String var1) { - this.field111 = 400; // L: 32 - this.field109 = ""; // L: 33 + this.field114 = 400; // L: 32 + this.field115 = ""; // L: 33 } // L: 34 class21(HttpURLConnection var1) throws IOException { - this.field111 = var1.getResponseCode(); // L: 14 + this.field114 = var1.getResponseCode(); // L: 14 var1.getResponseMessage(); // L: 15 var1.getHeaderFields(); // L: 16 StringBuilder var2 = new StringBuilder(); // L: 17 - InputStream var3 = this.field111 >= 300 ? var1.getErrorStream() : var1.getInputStream(); // L: 18 - if (var3 != null) { // L: 19 - InputStreamReader var4 = new InputStreamReader(var3); // L: 20 - BufferedReader var5 = new BufferedReader(var4); // L: 21 + InputStream var3 = this.field114 >= 300 ? var1.getErrorStream() : var1.getInputStream(); + if (var3 != null) { + InputStreamReader var4 = new InputStreamReader(var3); + BufferedReader var5 = new BufferedReader(var4); String var6; - while ((var6 = var5.readLine()) != null) { // L: 23 - var2.append(var6); // L: 24 + while ((var6 = var5.readLine()) != null) { + var2.append(var6); } var3.close(); // L: 26 } - this.field109 = var2.toString(); // L: 28 + this.field115 = var2.toString(); // L: 28 } // L: 29 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "716414120" + descriptor = "(B)I", + garbageValue = "7" ) - public int method299() { - return this.field111; // L: 37 + public int method271() { + return this.field114; // L: 37 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(B)Ljava/lang/String;", - garbageValue = "11" + garbageValue = "-11" ) - public String method297() { - return this.field109; // L: 41 + public String method276() { + return this.field115; // L: 41 } - @ObfuscatedName("en") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Lov;", - garbageValue = "2110304027" + descriptor = "(II)Lfi;", + garbageValue = "2110417878" ) - @Export("getWorldMap") - static WorldMap getWorldMap() { - return ScriptFrame.worldMap; // L: 664 + @Export("VarpDefinition_get") + public static VarpDefinition VarpDefinition_get(int var0) { + VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); // L: 18 + if (var1 != null) { // L: 19 + return var1; + } else { + byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); // L: 20 + var1 = new VarpDefinition(); // L: 21 + if (var2 != null) { // L: 22 + var1.decode(new Buffer(var2)); + } + + VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 23 + return var1; // L: 24 + } } - @ObfuscatedName("in") + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1346094411" + ) + static void method280() { + Login.Login_username = Login.Login_username.trim(); // L: 1107 + if (Login.Login_username.length() == 0) { // L: 1108 + class345.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 1109 + } else { + long var1; + try { + URL var3 = new URL(WorldMapData_1.method4707("services", false) + "m=accountappeal/login.ws"); // L: 1116 + URLConnection var4 = var3.openConnection(); // L: 1117 + var4.setRequestProperty("connection", "close"); // L: 1118 + var4.setDoInput(true); // L: 1119 + var4.setDoOutput(true); // L: 1120 + var4.setConnectTimeout(5000); // L: 1121 + OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream()); // L: 1122 + var5.write("data1=req"); // L: 1123 + var5.flush(); // L: 1124 + InputStream var6 = var4.getInputStream(); // L: 1125 + Buffer var7 = new Buffer(new byte[1000]); // L: 1126 + + while (true) { + int var8 = var6.read(var7.array, var7.offset, 1000 - var7.offset); // L: 1128 + if (var8 == -1) { // L: 1129 + var7.offset = 0; // L: 1136 + long var10 = var7.readLong(); // L: 1137 + var1 = var10; // L: 1138 + break; + } + + var7.offset += var8; // L: 1130 + if (var7.offset >= 1000) { // L: 1131 + var1 = 0L; // L: 1132 + break; + } + } + } catch (Exception var14) { // L: 1140 + var1 = 0L; // L: 1141 + } + + int var0; + if (var1 == 0L) { // L: 1145 + var0 = 5; + } else { + var0 = class143.method2972(var1, Login.Login_username); // L: 1146 + } + + switch(var0) { // L: 1147 + case 2: + class345.setLoginResponseString(Strings.field3712, Strings.field3929, Strings.field3706); // L: 1164 + class126.method2799(6); // L: 1165 + break; + case 3: + class345.setLoginResponseString("", "Error connecting to server.", ""); // L: 1158 + break; // L: 1159 + case 4: + class345.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 1155 + break; // L: 1156 + case 5: + class345.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 1152 + break; // L: 1153 + case 6: + class345.setLoginResponseString("", "Error connecting to server.", ""); // L: 1149 + break; // L: 1150 + case 7: + class345.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: 1161 + } + + } + } // L: 1110 1168 + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1312519782" + ) + static int method278(int var0) { + return (int)((Math.log((double)var0) / Interpreter.field837 - 7.0D) * 256.0D); // L: 3841 + } + + @ObfuscatedName("hy") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1923971854" + garbageValue = "322943268" ) - static final boolean method303() { - return Client.isMenuOpen; // L: 8651 + static boolean method274() { + return (Client.drawPlayerNames & 8) != 0; // L: 5016 } - - @ObfuscatedName("if") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", - garbageValue = "1636192715" - ) - @Export("insertMenuItemNoShift") - public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { - class28.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 9826 - } // L: 9827 } diff --git a/runescape-client/src/main/java/class214.java b/runescape-client/src/main/java/class214.java deleted file mode 100644 index 5dbd06fe0e..0000000000 --- a/runescape-client/src/main/java/class214.java +++ /dev/null @@ -1,63 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hr") -public class class214 { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lhr;" - ) - static final class214 field2380; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lhr;" - ) - static final class214 field2378; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1627101547 - ) - @Export("value") - final int value; - - static { - field2380 = new class214(0); // L: 4 - field2378 = new class214(1); // L: 5 - } - - class214(int var1) { - this.value = var1; // L: 9 - } // L: 10 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Lpi;Lpt;I)Lpt;", - garbageValue = "-175600425" - ) - @Export("readStringIntParameters") - static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { - int var2 = var0.readUnsignedByte(); // L: 16 - int var3; - if (var1 == null) { // L: 17 - var3 = class67.method1909(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/class216.java b/runescape-client/src/main/java/class216.java deleted file mode 100644 index c2e5a4ad55..0000000000 --- a/runescape-client/src/main/java/class216.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ht") -public class class216 { - @ObfuscatedName("t") - @Export("cacheSubPaths") - static String[] cacheSubPaths; - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)[Lkm;", - garbageValue = "620331303" - ) - static class302[] method4365() { - return new class302[]{class302.field3551, class302.field3549}; // L: 35 - } -} diff --git a/runescape-client/src/main/java/class221.java b/runescape-client/src/main/java/class221.java new file mode 100644 index 0000000000..4a05281898 --- /dev/null +++ b/runescape-client/src/main/java/class221.java @@ -0,0 +1,59 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hg") +public class class221 { + @ObfuscatedName("ph") + @ObfuscatedSignature( + descriptor = "Lpd;" + ) + @Export("HitSplatDefinition_cached") + static class428 HitSplatDefinition_cached; + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)Lfo;", + garbageValue = "290100921" + ) + public static Clock method4408() { + try { + return new NanoClock(); // L: 8 + } catch (Throwable var1) { // L: 10 + return new MilliClock(); // L: 11 + } + } + + @ObfuscatedName("ho") + @ObfuscatedSignature( + descriptor = "(IIIIIIIIIB)V", + garbageValue = "1" + ) + @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: 7815 + + for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7816 7817 7822 + if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 7818 + var9 = var10; // L: 7819 + break; + } + } + + if (var9 == null) { // L: 7824 + var9 = new PendingSpawn(); // L: 7825 + var9.plane = var0; // L: 7826 + var9.type = var3; // L: 7827 + var9.x = var1; // L: 7828 + var9.y = var2; // L: 7829 + UrlRequester.method2536(var9); // L: 7830 + Client.pendingSpawns.addFirst(var9); // L: 7831 + } + + var9.id = var4; // L: 7833 + var9.field1126 = var5; // L: 7834 + var9.orientation = var6; // L: 7835 + var9.delay = var7; // L: 7836 + var9.hitpoints = var8; // L: 7837 + } // L: 7838 +} diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java new file mode 100644 index 0000000000..6b8eb99a79 --- /dev/null +++ b/runescape-client/src/main/java/class229.java @@ -0,0 +1,183 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("he") +public class class229 implements WorldMapSection { + @ObfuscatedName("tl") + @ObfuscatedGetter( + intValue = -833135371 + ) + static int field2805; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 158678861 + ) + int field2803; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -1742479059 + ) + int field2798; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 301118417 + ) + int field2795; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -308738369 + ) + int field2793; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1763199169 + ) + int field2797; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 582544923 + ) + int field2794; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 1808550713 + ) + int field2799; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -109258069 + ) + int field2800; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 801571503 + ) + int field2801; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -298293387 + ) + int field2802; + + class229() { + } // L: 18 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lhm;I)V", + garbageValue = "-1792723155" + ) + @Export("expandBounds") + public void expandBounds(WorldMapArea var1) { + if (var1.regionLowX > this.field2797) { // L: 22 + var1.regionLowX = this.field2797; + } + + if (var1.regionHighX < this.field2797) { + var1.regionHighX = this.field2797; // L: 23 + } + + if (var1.regionLowY > this.field2794) { // L: 24 + var1.regionLowY = this.field2794; + } + + if (var1.regionHighY < this.field2794) { // L: 25 + var1.regionHighY = this.field2794; + } + + } // L: 26 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(IIIB)Z", + garbageValue = "1" + ) + @Export("containsCoord") + public boolean containsCoord(int var1, int var2, int var3) { + if (var1 >= this.field2803 && var1 < this.field2798 + this.field2803) { // L: 30 + return var2 >= (this.field2795 << 6) + (this.field2799 << 3) && var2 <= (this.field2795 << 6) + (this.field2799 << 3) + 7 && var3 >= (this.field2793 << 6) + (this.field2800 << 3) && var3 <= (this.field2793 << 6) + (this.field2800 << 3) + 7; // L: 33 + } else { + return false; // L: 31 + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IIB)Z", + garbageValue = "2" + ) + @Export("containsPosition") + public boolean containsPosition(int var1, int var2) { + return var1 >= (this.field2797 << 6) + (this.field2801 << 3) && var1 <= (this.field2797 << 6) + (this.field2801 << 3) + 7 && var2 >= (this.field2794 << 6) + (this.field2802 << 3) && var2 <= (this.field2794 << 6) + (this.field2802 << 3) + 7; // L: 38 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(IIII)[I", + garbageValue = "-41287528" + ) + @Export("getBorderTileLengths") + public int[] getBorderTileLengths(int var1, int var2, int var3) { + if (!this.containsCoord(var1, var2, var3)) { // L: 43 + return null; // L: 44 + } else { + int[] var4 = new int[]{var2 + (this.field2797 * 64 - this.field2795 * 64) + (this.field2801 * 8 - this.field2799 * 8), var3 + (this.field2794 * 64 - this.field2793 * 64) + (this.field2802 * 8 - this.field2800 * 8)}; // L: 46 47 48 + return var4; // L: 49 + } + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(III)Lkd;", + garbageValue = "289851355" + ) + @Export("coord") + public Coord coord(int var1, int var2) { + if (!this.containsPosition(var1, var2)) { // L: 54 + return null; // L: 55 + } else { + int var3 = this.field2795 * 64 - this.field2797 * 64 + (this.field2799 * 8 - this.field2801 * 8) + var1; // L: 57 + int var4 = var2 + (this.field2793 * 64 - this.field2794 * 64) + (this.field2800 * 8 - this.field2802 * 8); // L: 58 + return new Coord(this.field2803, var3, var4); // L: 59 + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Lpx;I)V", + garbageValue = "-113194936" + ) + @Export("read") + public void read(Buffer var1) { + this.field2803 = var1.readUnsignedByte(); // L: 64 + this.field2798 = var1.readUnsignedByte(); // L: 65 + this.field2795 = var1.readUnsignedShort(); // L: 66 + this.field2799 = var1.readUnsignedByte(); // L: 67 + this.field2793 = var1.readUnsignedShort(); // L: 68 + this.field2800 = var1.readUnsignedByte(); // L: 69 + this.field2797 = var1.readUnsignedShort(); // L: 70 + this.field2801 = var1.readUnsignedByte(); // L: 71 + this.field2794 = var1.readUnsignedShort(); // L: 72 + this.field2802 = var1.readUnsignedByte(); // L: 73 + this.method4713(); // L: 74 + } // L: 75 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "26" + ) + void method4713() { + } // L: 77 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "404905484" + ) + public static boolean method4727(int var0) { + return (var0 >> 20 & 1) != 0; // L: 17 + } +} diff --git a/runescape-client/src/main/java/class230.java b/runescape-client/src/main/java/class230.java new file mode 100644 index 0000000000..39eeb7fe6d --- /dev/null +++ b/runescape-client/src/main/java/class230.java @@ -0,0 +1,229 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hh") +public class class230 { + @ObfuscatedName("be") + @ObfuscatedGetter( + intValue = 2086809951 + ) + static int field2807; + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lpc;II)V", + garbageValue = "1853715963" + ) + @Export("readPlayerUpdate") + static void readPlayerUpdate(PacketBuffer var0, int var1) { + boolean var2 = var0.readBits(1) == 1; // L: 197 + if (var2) { // L: 198 + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + int var3 = var0.readBits(2); // L: 199 + Player var4 = Client.players[var1]; // L: 200 + if (var3 == 0) { // L: 201 + if (var2) { // L: 202 + var4.field1095 = false; // L: 203 + } else if (Client.localPlayerIndex == var1) { // L: 206 + throw new RuntimeException(); + } else { + Players.Players_regions[var1] = (var4.plane << 28) + (SecureRandomCallable.baseX + var4.pathX[0] >> 13 << 14) + (GrandExchangeOfferOwnWorldComparator.baseY + var4.pathY[0] >> 13); // L: 207 + if (var4.field1172 != -1) { // L: 208 + Players.Players_orientations[var1] = var4.field1172; + } else { + Players.Players_orientations[var1] = var4.orientation; // L: 209 + } + + Players.Players_targetIndices[var1] = var4.targetIndex; // L: 210 + Client.players[var1] = null; // L: 211 + if (var0.readBits(1) != 0) { // L: 212 + FloorUnderlayDefinition.updateExternalPlayer(var0, var1); + } + + } + } else { + int var5; + int var6; + int var7; + if (var3 == 1) { // L: 215 + var5 = var0.readBits(3); // L: 216 + var6 = var4.pathX[0]; // L: 217 + var7 = var4.pathY[0]; // L: 218 + if (var5 == 0) { // L: 219 + --var6; // L: 220 + --var7; // L: 221 + } else if (var5 == 1) { // L: 223 + --var7; + } else if (var5 == 2) { // L: 224 + ++var6; // L: 225 + --var7; // L: 226 + } else if (var5 == 3) { // L: 228 + --var6; + } else if (var5 == 4) { // L: 229 + ++var6; + } else if (var5 == 5) { // L: 230 + --var6; // L: 231 + ++var7; // L: 232 + } else if (var5 == 6) { // L: 234 + ++var7; + } else if (var5 == 7) { // L: 235 + ++var6; // L: 236 + ++var7; // L: 237 + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 239 + var4.resetPath(var6, var7); // L: 240 + var4.field1095 = false; // L: 241 + } else if (var2) { // L: 243 + var4.field1095 = true; // L: 244 + var4.tileX = var6; // L: 245 + var4.tileY = var7; // L: 246 + } else { + var4.field1095 = false; // L: 249 + var4.method2117(var6, var7, Players.field1302[var1]); // L: 250 + } + + } else if (var3 == 2) { // L: 254 + var5 = var0.readBits(4); // L: 255 + var6 = var4.pathX[0]; // L: 256 + var7 = var4.pathY[0]; // L: 257 + if (var5 == 0) { // L: 258 + var6 -= 2; // L: 259 + var7 -= 2; // L: 260 + } else if (var5 == 1) { // L: 262 + --var6; // L: 263 + var7 -= 2; // L: 264 + } else if (var5 == 2) { // L: 266 + var7 -= 2; + } else if (var5 == 3) { // L: 267 + ++var6; // L: 268 + var7 -= 2; // L: 269 + } else if (var5 == 4) { // L: 271 + var6 += 2; // L: 272 + var7 -= 2; // L: 273 + } else if (var5 == 5) { // L: 275 + var6 -= 2; // L: 276 + --var7; // L: 277 + } else if (var5 == 6) { // L: 279 + var6 += 2; // L: 280 + --var7; // L: 281 + } else if (var5 == 7) { // L: 283 + var6 -= 2; + } else if (var5 == 8) { // L: 284 + var6 += 2; + } else if (var5 == 9) { // L: 285 + var6 -= 2; // L: 286 + ++var7; // L: 287 + } else if (var5 == 10) { // L: 289 + var6 += 2; // L: 290 + ++var7; // L: 291 + } else if (var5 == 11) { // L: 293 + var6 -= 2; // L: 294 + var7 += 2; // L: 295 + } else if (var5 == 12) { // L: 297 + --var6; // L: 298 + var7 += 2; // L: 299 + } else if (var5 == 13) { // L: 301 + var7 += 2; + } else if (var5 == 14) { // L: 302 + ++var6; // L: 303 + var7 += 2; // L: 304 + } else if (var5 == 15) { // L: 306 + var6 += 2; // L: 307 + var7 += 2; // L: 308 + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 310 + var4.resetPath(var6, var7); // L: 311 + var4.field1095 = false; // L: 312 + } else if (var2) { // L: 314 + var4.field1095 = true; // L: 315 + var4.tileX = var6; // L: 316 + var4.tileY = var7; // L: 317 + } else { + var4.field1095 = false; // L: 320 + var4.method2117(var6, var7, Players.field1302[var1]); // L: 321 + } + + } else { + var5 = var0.readBits(1); // L: 325 + int var8; + int var9; + int var10; + int var11; + if (var5 == 0) { // L: 326 + var6 = var0.readBits(12); // L: 327 + var7 = var6 >> 10; // L: 328 + var8 = var6 >> 5 & 31; // L: 329 + if (var8 > 15) { // L: 330 + var8 -= 32; + } + + var9 = var6 & 31; // L: 331 + if (var9 > 15) { // L: 332 + var9 -= 32; + } + + var10 = var8 + var4.pathX[0]; // L: 333 + var11 = var9 + var4.pathY[0]; // L: 334 + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 335 + if (var2) { // L: 339 + var4.field1095 = true; // L: 340 + var4.tileX = var10; // L: 341 + var4.tileY = var11; // L: 342 + } else { + var4.field1095 = false; // L: 345 + var4.method2117(var10, var11, Players.field1302[var1]); // L: 346 + } + } else { + var4.resetPath(var10, var11); // L: 336 + var4.field1095 = false; // L: 337 + } + + var4.plane = (byte)(var7 + var4.plane & 3); // L: 348 + if (Client.localPlayerIndex == var1) { // L: 349 + class128.Client_plane = var4.plane; + } + + } else { + var6 = var0.readBits(30); // L: 352 + var7 = var6 >> 28; // L: 353 + var8 = var6 >> 14 & 16383; // L: 354 + var9 = var6 & 16383; // L: 355 + var10 = (var8 + SecureRandomCallable.baseX + var4.pathX[0] & 16383) - SecureRandomCallable.baseX; // L: 356 + var11 = (var9 + GrandExchangeOfferOwnWorldComparator.baseY + var4.pathY[0] & 16383) - GrandExchangeOfferOwnWorldComparator.baseY; // L: 357 + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 358 + var4.resetPath(var10, var11); // L: 359 + var4.field1095 = false; // L: 360 + } else if (var2) { // L: 362 + var4.field1095 = true; // L: 363 + var4.tileX = var10; // L: 364 + var4.tileY = var11; // L: 365 + } else { + var4.field1095 = false; // L: 368 + var4.method2117(var10, var11, Players.field1302[var1]); // L: 369 + } + + var4.plane = (byte)(var7 + var4.plane & 3); // L: 371 + if (Client.localPlayerIndex == var1) { // L: 372 + class128.Client_plane = var4.plane; + } + + } + } + } + } // L: 204 213 252 323 350 373 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1056029355" + ) + static final void method4731(String var0) { + InterfaceParent.method2067(var0 + " is already on your ignore list"); // L: 174 + } // L: 175 +} diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java deleted file mode 100644 index c717d4c49d..0000000000 --- a/runescape-client/src/main/java/class231.java +++ /dev/null @@ -1,150 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hk") -public class class231 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "[Lda;" - ) - class115[] field2578; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 230124275 - ) - int field2577; - - @ObfuscatedSignature( - descriptor = "(Lpi;I)V" - ) - class231(Buffer var1, int var2) { - this.field2578 = new class115[var2]; // L: 13 - this.field2577 = var1.readUnsignedByte(); // L: 14 - - for (int var3 = 0; var3 < this.field2578.length; ++var3) { // L: 15 - class115 var4 = new class115(this.field2577, var1, false); // L: 16 - this.field2578[var3] = var4; // L: 17 - } - - this.method4697(); // L: 19 - } // L: 20 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-459048653" - ) - void method4697() { - class115[] var1 = this.field2578; // L: 24 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 25 - class115 var3 = var1[var2]; // L: 26 - if (var3.field1395 >= 0) { // L: 28 - var3.field1388 = this.field2578[var3.field1395]; // L: 29 - } - } - - } // L: 34 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "139338744" - ) - public int method4698() { - return this.field2578.length; // L: 37 - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(II)Lda;", - garbageValue = "-1090806170" - ) - class115 method4718(int var1) { - return this.field2578[var1]; // L: 41 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)[Lda;", - garbageValue = "856290899" - ) - class115[] method4700() { - return this.field2578; // L: 45 - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Ldo;II)V", - garbageValue = "-821248386" - ) - void method4717(class122 var1, int var2) { - this.method4701(var1, var2, (boolean[])null, false); // L: 49 - } // L: 50 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Ldo;I[ZZI)V", - garbageValue = "-1783408058" - ) - void method4701(class122 var1, int var2, boolean[] var3, boolean var4) { - int var5 = var1.method2766(); // L: 53 - int var6 = 0; // L: 54 - class115[] var7 = this.method4700(); // L: 56 - - for (int var8 = 0; var8 < var7.length; ++var8) { // L: 57 - class115 var9 = var7[var8]; // L: 58 - if (var3 == null || var4 == var3[var6]) { // L: 60 - var1.method2796(var2, var9, var6, var5); // L: 61 - } - - ++var6; // L: 63 - } - - } // L: 67 - - @ObfuscatedName("kl") - @ObfuscatedSignature( - descriptor = "(Lky;I)V", - garbageValue = "640671653" - ) - static final void method4712(Widget var0) { - int var1 = var0.contentType; // L: 12098 - if (var1 == 324) { // L: 12099 - if (Client.field561 == -1) { // L: 12100 - Client.field561 = var0.spriteId2; // L: 12101 - Client.field775 = var0.spriteId; // L: 12102 - } - - if (Client.playerAppearance.isFemale) { // L: 12104 - var0.spriteId2 = Client.field561; - } else { - var0.spriteId2 = Client.field775; // L: 12105 - } - - } else if (var1 == 325) { // L: 12108 - if (Client.field561 == -1) { // L: 12109 - Client.field561 = var0.spriteId2; // L: 12110 - Client.field775 = var0.spriteId; // L: 12111 - } - - if (Client.playerAppearance.isFemale) { // L: 12113 - var0.spriteId2 = Client.field775; - } else { - var0.spriteId2 = Client.field561; // L: 12114 - } - - } else if (var1 == 327) { // L: 12117 - var0.modelAngleX = 150; // L: 12118 - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 12119 - var0.modelType = 5; // L: 12120 - var0.modelId = 0; // L: 12121 - } else if (var1 == 328) { // L: 12124 - var0.modelAngleX = 150; // L: 12125 - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 12126 - var0.modelType = 5; // L: 12127 - var0.modelId = 1; // L: 12128 - } - } // L: 12106 12115 12122 12129 12131 -} diff --git a/runescape-client/src/main/java/class239.java b/runescape-client/src/main/java/class239.java new file mode 100644 index 0000000000..36d386e903 --- /dev/null +++ b/runescape-client/src/main/java/class239.java @@ -0,0 +1,49 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("iz") +public class class239 { + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Liz;" + ) + static final class239 field2875; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Liz;" + ) + static final class239 field2872; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 2125298345 + ) + @Export("value") + final int value; + + static { + field2875 = new class239(0); // L: 4 + field2872 = new class239(1); // L: 5 + } + + class239(int var1) { + this.value = var1; // L: 9 + } // L: 10 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "-299459182" + ) + public static int method4810(CharSequence var0) { + int var1 = var0.length(); // L: 139 + int var2 = 0; // L: 140 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 141 + var2 = (var2 << 5) - var2 + var0.charAt(var3); + } + + return var2; // L: 142 + } +} diff --git a/runescape-client/src/main/java/class241.java b/runescape-client/src/main/java/class241.java new file mode 100644 index 0000000000..785a16ce89 --- /dev/null +++ b/runescape-client/src/main/java/class241.java @@ -0,0 +1,124 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ih") +public class class241 { + @ObfuscatedName("hj") + @Export("regions") + static int[] regions; + + @ObfuscatedName("o") + public static final void method4815(long var0) { + if (var0 > 0L) { // L: 9 + if (var0 % 10L == 0L) { // L: 10 + long var2 = var0 - 1L; // L: 11 + + try { + Thread.sleep(var2); // L: 14 + } catch (InterruptedException var8) { // L: 16 + } + + try { + Thread.sleep(1L); // L: 20 + } catch (InterruptedException var7) { // L: 22 + } + } else { + try { + Thread.sleep(var0); // L: 27 + } catch (InterruptedException var6) { // L: 29 + } + } + + } + } // L: 31 + + @ObfuscatedName("gi") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-973583928" + ) + static final void method4813(int var0, int var1) { + if (var0 < 128) { // L: 3949 + var0 = 128; + } + + if (var0 > 383) { // L: 3950 + var0 = 383; + } + + if (GameEngine.cameraPitch < var0) { // L: 3951 + GameEngine.cameraPitch = (var0 - GameEngine.cameraPitch) * PacketBufferNode.field3083 / 1000 + GameEngine.cameraPitch + class17.field88; // L: 3952 + if (GameEngine.cameraPitch > var0) { // L: 3953 + GameEngine.cameraPitch = var0; + } + } + + if (GameEngine.cameraPitch > var0) { // L: 3955 + GameEngine.cameraPitch -= (GameEngine.cameraPitch - var0) * PacketBufferNode.field3083 / 1000 + class17.field88; // L: 3956 + if (GameEngine.cameraPitch < var0) { // L: 3957 + GameEngine.cameraPitch = var0; + } + } + + int var2 = var1 - StudioGame.cameraYaw; // L: 3959 + if (var2 > 1024) { // L: 3960 + var2 -= 2048; + } + + if (var2 < -1024) { // L: 3961 + var2 += 2048; + } + + if (var2 > 0) { // L: 3962 + StudioGame.cameraYaw = StudioGame.cameraYaw + class17.field88 + var2 * PacketBufferNode.field3083 / 1000; // L: 3963 + StudioGame.cameraYaw &= 2047; // L: 3964 + } + + if (var2 < 0) { // L: 3966 + StudioGame.cameraYaw -= class17.field88 + -var2 * PacketBufferNode.field3083 / 1000; // L: 3967 + StudioGame.cameraYaw &= 2047; // L: 3968 + } + + int var3 = var1 - StudioGame.cameraYaw; // L: 3970 + if (var3 > 1024) { // L: 3971 + var3 -= 2048; + } + + if (var3 < -1024) { + var3 += 2048; // L: 3972 + } + + if (var3 < 0 && var2 > 0 || var3 > 0 && var2 < 0) { // L: 3973 + StudioGame.cameraYaw = var1; + } + + } // L: 3974 + + @ObfuscatedName("kb") + @ObfuscatedSignature( + descriptor = "(IIIB)Lck;", + garbageValue = "52" + ) + static final InterfaceParent method4812(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); // L: 12211 + var3.group = var1; // L: 12212 + var3.type = var2; // L: 12213 + Client.interfaceParents.put(var3, (long)var0); // L: 12214 + GraphicsDefaults.Widget_resetModelFrames(var1); // L: 12215 + Widget var4 = class92.getWidget(var0); // L: 12216 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var4); // L: 12217 + if (Client.meslayerContinueWidget != null) { // L: 12218 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(Client.meslayerContinueWidget); // L: 12219 + Client.meslayerContinueWidget = null; // L: 12220 + } + + UserComparator8.revalidateWidgetScroll(NetSocket.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 12222 + AbstractWorldMapData.runWidgetOnLoadListener(var1); // L: 12223 + if (Client.rootInterface != -1) { // L: 12224 + WorldMapLabelSize.runIntfCloseListeners(Client.rootInterface, 1); + } + + return var3; // L: 12225 + } +} diff --git a/runescape-client/src/main/java/class249.java b/runescape-client/src/main/java/class249.java index 7069773125..38708ebb67 100644 --- a/runescape-client/src/main/java/class249.java +++ b/runescape-client/src/main/java/class249.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ib") +@ObfuscatedName("if") public interface class249 extends class251 { } diff --git a/runescape-client/src/main/java/class250.java b/runescape-client/src/main/java/class250.java index 63e67ba456..779d58df69 100644 --- a/runescape-client/src/main/java/class250.java +++ b/runescape-client/src/main/java/class250.java @@ -1,30 +1,76 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ir") +@ObfuscatedName("iv") public abstract class class250 implements class252 { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 65197793 + intValue = 659631733 ) - protected int field2872; + protected int field2926; @ObfuscatedSignature( - descriptor = "(Lkt;Llo;I)V" + descriptor = "(Lke;Llq;I)V" ) protected class250(StudioGame var1, Language var2, int var3) { - this.field2872 = var3; // L: 10 + this.field2926 = var3; // L: 10 } // L: 11 - @ObfuscatedName("v") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-86" + descriptor = "(Lle;IIIBZI)V", + garbageValue = "185954668" ) - static void method5112(int var0) { - class356.field4185 = var0; // L: 21 - class387.field4346 = new class387[var0]; // L: 22 - class387.field4347 = 0; // L: 23 - } // L: 24 + @Export("requestNetFile") + static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { + long var6 = (long)((var1 << 16) + var2); // L: 122 + NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 123 + if (var8 == null) { // L: 124 + var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 125 + if (var8 == null) { // L: 126 + var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 127 + if (var8 != null) { // L: 128 + if (var5) { // L: 129 + var8.removeDual(); // L: 130 + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 131 + --NetCache.NetCache_pendingWritesCount; // L: 132 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 133 + } + + } else { + if (!var5) { // L: 137 + var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 138 + if (var8 != null) { // L: 139 + return; + } + } + + var8 = new NetFileRequest(); // L: 141 + var8.archive = var0; // L: 142 + var8.crc = var3; // L: 143 + var8.padding = var4; // L: 144 + if (var5) { // L: 145 + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 146 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 147 + } else { + NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 150 + NetCache.NetCache_pendingWrites.put(var8, var6); // L: 151 + ++NetCache.NetCache_pendingWritesCount; // L: 152 + } + + } + } + } + } // L: 135 154 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2017847021" + ) + public static void method4933() { + StructComposition.StructDefinition_cached.clear(); // L: 57 + } // L: 58 } diff --git a/runescape-client/src/main/java/class251.java b/runescape-client/src/main/java/class251.java index 7d9edbd278..8e365573d1 100644 --- a/runescape-client/src/main/java/class251.java +++ b/runescape-client/src/main/java/class251.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("iu") +@ObfuscatedName("is") public interface class251 { } diff --git a/runescape-client/src/main/java/class252.java b/runescape-client/src/main/java/class252.java index 5f96ae2b0e..dc79997550 100644 --- a/runescape-client/src/main/java/class252.java +++ b/runescape-client/src/main/java/class252.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("is") +@ObfuscatedName("ia") public interface class252 extends Iterable { } diff --git a/runescape-client/src/main/java/class253.java b/runescape-client/src/main/java/class253.java index 109277d78a..7dd50ce7e6 100644 --- a/runescape-client/src/main/java/class253.java +++ b/runescape-client/src/main/java/class253.java @@ -1,7 +1,7 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ii") +@ObfuscatedName("iu") public interface class253 { - @ObfuscatedName("v") - void method5114(Object var1); + @ObfuscatedName("o") + void method4937(Object var1); } diff --git a/runescape-client/src/main/java/class259.java b/runescape-client/src/main/java/class259.java index 2d596b67c7..92a4e10060 100644 --- a/runescape-client/src/main/java/class259.java +++ b/runescape-client/src/main/java/class259.java @@ -1,11 +1,39 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ih") +@ObfuscatedName("io") public class class259 { - @ObfuscatedName("l") + @ObfuscatedName("dk") @ObfuscatedSignature( - descriptor = "Lqq;" + descriptor = "Lfl;" ) - static IndexedSprite field2887; + @Export("js5SocketTask") + static Task js5SocketTask; + + @ObfuscatedName("gu") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZI)V", + garbageValue = "-2064241274" + ) + @Export("drawLoadingMessage") + static final void drawLoadingMessage(String var0, boolean var1) { + if (Client.showLoadingMessages) { // L: 4565 + byte var2 = 4; // L: 4566 + int var3 = var2 + 6; // L: 4567 + int var4 = var2 + 6; // L: 4568 + int var5 = class149.fontPlain12.lineWidth(var0, 250); // L: 4569 + int var6 = class149.fontPlain12.lineCount(var0, 250) * 13; // L: 4570 + Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 0); // L: 4571 + Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var2 + var6, 16777215); // L: 4572 + class149.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 4573 + class132.method2836(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2); // L: 4574 + if (var1) { // L: 4575 + DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0); // L: 4576 + } else { + ItemContainer.method2061(var3, var4, var5, var6); // L: 4579 + } + + } + } // L: 4581 } diff --git a/runescape-client/src/main/java/class260.java b/runescape-client/src/main/java/class260.java index 0c7aea7137..e771de8da7 100644 --- a/runescape-client/src/main/java/class260.java +++ b/runescape-client/src/main/java/class260.java @@ -1,50 +1,13 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jc") +@ObfuscatedName("jq") public class class260 { - @ObfuscatedName("ap") + @ObfuscatedName("cv") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "[Lqd;" ) - static Bounds field2892; - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Lln;II)V", - garbageValue = "-921893463" - ) - static void method5174(AbstractArchive var0, int var1) { - if ((var1 & 536870912) != 0) { // L: 288 - Decimator.logoSprite = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var0, "logo_deadman_mode", ""); // L: 289 - } else if ((var1 & 1073741824) != 0) { // L: 291 - Decimator.logoSprite = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var0, "logo_seasonal_mode", ""); // L: 292 - } else { - Decimator.logoSprite = AbstractSocket.SpriteBuffer_getIndexedSpriteByName(var0, "logo", ""); // L: 295 - } - - } // L: 297 - - @ObfuscatedName("ht") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1779965800" - ) - static final void method5173() { - Client.field618 = 0; // L: 5389 - int var0 = (GrandExchangeEvents.localPlayer.x >> 7) + GrandExchangeOfferOwnWorldComparator.baseX; // L: 5390 - int var1 = (GrandExchangeEvents.localPlayer.y >> 7) + VarcInt.baseY; // L: 5391 - if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { // L: 5392 - Client.field618 = 1; - } - - if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { // L: 5393 - Client.field618 = 1; - } - - if (Client.field618 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { // L: 5394 - Client.field618 = 0; - } - - } // L: 5395 + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; } diff --git a/runescape-client/src/main/java/class261.java b/runescape-client/src/main/java/class261.java index 3f378c0c7b..a968a85852 100644 --- a/runescape-client/src/main/java/class261.java +++ b/runescape-client/src/main/java/class261.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("jm") +@ObfuscatedName("jd") public interface class261 { } diff --git a/runescape-client/src/main/java/class263.java b/runescape-client/src/main/java/class263.java index 26b4a0c81b..7533a2dc9e 100644 --- a/runescape-client/src/main/java/class263.java +++ b/runescape-client/src/main/java/class263.java @@ -1,148 +1,164 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jp") +@ObfuscatedName("ja") public class class263 { - @ObfuscatedName("ut") - @ObfuscatedSignature( - descriptor = "Loj;" - ) - @Export("platformInfo") - static PlatformInfo platformInfo; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - public static final class263 field3006; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - public static final class263 field3005; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - public static final class263 field3015; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - public static final class263 field3007; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - public static final class263 field3008; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - public static final class263 field3009; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - public static final class263 field3004; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - public static final class263 field3011; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - public static final class263 field3012; @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Lja;" ) - public static final class263 field3013; + public static final class263 field3071; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lja;" + ) + public static final class263 field3058; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lja;" + ) + public static final class263 field3060; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lja;" + ) + public static final class263 field3062; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lja;" + ) + public static final class263 field3068; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lja;" + ) + public static final class263 field3063; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lja;" + ) + public static final class263 field3059; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lja;" + ) + public static final class263 field3064; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lja;" + ) + public static final class263 field3066; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lja;" + ) + public static final class263 field3067; + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "Llq;" + ) + @Export("clientLanguage") + static Language clientLanguage; + @ObfuscatedName("fq") + @ObfuscatedGetter( + intValue = 1922609665 + ) + static int field3070; static { - field3006 = new class263(5); // L: 5 - field3005 = new class263(4); // L: 6 - field3015 = new class263(6); // L: 7 - field3007 = new class263(7); // L: 8 - field3008 = new class263(5); // L: 9 - field3009 = new class263(3); // L: 10 - field3004 = new class263(14); // L: 11 - field3011 = new class263(15); // L: 12 - field3012 = new class263(2); // L: 13 - field3013 = new class263(4); // L: 14 + field3071 = new class263(6); // L: 5 + field3058 = new class263(7); // L: 6 + field3060 = new class263(15); // L: 7 + field3062 = new class263(14); // L: 8 + field3068 = new class263(4); // L: 9 + field3063 = new class263(3); // L: 10 + field3059 = new class263(2); // L: 11 + field3064 = new class263(5); // L: 12 + field3066 = new class263(5); // L: 13 + field3067 = new class263(4); // L: 14 } @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "5" + garbageValue = "6" ) class263(int var1) { } // L: 20 - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IZI)I", - garbageValue = "-1248696661" - ) - static int method5178(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(); + @ObfuscatedName("l") + @Export("base37DecodeLong") + public static String base37DecodeLong(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { // L: 49 + if (var0 % 37L == 0L) { // L: 50 + return null; } else { - return var5; // L: 101 + int var2 = 0; // L: 51 + + for (long var3 = var0; var3 != 0L; var3 /= 37L) { // L: 52 53 55 + ++var2; // L: 54 + } + + StringBuilder var5; + char var8; + for (var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { // L: 57 58 67 + long var6 = var0; // L: 59 + var0 /= 37L; // L: 60 + var8 = class345.base37Table[(int)(var6 - var0 * 37L)]; // L: 61 + if (var8 == '_') { // L: 62 + int var9 = var5.length() - 1; // L: 63 + var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); // L: 64 + var8 = 160; // L: 65 + } + } + + var5.reverse(); // L: 69 + var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 70 + return var5.toString(); // L: 71 } } else { - throw new IllegalArgumentException("" + var1); + return null; } } + + @ObfuscatedName("gf") + @ObfuscatedSignature( + descriptor = "(Lca;ZB)V", + garbageValue = "-125" + ) + @Export("addPlayerToScene") + static void addPlayerToScene(Player var0, boolean var1) { + if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 4953 + var0.isUnanimated = false; // L: 4954 + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) { // L: 4955 4956 + var0.isUnanimated = true; + } + + int var2 = var0.x >> 7; // L: 4958 + int var3 = var0.y >> 7; // L: 4959 + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 4960 + long var4 = VarbitComposition.calculateTag(0, 0, 0, false, var0.index); // L: 4961 + if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 4962 + var0.isUnanimated = false; // L: 4963 + var0.tileHeight = class202.getTileHeight(var0.x, var0.y, class128.Client_plane); // L: 4964 + var0.playerCycle = Client.cycle; // L: 4965 + class175.scene.addNullableObject(class128.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); // L: 4966 + } else { + if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 4969 + if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 4970 + return; + } + + Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 4971 + } + + var0.tileHeight = class202.getTileHeight(var0.x, var0.y, class128.Client_plane); // L: 4973 + var0.playerCycle = Client.cycle; // L: 4974 + class175.scene.drawEntity(class128.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 4975 + } + } + } + + } // L: 4979 } diff --git a/runescape-client/src/main/java/class267.java b/runescape-client/src/main/java/class267.java index 14ef4b2c08..c0bd11f7e9 100644 --- a/runescape-client/src/main/java/class267.java +++ b/runescape-client/src/main/java/class267.java @@ -1,15 +1,200 @@ +import java.util.Date; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jo") +@ObfuscatedName("jb") public class class267 { - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1622399610" + @ObfuscatedName("ts") + @ObfuscatedGetter( + intValue = -1597128389 ) - static void method5196(int var0) { - Ignored.method6828(14); // L: 1839 - Login.field901 = var0; // L: 1840 - } // L: 1841 + static int field3206; + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "[Lqd;" + ) + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(ILbb;ZI)I", + garbageValue = "-1967428813" + ) + static int method5027(int var0, Script var1, boolean var2) { + String var3; + int var9; + if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 3267 + var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3268 + var9 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3269 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3 + var9; // L: 3270 + return 1; // L: 3271 + } else { + String var4; + if (var0 == ScriptOpcodes.APPEND) { // L: 3273 + class9.Interpreter_stringStackSize -= 2; // L: 3274 + var3 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize]; // L: 3275 + var4 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize + 1]; // L: 3276 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3 + var4; // L: 3277 + return 1; // L: 3278 + } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 3280 + var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3281 + var9 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3282 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3 + Message.intToString(var9, true); // L: 3283 + return 1; // L: 3284 + } else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 3286 + var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3287 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 3288 + return 1; // L: 3289 + } else { + int var6; + int var10; + if (var0 == ScriptOpcodes.FROMDATE) { // L: 3291 + var10 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3292 + long var13 = ((long)var10 + 11745L) * 86400000L; // L: 3293 + Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 3294 + var6 = Interpreter.Interpreter_calendar.get(5); // L: 3295 + int var17 = Interpreter.Interpreter_calendar.get(2); // L: 3296 + int var8 = Interpreter.Interpreter_calendar.get(1); // L: 3297 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 3298 + return 1; // L: 3299 + } else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 3301 + if (var0 == ScriptOpcodes.TOSTRING) { // L: 3309 + var10 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3310 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 3311 + return 1; // L: 3312 + } else if (var0 == ScriptOpcodes.COMPARE) { // L: 3314 + class9.Interpreter_stringStackSize -= 2; // L: 3315 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = ItemContainer.method2059(HealthBarDefinition.compareStrings(Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize + 1], class263.clientLanguage)); // L: 3316 + return 1; // L: 3317 + } else { + int var5; + byte[] var11; + Font var12; + if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 3319 + var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3320 + class12.Interpreter_intStackSize -= 2; // L: 3321 + var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3322 + var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3323 + var11 = class16.archive13.takeFile(var5, 0); // L: 3324 + var12 = new Font(var11); // L: 3325 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 3326 + return 1; // L: 3327 + } else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 3329 + var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3330 + class12.Interpreter_intStackSize -= 2; // L: 3331 + var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3332 + var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3333 + var11 = class16.archive13.takeFile(var5, 0); // L: 3334 + var12 = new Font(var11); // L: 3335 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 3336 + return 1; // L: 3337 + } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 3339 + class9.Interpreter_stringStackSize -= 2; // L: 3340 + var3 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize]; // L: 3341 + var4 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize + 1]; // L: 3342 + if (Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1) { // L: 3343 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3; + } else { + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4; // L: 3344 + } + + return 1; // L: 3345 + } else if (var0 == ScriptOpcodes.ESCAPE) { // L: 3347 + var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3348 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 3349 + return 1; // L: 3350 + } else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 3352 + var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3353 + var9 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3354 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 3355 + return 1; // L: 3356 + } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 3358 + var10 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3359 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class6.isCharPrintable((char)var10) ? 1 : 0; // L: 3360 + return 1; // L: 3361 + } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 3363 + var10 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3364 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class78.isAlphaNumeric((char)var10) ? 1 : 0; // L: 3365 + return 1; // L: 3366 + } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 3368 + var10 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3369 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = UserComparator5.isCharAlphabetic((char)var10) ? 1 : 0; // L: 3370 + return 1; // L: 3371 + } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 3373 + var10 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3374 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Coord.isDigit((char)var10) ? 1 : 0; // L: 3375 + return 1; // L: 3376 + } else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 3378 + var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3379 + if (var3 != null) { // L: 3380 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.length(); + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3381 + } + + return 1; // L: 3382 + } else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 3384 + var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3385 + class12.Interpreter_intStackSize -= 2; // L: 3386 + var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3387 + var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3388 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 3389 + return 1; // L: 3390 + } else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 3392 + var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3393 + StringBuilder var15 = new StringBuilder(var3.length()); // L: 3394 + boolean var16 = false; // L: 3395 + + for (var6 = 0; var6 < var3.length(); ++var6) { // L: 3396 + char var7 = var3.charAt(var6); // L: 3397 + if (var7 == '<') { // L: 3398 + var16 = true; + } else if (var7 == '>') { // L: 3399 + var16 = false; + } else if (!var16) { // L: 3400 + var15.append(var7); + } + } + + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var15.toString(); // L: 3402 + return 1; // L: 3403 + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 3405 + var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3406 + var9 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3407 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 3408 + return 1; // L: 3409 + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 3411 + class9.Interpreter_stringStackSize -= 2; // L: 3412 + var3 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize]; // L: 3413 + var4 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize + 1]; // L: 3414 + var5 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3415 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 3416 + return 1; // L: 3417 + } else if (var0 == 4122) { // L: 3419 + var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3420 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 3421 + return 1; // L: 3422 + } else { + return 2; // L: 3424 + } + } + } else { + class9.Interpreter_stringStackSize -= 2; // L: 3302 + var3 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize]; // L: 3303 + var4 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize + 1]; // L: 3304 + if (ModelData0.localPlayer.appearance != null && ModelData0.localPlayer.appearance.isFemale) { // L: 3305 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4; + } else { + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3; // L: 3306 + } + + return 1; // L: 3307 + } + } + } + } } diff --git a/runescape-client/src/main/java/class268.java b/runescape-client/src/main/java/class268.java index 539dc432a2..20138f9a23 100644 --- a/runescape-client/src/main/java/class268.java +++ b/runescape-client/src/main/java/class268.java @@ -1,680 +1,531 @@ +import java.io.File; +import java.io.IOException; +import java.util.Date; import java.util.HashMap; import java.util.TimeZone; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jr") +@ObfuscatedName("ju") public final class class268 { - @ObfuscatedName("i") - static final HashMap field3142; + @ObfuscatedName("l") + static final HashMap field3208; + @ObfuscatedName("a") + @Export("Interpreter_stringLocals") + static String[] Interpreter_stringLocals; + @ObfuscatedName("bq") + @ObfuscatedGetter( + intValue = 685628771 + ) + static int field3212; static { - field3142 = new HashMap(); // L: 10 - java.util.Calendar.getInstance(method5197("Europe/London")); // L: 13 - } // L: 14 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/util/TimeZone;", - garbageValue = "-1547649433" - ) - static TimeZone method5197(String var0) { - synchronized(field3142) { // L: 21 - TimeZone var2 = (TimeZone)field3142.get(var0); // L: 22 - if (var2 == null) { // L: 23 - var2 = TimeZone.getTimeZone(var0); // L: 24 - field3142.put(var0, var2); // L: 25 + field3208 = new HashMap(); // L: 11 + TimeZone var0; + synchronized(field3208) { // L: 16 + TimeZone var2 = (TimeZone)field3208.get("Europe/London"); // L: 17 + if (var2 == null) { // L: 18 + var2 = TimeZone.getTimeZone("Europe/London"); // L: 19 + field3208.put("Europe/London", var2); // L: 20 } - return var2; // L: 27 + var0 = var2; // L: 22 } + + java.util.Calendar.getInstance(var0); // L: 25 + } // L: 26 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/io/File;Ljava/io/File;I)V", + garbageValue = "-1479426402" + ) + static void method5030(File var0, File var1) { + try { + AccessFile var2 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); // L: 270 + Buffer var3 = new Buffer(500); // L: 271 + var3.writeByte(3); // L: 272 + var3.writeByte(var1 != null ? 1 : 0); // L: 273 + var3.writeCESU8(var0.getPath()); // L: 274 + if (var1 != null) { + var3.writeCESU8(""); // L: 275 + } + + var2.write(var3.array, 0, var3.offset); // L: 276 + var2.close(); // L: 277 + } catch (IOException var4) { // L: 279 + var4.printStackTrace(); // L: 280 + } + + } // L: 282 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Ljava/util/Date;I)Z", + garbageValue = "1429154223" + ) + static boolean method5028(Date var0) { + java.util.Calendar var1 = java.util.Calendar.getInstance(); // L: 999 + var1.set(1, var1.get(1) - 13); // L: 1000 + var1.set(5, var1.get(5) + 1); // L: 1001 + var1.set(11, 0); // L: 1002 + var1.set(12, 0); // L: 1003 + var1.set(13, 0); // L: 1004 + var1.set(14, 0); // L: 1005 + Date var2 = var1.getTime(); // L: 1006 + return var0.before(var2); // L: 1007 } - @ObfuscatedName("is") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1355418320" + descriptor = "(Lgm;[Lgh;B)V", + garbageValue = "61" ) - @Export("resumePauseWidget") - static void resumePauseWidget(int var0, int var1) { - PacketBufferNode var2 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2952, Client.packetWriter.isaacCipher); // L: 9681 - var2.packetBuffer.writeIntME(var0); // L: 9682 - var2.packetBuffer.method7710(var1); // L: 9683 - Client.packetWriter.addNode(var2); // L: 9684 - } // L: 9685 + static final void method5029(Scene var0, CollisionMap[] var1) { + int var2; + int var3; + int var4; + int var5; + for (var2 = 0; var2 < 4; ++var2) { // L: 618 + for (var3 = 0; var3 < 104; ++var3) { // L: 619 + for (var4 = 0; var4 < 104; ++var4) { // L: 620 + if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { // L: 621 + var5 = var2; // L: 622 + if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 623 + var5 = var2 - 1; + } - @ObfuscatedName("jp") - @ObfuscatedSignature( - descriptor = "([Lky;IIIIIIIIB)V", - garbageValue = "-98" - ) - @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: 10231 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 10232 + if (var5 >= 0) { // L: 624 + var1[var5].setBlockedByFloor(var3, var4); + } + } + } + } + } - for (int var9 = 0; var9 < var0.length; ++var9) { // L: 10233 - Widget var10 = var0[var9]; // L: 10234 - if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 10235 10236 - int var11; - if (var8 == -1) { // L: 10238 - Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 10239 - Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 10240 - Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 10241 - Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 10242 - var11 = ++Client.rootWidgetCount - 1; // L: 10243 - } else { - var11 = var8; // L: 10245 + Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; // L: 629 + if (Tiles.rndHue < -8) { // L: 630 + Tiles.rndHue = -8; + } + + if (Tiles.rndHue > 8) { // L: 631 + Tiles.rndHue = 8; + } + + Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; // L: 632 + if (Tiles.rndLightness < -16) { // L: 633 + Tiles.rndLightness = -16; + } + + if (Tiles.rndLightness > 16) { // L: 634 + Tiles.rndLightness = 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: 635 + byte[][] var42 = NPC.field1259[var2]; // L: 636 + boolean var45 = true; // L: 637 + boolean var46 = true; // L: 638 + boolean var6 = true; // L: 639 + boolean var7 = true; // L: 640 + boolean var8 = true; // L: 641 + var9 = (int)Math.sqrt(5100.0D); // L: 642 + var10 = var9 * 768 >> 8; // L: 643 + + int var19; + int var20; + for (var11 = 1; var11 < 103; ++var11) { // L: 644 + for (var12 = 1; var12 < 103; ++var12) { // L: 645 + var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; // L: 646 + var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; // L: 647 + var15 = (int)Math.sqrt((double)(var14 * var14 + var13 * var13 + 65536)); // L: 648 + var16 = (var13 << 8) / var15; // L: 649 + var17 = 65536 / var15; // L: 650 + var18 = (var14 << 8) / var15; // L: 651 + var19 = (var18 * -50 + var16 * -50 + var17 * -10) / var10 + 96; // L: 652 + var20 = (var42[var12][var11 + 1] >> 3) + (var42[var12 - 1][var11] >> 2) + (var42[var12][var11 - 1] >> 2) + (var42[var12 + 1][var11] >> 3) + (var42[var12][var11] >> 1); // L: 653 + Interpreter.field839[var12][var11] = var19 - var20; // L: 654 + } + } + + for (var11 = 0; var11 < 104; ++var11) { // L: 657 + class154.Tiles_hue[var11] = 0; // L: 658 + MusicPatch.Tiles_saturation[var11] = 0; // L: 659 + WallDecoration.Tiles_lightness[var11] = 0; // L: 660 + Tiles.Tiles_hueMultiplier[var11] = 0; // L: 661 + MenuAction.field866[var11] = 0; // L: 662 + } + + for (var11 = -5; var11 < 109; ++var11) { // L: 664 + for (var12 = 0; var12 < 104; ++var12) { // L: 665 + var13 = var11 + 5; // L: 666 + int var10002; + if (var13 >= 0 && var13 < 104) { // L: 667 + var14 = Tiles.Tiles_underlays[var2][var13][var12] & 255; // L: 668 + if (var14 > 0) { // L: 669 + FloorUnderlayDefinition var43 = class160.method3171(var14 - 1); // L: 670 + var10000 = class154.Tiles_hue; // L: 671 + var10000[var12] += var43.hue; + var10000 = MusicPatch.Tiles_saturation; // L: 672 + var10000[var12] += var43.saturation; + var10000 = WallDecoration.Tiles_lightness; // L: 673 + var10000[var12] += var43.lightness; + var10000 = Tiles.Tiles_hueMultiplier; // L: 674 + var10000[var12] += var43.hueMultiplier; + var10002 = MenuAction.field866[var12]++; // L: 675 + } + } + + var14 = var11 - 5; // L: 678 + if (var14 >= 0 && var14 < 104) { // L: 679 + var15 = Tiles.Tiles_underlays[var2][var14][var12] & 255; // L: 680 + if (var15 > 0) { // L: 681 + FloorUnderlayDefinition var44 = class160.method3171(var15 - 1); // L: 682 + var10000 = class154.Tiles_hue; // L: 683 + var10000[var12] -= var44.hue; + var10000 = MusicPatch.Tiles_saturation; // L: 684 + var10000[var12] -= var44.saturation; + var10000 = WallDecoration.Tiles_lightness; // L: 685 + var10000[var12] -= var44.lightness; + var10000 = Tiles.Tiles_hueMultiplier; // L: 686 + var10000[var12] -= var44.hueMultiplier; + var10002 = MenuAction.field866[var12]--; // L: 687 + } + } } - var10.rootIndex = var11; // L: 10246 - var10.cycle = Client.cycle; // L: 10247 - if (!var10.isIf3 || !class1.isComponentHidden(var10)) { // L: 10248 - if (var10.contentType > 0) { // L: 10249 - class231.method4712(var10); - } + if (var11 >= 1 && var11 < 103) { // L: 691 + var12 = 0; // L: 692 + var13 = 0; // L: 693 + var14 = 0; // L: 694 + var15 = 0; // L: 695 + var16 = 0; // L: 696 - int var12 = var10.x + var6; // L: 10250 - int var13 = var7 + var10.y; // L: 10251 - int var14 = var10.transparencyTop; // L: 10252 - int var15; - int var16; - if (var10 == Client.clickedWidget) { // L: 10253 - if (var1 != -1412584499 && !var10.isScrollBar) { // L: 10254 - class307.field3585 = var0; // L: 10255 - class93.field1252 = var6; // L: 10256 - ItemContainer.field1013 = var7; // L: 10257 - continue; // L: 10258 + for (var17 = -5; var17 < 109; ++var17) { // L: 697 + var18 = var17 + 5; // L: 698 + if (var18 >= 0 && var18 < 104) { // L: 699 + var12 += class154.Tiles_hue[var18]; // L: 700 + var13 += MusicPatch.Tiles_saturation[var18]; // L: 701 + var14 += WallDecoration.Tiles_lightness[var18]; // L: 702 + var15 += Tiles.Tiles_hueMultiplier[var18]; // L: 703 + var16 += MenuAction.field866[var18]; // L: 704 } - if (Client.isDraggingWidget && Client.field696) { // L: 10260 - var15 = MouseHandler.MouseHandler_x; // L: 10261 - var16 = MouseHandler.MouseHandler_y; // L: 10262 - var15 -= Client.widgetClickX; // L: 10263 - var16 -= Client.widgetClickY; // L: 10264 - if (var15 < Client.field773) { // L: 10265 - var15 = Client.field773; + var19 = var17 - 5; // L: 706 + if (var19 >= 0 && var19 < 104) { // L: 707 + var12 -= class154.Tiles_hue[var19]; // L: 708 + var13 -= MusicPatch.Tiles_saturation[var19]; // L: 709 + var14 -= WallDecoration.Tiles_lightness[var19]; // L: 710 + var15 -= Tiles.Tiles_hueMultiplier[var19]; // L: 711 + var16 -= MenuAction.field866[var19]; // L: 712 + } + + if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { // L: 714 715 716 717 + if (var2 < Tiles.Tiles_minPlane) { // L: 720 + Tiles.Tiles_minPlane = var2; } - if (var15 + var10.width > Client.field773 + Client.clickedWidgetParent.width) { // L: 10266 - var15 = Client.field773 + Client.clickedWidgetParent.width - var10.width; - } - - if (var16 < Client.field686) { // L: 10267 - var16 = Client.field686; - } - - if (var16 + var10.height > Client.field686 + Client.clickedWidgetParent.height) { // L: 10268 - var16 = Client.field686 + Client.clickedWidgetParent.height - var10.height; - } - - var12 = var15; // L: 10269 - var13 = var16; // L: 10270 - } - - if (!var10.isScrollBar) { // L: 10272 - var14 = 128; - } - } - - int var17; - int var18; - int var19; - int var20; - int var21; - int var22; - if (var10.type == 2) { // L: 10278 - var15 = var2; // L: 10279 - var16 = var3; // L: 10280 - var17 = var4; // L: 10281 - var18 = var5; // L: 10282 - } else if (var10.type == 9) { // L: 10284 - var19 = var12; // L: 10285 - var20 = var13; // L: 10286 - var21 = var12 + var10.width; // L: 10287 - var22 = var13 + var10.height; // L: 10288 - if (var21 < var12) { // L: 10289 - var19 = var21; // L: 10291 - var21 = var12; // L: 10292 - } - - if (var22 < var13) { // L: 10294 - var20 = var22; // L: 10296 - var22 = var13; // L: 10297 - } - - ++var21; // L: 10299 - ++var22; // L: 10300 - var15 = var19 > var2 ? var19 : var2; // L: 10301 - var16 = var20 > var3 ? var20 : var3; // L: 10302 - var17 = var21 < var4 ? var21 : var4; // L: 10303 - var18 = var22 < var5 ? var22 : var5; // L: 10304 - } else { - var19 = var12 + var10.width; // L: 10307 - var20 = var13 + var10.height; // L: 10308 - var15 = var12 > var2 ? var12 : var2; // L: 10309 - var16 = var13 > var3 ? var13 : var3; // L: 10310 - var17 = var19 < var4 ? var19 : var4; // L: 10311 - var18 = var20 < var5 ? var20 : var5; // L: 10312 - } - - if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 10314 - if (var10.contentType != 0) { // L: 10315 - if (var10.contentType == 1336) { // L: 10316 - if (class131.clientPreferences.method2236()) { // L: 10317 - var13 += 15; // L: 10318 - class13.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 10319 - var13 += 15; // L: 10320 - Runtime var42 = Runtime.getRuntime(); // L: 10321 - var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 10322 - var21 = 16776960; // L: 10323 - if (var20 > 327680 && !Client.isLowDetail) { // L: 10324 - var21 = 16711680; + var20 = Tiles.Tiles_underlays[var2][var11][var17] & 255; // L: 721 + int var21 = Tiles.Tiles_overlays[var2][var11][var17] & 255; // L: 722 + if (var20 > 0 || var21 > 0) { // L: 723 + int var22 = Tiles.Tiles_heights[var2][var11][var17]; // L: 724 + int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; // L: 725 + int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; // L: 726 + int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; // L: 727 + int var26 = Interpreter.field839[var11][var17]; // L: 728 + int var27 = Interpreter.field839[var11 + 1][var17]; // L: 729 + int var28 = Interpreter.field839[var11 + 1][var17 + 1]; // L: 730 + int var29 = Interpreter.field839[var11][var17 + 1]; // L: 731 + int var30 = -1; // L: 732 + int var31 = -1; // L: 733 + int var32; + int var33; + if (var20 > 0) { // L: 734 + var32 = var12 * 256 / var15; // L: 735 + var33 = var13 / var16; // L: 736 + int var34 = var14 / var16; // L: 737 + var30 = ArchiveLoader.hslToRgb(var32, var33, var34); // L: 738 + var32 = var32 + Tiles.rndHue & 255; // L: 739 + var34 += Tiles.rndLightness; // L: 740 + if (var34 < 0) { // L: 741 + var34 = 0; + } else if (var34 > 255) { // L: 742 + var34 = 255; } - class13.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 10325 - var13 += 15; // L: 10326 - } - continue; - } - - if (var10.contentType == 1337) { // L: 10330 - Client.viewportX = var12; // L: 10331 - Client.viewportY = var13; // L: 10332 - SequenceDefinition.drawEntities(var12, var13, var10.width, var10.height); // L: 10333 - Client.field715[var10.rootIndex] = true; // L: 10334 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10335 - continue; // L: 10336 - } - - if (var10.contentType == 1338) { // L: 10338 - ArchiveDiskActionHandler.drawMinimap(var10, var12, var13, var11); // L: 10339 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10340 - continue; // L: 10341 - } - - if (var10.contentType == 1339) { // L: 10343 - PacketWriter.drawCompass(var10, var12, var13, var11); // L: 10344 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10345 - continue; // L: 10346 - } - - if (var10.contentType == 1400) { // L: 10348 - ScriptFrame.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 10349 - } - - if (var10.contentType == 1401) { // L: 10351 - ScriptFrame.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 10352 - } - - if (var10.contentType == 1402) { // L: 10354 - class341.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 10355 - } - } - - if (var10.type == 0) { // L: 10358 - if (!var10.isIf3 && class1.isComponentHidden(var10) && var10 != DevicePcmPlayerProvider.mousedOverWidgetIf1) { // L: 10359 - continue; - } - - if (!var10.isIf3) { // L: 10360 - if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 10361 - var10.scrollY = var10.scrollHeight - var10.height; + var31 = ArchiveLoader.hslToRgb(var32, var33, var34); // L: 743 } - if (var10.scrollY < 0) { // L: 10362 - var10.scrollY = 0; + if (var2 > 0) { // L: 745 + boolean var51 = true; // L: 746 + if (var20 == 0 && Tiles.Tiles_shapes[var2][var11][var17] != 0) { // L: 747 + var51 = false; + } + + if (var21 > 0 && !Message.method1098(var21 - 1).hideUnderlay) { // L: 748 + var51 = false; + } + + if (var51 && var23 == var22 && var24 == var22 && var25 == var22) { // L: 749 750 + var10000 = VerticalAlignment.field1993[var2][var11]; + var10000[var17] |= 2340; + } } - } - drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 10364 - if (var10.children != null) { // L: 10365 - drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - } + var32 = 0; // L: 753 + if (var31 != -1) { // L: 754 + var32 = Rasterizer3D.Rasterizer3D_colorPalette[DevicePcmPlayerProvider.method340(var31, 96)]; + } - InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); // L: 10366 - if (var30 != null) { // L: 10367 - class131.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 10368 - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10370 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 10371 - } else if (var10.type == 11) { // L: 10373 - if (class1.isComponentHidden(var10) && var10 != DevicePcmPlayerProvider.mousedOverWidgetIf1) { // L: 10374 - continue; - } - - if (var10.children != null) { // L: 10375 - drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10376 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 10377 - } - - if (Client.isResizable || Client.field717[var11] || Client.gameDrawingMode > 1) { // L: 10379 - if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 10380 10381 - SoundSystem.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); - } - - if (var10.type != 1) { // L: 10383 - int var23; - int var24; - int var25; - int var26; - if (var10.type == 2) { // L: 10386 - var19 = 0; // L: 10387 - - for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 10388 - for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 10389 - var22 = var21 * (var10.paddingX + 32) + var12; // L: 10390 - var23 = var13 + var20 * (var10.paddingY + 32); // L: 10391 - if (var19 < 20) { // L: 10392 - var22 += var10.inventoryXOffsets[var19]; // L: 10393 - var23 += var10.inventoryYOffsets[var19]; // L: 10394 - } - - if (var10.itemIds[var19] <= 0) { // L: 10396 - if (var10.inventorySprites != null && var19 < 20) { // L: 10441 - SpritePixels var46 = var10.getInventorySprite(var19); // L: 10442 - if (var46 != null) { // L: 10443 - var46.drawTransBgAt(var22, var23); - } else if (Widget.field3411) { // L: 10444 - class346.invalidateWidget(var10); - } - } - } else { - boolean var37 = false; // L: 10397 - boolean var38 = false; // L: 10398 - var26 = var10.itemIds[var19] - 1; // L: 10399 - if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == class142.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 10400 - SpritePixels var35; - if (Client.isItemSelected == 1 && var19 == class432.selectedItemSlot && var10.id == TaskHandler.selectedItemWidget) { // L: 10402 - var35 = class135.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); - } else { - var35 = class135.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 10403 - } - - if (var35 != null) { // L: 10404 - if (var10 == class142.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 10405 - var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 10406 - var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 10407 - if (var24 < 5 && var24 > -5) { // L: 10408 - var24 = 0; - } - - if (var25 < 5 && var25 > -5) { // L: 10409 - var25 = 0; - } - - if (Client.itemDragDuration < 5) { // L: 10410 - var24 = 0; // L: 10411 - var25 = 0; // L: 10412 - } - - var35.drawTransAt(var24 + var22, var23 + var25, 128); // L: 10414 - if (var1 != -1) { // L: 10415 - Widget var28 = var0[var1 & 65535]; // L: 10416 - int var29; - if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 10417 - var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field556 / 3; // L: 10418 - if (var29 > Client.field556 * 10) { // L: 10419 - var29 = Client.field556 * 10; - } - - if (var29 > var28.scrollY) { // L: 10420 - var29 = var28.scrollY; - } - - var28.scrollY -= var29; // L: 10421 - Client.draggedWidgetY += var29; // L: 10422 - class346.invalidateWidget(var28); // L: 10423 - } - - if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 10425 - var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field556 / 3; // L: 10426 - if (var29 > Client.field556 * 10) { // L: 10427 - var29 = Client.field556 * 10; - } - - if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 10428 - var29 = var28.scrollHeight - var28.height - var28.scrollY; - } - - var28.scrollY += var29; // L: 10429 - Client.draggedWidgetY -= var29; // L: 10430 - class346.invalidateWidget(var28); // L: 10431 - } - } - } else if (var10 == GrandExchangeOfferAgeComparator.field4011 && var19 == Client.field611) { // L: 10435 - var35.drawTransAt(var22, var23, 128); - } else { - var35.drawTransBgAt(var22, var23); // L: 10436 - } - } else { - class346.invalidateWidget(var10); // L: 10438 - } - } - } - - ++var19; // L: 10446 - } - } - } else if (var10.type == 3) { // L: 10451 - if (Skills.runCs1(var10)) { // L: 10453 - var19 = var10.color2; // L: 10454 - if (var10 == DevicePcmPlayerProvider.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 10455 - var19 = var10.mouseOverColor2; - } - } else { - var19 = var10.color; // L: 10458 - if (var10 == DevicePcmPlayerProvider.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 10459 - var19 = var10.mouseOverColor; - } - } - - if (var10.fill) { // L: 10461 - switch(var10.fillMode.field4699) { // L: 10462 - case 1: - Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 10471 - break; // L: 10472 - case 2: - Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 10464 - break; // L: 10465 - default: - if (var14 == 0) { // L: 10467 - 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: 10468 - } - } - } else if (var14 == 0) { // L: 10476 - 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: 10477 - } + if (var21 == 0) { // L: 755 + var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, DevicePcmPlayerProvider.method340(var30, var26), DevicePcmPlayerProvider.method340(var30, var27), DevicePcmPlayerProvider.method340(var30, var28), DevicePcmPlayerProvider.method340(var30, var29), 0, 0, 0, 0, var32, 0); // L: 756 } else { - Font var39; - if (var10.type == 4) { // L: 10481 - var39 = var10.getFont(); // L: 10482 - if (var39 == null) { // L: 10483 - if (Widget.field3411) { // L: 10484 - class346.invalidateWidget(var10); - } - } else { - String var44 = var10.text; // L: 10488 - if (Skills.runCs1(var10)) { // L: 10489 - var20 = var10.color2; // L: 10490 - if (var10 == DevicePcmPlayerProvider.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 10491 - var20 = var10.mouseOverColor2; - } - - if (var10.text2.length() > 0) { // L: 10492 - var44 = var10.text2; - } - } else { - var20 = var10.color; // L: 10495 - if (var10 == DevicePcmPlayerProvider.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 10496 - var20 = var10.mouseOverColor; - } - } - - if (var10.isIf3 && var10.itemId != -1) { // L: 10498 - ItemComposition var45 = class19.ItemDefinition_get(var10.itemId); // L: 10499 - var44 = var45.name; // L: 10500 - if (var44 == null) { // L: 10501 - var44 = "null"; - } - - if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 10502 - var44 = UserComparator9.colorStartTag(16748608) + var44 + "" + " " + 'x' + ParamComposition.formatItemStacks(var10.itemQuantity); - } - } - - if (var10 == Client.meslayerContinueWidget) { // L: 10504 - var44 = "Please wait..."; // L: 10505 - var20 = var10.color; // L: 10506 - } - - if (!var10.isIf3) { // L: 10508 - var44 = class431.method7592(var44, var10); - } - - var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 10509 - } - } else if (var10.type == 5) { // L: 10512 - SpritePixels var40; - if (!var10.isIf3) { // L: 10513 - var40 = var10.getSprite(Skills.runCs1(var10), VerticalAlignment.urlRequester); // L: 10514 - if (var40 != null) { // L: 10515 - var40.drawTransBgAt(var12, var13); - } else if (Widget.field3411) { // L: 10516 - class346.invalidateWidget(var10); - } - } else { - if (var10.itemId != -1) { // L: 10520 - var40 = class135.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); - } else { - var40 = var10.getSprite(false, VerticalAlignment.urlRequester); // L: 10521 - } - - if (var40 == null) { // L: 10522 - if (Widget.field3411) { // L: 10546 - class346.invalidateWidget(var10); - } - } else { - var20 = var40.width; // L: 10523 - var21 = var40.height; // L: 10524 - if (!var10.spriteTiling) { // L: 10525 - var22 = var10.width * 4096 / var20; // L: 10539 - if (var10.spriteAngle != 0) { // L: 10540 - var40.method8106(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); - } else if (var14 != 0) { // L: 10541 - var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); - } else if (var20 == var10.width && var21 == var10.height) { // L: 10542 - var40.drawTransBgAt(var12, var13); // L: 10543 - } else { - var40.drawScaledAt(var12, var13, var10.width, var10.height); - } - } else { - Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 10526 - var22 = (var20 - 1 + var10.width) / var20; // L: 10527 - var23 = (var21 - 1 + var10.height) / var21; // L: 10528 - - for (var24 = 0; var24 < var22; ++var24) { // L: 10529 - for (var25 = 0; var25 < var23; ++var25) { // L: 10530 - if (var10.spriteAngle != 0) { // L: 10531 - var40.method8106(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); - } else if (var14 != 0) { // L: 10532 - var40.drawTransAt(var12 + var20 * var24, var13 + var25 * var21, 256 - (var14 & 255)); - } else { - var40.drawTransBgAt(var12 + var24 * var20, var13 + var25 * var21); // L: 10533 - } - } - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10536 - } - } - } + var33 = Tiles.Tiles_shapes[var2][var11][var17] + 1; // L: 759 + byte var52 = RunException.field4812[var2][var11][var17]; // L: 760 + FloorOverlayDefinition var35 = Message.method1098(var21 - 1); // L: 761 + int var36 = var35.texture; // L: 762 + int var37; + int var38; + int var39; + int var40; + if (var36 >= 0) { // L: 765 + var38 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var36); // L: 766 + var37 = -1; // L: 767 + } else if (var35.primaryRgb == 16711935) { // L: 770 + var37 = -2; // L: 771 + var36 = -1; // L: 772 + var38 = -2; // L: 773 } else { - ItemComposition var33; - if (var10.type == 6) { // L: 10550 - boolean var36 = Skills.runCs1(var10); // L: 10551 - if (var36) { // L: 10553 - var20 = var10.sequenceId2; - } else { - var20 = var10.sequenceId; // L: 10554 - } - - Model var41 = null; // L: 10555 - var22 = 0; // L: 10556 - if (var10.itemId != -1) { // L: 10557 - var33 = class19.ItemDefinition_get(var10.itemId); // L: 10558 - if (var33 != null) { // L: 10559 - var33 = var33.getCountObj(var10.itemQuantity); // L: 10560 - var41 = var33.getModel(1); // L: 10561 - if (var41 != null) { // L: 10562 - var41.calculateBoundsCylinder(); // L: 10563 - var22 = var41.height / 2; // L: 10564 - } else { - class346.invalidateWidget(var10); // L: 10566 - } - } - } else if (var10.modelType == 5) { // L: 10569 - if (var10.modelId == 0) { // L: 10570 - var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); - } else { - var41 = GrandExchangeEvents.localPlayer.getModel(); // L: 10571 - } - } else if (var20 == -1) { // L: 10573 - var41 = var10.getModel((SequenceDefinition)null, -1, var36, GrandExchangeEvents.localPlayer.appearance); // L: 10574 - if (var41 == null && Widget.field3411) { // L: 10575 - class346.invalidateWidget(var10); - } - } else { - SequenceDefinition var47 = class163.SequenceDefinition_get(var20); // L: 10578 - var41 = var10.getModel(var47, var10.modelFrame, var36, GrandExchangeEvents.localPlayer.appearance); // L: 10579 - if (var41 == null && Widget.field3411) { // L: 10580 - class346.invalidateWidget(var10); - } - } - - Rasterizer3D.method4631(var10.width / 2 + var12, var10.height / 2 + var13); // L: 10582 - var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 10583 - var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 10584 - if (var41 != null) { // L: 10585 - if (!var10.isIf3) { // L: 10586 - var41.method5003(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); - } else { - var41.calculateBoundsCylinder(); // L: 10588 - if (var10.modelOrthog) { // L: 10589 - var41.method5050(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); - } else { - var41.method5003(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 10590 - } - } - } - - Rasterizer3D.Rasterizer3D_method3(); // L: 10593 - } else { - if (var10.type == 7) { // L: 10596 - var39 = var10.getFont(); // L: 10597 - if (var39 == null) { // L: 10598 - if (Widget.field3411) { // L: 10599 - class346.invalidateWidget(var10); - } - continue; - } - - var20 = 0; // L: 10602 - - for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 10603 - for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 10604 - if (var10.itemIds[var20] > 0) { // L: 10605 - var33 = class19.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 10606 - String var34; - if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 10608 - var34 = UserComparator9.colorStartTag(16748608) + var33.name + ""; // L: 10609 - } else { - var34 = UserComparator9.colorStartTag(16748608) + var33.name + "" + " " + 'x' + ParamComposition.formatItemStacks(var10.itemQuantities[var20]); - } - - var25 = var22 * (var10.paddingX + 115) + var12; // L: 10610 - var26 = var21 * (var10.paddingY + 12) + var13; // L: 10611 - if (var10.textXAlignment == 0) { // L: 10612 - var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else if (var10.textXAlignment == 1) { // L: 10613 - 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: 10614 - } - } - - ++var20; // L: 10616 - } - } - } - - if (var10.type == 8 && var10 == GrandExchangeOfferOwnWorldComparator.field486 && Client.field657 == Client.field656) { // L: 10620 10621 - var19 = 0; // L: 10622 - var20 = 0; // L: 10623 - Font var31 = class13.fontPlain12; // L: 10624 - String var32 = var10.text; // L: 10625 - - String var43; - for (var32 = class431.method7592(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 10627 10628 10640 - var24 = var32.indexOf("
"); // L: 10629 - if (var24 != -1) { // L: 10630 - var43 = var32.substring(0, var24); // L: 10631 - var32 = var32.substring(var24 + 4); // L: 10632 - } else { - var43 = var32; // L: 10635 - var32 = ""; // L: 10636 - } - - var25 = var31.stringWidth(var43); // L: 10638 - if (var25 > var19) { // L: 10639 - var19 = var25; - } - } - - var19 += 6; // L: 10642 - var20 += 7; // L: 10643 - var24 = var12 + var10.width - 5 - var19; // L: 10644 - var25 = var13 + var10.height + 5; // L: 10645 - if (var24 < var12 + 5) { // L: 10646 - var24 = var12 + 5; - } - - if (var24 + var19 > var4) { // L: 10647 - var24 = var4 - var19; - } - - if (var20 + var25 > var5) { // L: 10648 - var25 = var5 - var20; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 10649 - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 10650 - var32 = var10.text; // L: 10651 - var26 = var25 + var31.ascent + 2; // L: 10652 - - for (var32 = class431.method7592(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 10653 10654 10665 - int var27 = var32.indexOf("
"); // L: 10655 - if (var27 != -1) { // L: 10656 - var43 = var32.substring(0, var27); // L: 10657 - var32 = var32.substring(var27 + 4); // L: 10658 - } else { - var43 = var32; // L: 10661 - var32 = ""; // L: 10662 - } - - var31.draw(var43, var24 + 3, var26, 0, -1); // L: 10664 - } - } - - if (var10.type == 9) { // L: 10669 - if (var10.field3369) { // L: 10674 - var19 = var12; // L: 10675 - var20 = var13 + var10.height; // L: 10676 - var21 = var12 + var10.width; // L: 10677 - var22 = var13; // L: 10678 - } else { - var19 = var12; // L: 10681 - var20 = var13; // L: 10682 - var21 = var12 + var10.width; // L: 10683 - var22 = var13 + var10.height; // L: 10684 - } - - if (var10.lineWid == 1) { // L: 10686 - Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 10687 - } else { - class9.method74(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 10690 - } - } + var37 = ArchiveLoader.hslToRgb(var35.hue, var35.saturation, var35.lightness); // L: 776 + var39 = var35.hue + Tiles.rndHue & 255; // L: 777 + var40 = var35.lightness + Tiles.rndLightness; // L: 778 + if (var40 < 0) { // L: 779 + var40 = 0; + } else if (var40 > 255) { // L: 780 + var40 = 255; } + + var38 = ArchiveLoader.hslToRgb(var39, var35.saturation, var40); // L: 781 + } + + var39 = 0; // L: 784 + if (var38 != -2) { // L: 785 + var39 = Rasterizer3D.Rasterizer3D_colorPalette[ParamComposition.method3505(var38, 96)]; + } + + if (var35.secondaryRgb != -1) { // L: 786 + var40 = var35.secondaryHue + Tiles.rndHue & 255; // L: 787 + int var41 = var35.secondaryLightness + Tiles.rndLightness; // L: 788 + if (var41 < 0) { // L: 789 + var41 = 0; + } else if (var41 > 255) { // L: 790 + var41 = 255; + } + + var38 = ArchiveLoader.hslToRgb(var40, var35.secondarySaturation, var41); // L: 791 + var39 = Rasterizer3D.Rasterizer3D_colorPalette[ParamComposition.method3505(var38, 96)]; // L: 792 + } + + var0.addTile(var2, var11, var17, var33, var52, var36, var22, var23, var24, var25, DevicePcmPlayerProvider.method340(var30, var26), DevicePcmPlayerProvider.method340(var30, var27), DevicePcmPlayerProvider.method340(var30, var28), DevicePcmPlayerProvider.method340(var30, var29), ParamComposition.method3505(var37, var26), ParamComposition.method3505(var37, var27), ParamComposition.method3505(var37, var28), ParamComposition.method3505(var37, var29), var32, var39); // L: 794 + } + } + } + } + } + } + + for (var11 = 1; var11 < 103; ++var11) { // L: 801 + for (var12 = 1; var12 < 103; ++var12) { // L: 802 + var0.setTileMinPlane(var2, var12, var11, VarbitComposition.method3489(var2, var12, var11)); // L: 803 + } + } + + Tiles.Tiles_underlays[var2] = null; // L: 806 + Tiles.Tiles_overlays[var2] = null; // L: 807 + Tiles.Tiles_shapes[var2] = null; // L: 808 + RunException.field4812[var2] = null; // L: 809 + NPC.field1259[var2] = null; // L: 810 + } + + var0.method4057(-50, -10, -50); // L: 812 + + for (var2 = 0; var2 < 104; ++var2) { // L: 813 + for (var3 = 0; var3 < 104; ++var3) { // L: 814 + if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 815 + var0.setLinkBelow(var2, var3); + } + } + } + + var2 = 1; // L: 818 + var3 = 2; // L: 819 + var4 = 4; // L: 820 + + for (var5 = 0; var5 < 4; ++var5) { // L: 821 + if (var5 > 0) { // L: 822 + var2 <<= 3; // L: 823 + var3 <<= 3; // L: 824 + var4 <<= 3; // L: 825 + } + + for (int var47 = 0; var47 <= var5; ++var47) { // L: 827 + for (int var48 = 0; var48 <= 104; ++var48) { // L: 828 + for (int var49 = 0; var49 <= 104; ++var49) { // L: 829 + short var50; + if ((VerticalAlignment.field1993[var47][var49][var48] & var2) != 0) { // L: 830 + var9 = var48; // L: 831 + var10 = var48; // L: 832 + var11 = var47; // L: 833 + + for (var12 = var47; var9 > 0 && (VerticalAlignment.field1993[var47][var49][var9 - 1] & var2) != 0; --var9) { // L: 834 835 + } + + while (var10 < 104 && (VerticalAlignment.field1993[var47][var49][var10 + 1] & var2) != 0) { // L: 836 + ++var10; + } + + label422: + while (var11 > 0) { // L: 837 + for (var13 = var9; var13 <= var10; ++var13) { // L: 838 + if ((VerticalAlignment.field1993[var11 - 1][var49][var13] & var2) == 0) { + break label422; + } + } + + --var11; // L: 839 + } + + label411: + while (var12 < var5) { // L: 841 + for (var13 = var9; var13 <= var10; ++var13) { // L: 842 + if ((VerticalAlignment.field1993[var12 + 1][var49][var13] & var2) == 0) { + break label411; + } + } + + ++var12; // L: 843 + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 845 + if (var13 >= 8) { // L: 846 + var50 = 240; // L: 847 + var15 = Tiles.Tiles_heights[var12][var49][var9] - var50; // L: 848 + var16 = Tiles.Tiles_heights[var11][var49][var9]; // L: 849 + Scene.Scene_addOccluder(var5, 1, var49 * 128, var49 * 128, var9 * 128, var10 * 128 + 128, var15, var16); // L: 850 + + for (var17 = var11; var17 <= var12; ++var17) { // L: 851 + for (var18 = var9; var18 <= var10; ++var18) { // L: 852 + var10000 = VerticalAlignment.field1993[var17][var49]; + var10000[var18] &= ~var2; + } + } + } + } + + if ((VerticalAlignment.field1993[var47][var49][var48] & var3) != 0) { // L: 856 + var9 = var49; // L: 857 + var10 = var49; // L: 858 + var11 = var47; // L: 859 + + for (var12 = var47; var9 > 0 && (VerticalAlignment.field1993[var47][var9 - 1][var48] & var3) != 0; --var9) { // L: 860 861 + } + + while (var10 < 104 && (VerticalAlignment.field1993[var47][var10 + 1][var48] & var3) != 0) { // L: 862 + ++var10; + } + + label475: + while (var11 > 0) { // L: 863 + for (var13 = var9; var13 <= var10; ++var13) { // L: 864 + if ((VerticalAlignment.field1993[var11 - 1][var13][var48] & var3) == 0) { + break label475; + } + } + + --var11; // L: 865 + } + + label464: + while (var12 < var5) { // L: 867 + for (var13 = var9; var13 <= var10; ++var13) { // L: 868 + if ((VerticalAlignment.field1993[var12 + 1][var13][var48] & var3) == 0) { + break label464; + } + } + + ++var12; // L: 869 + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 871 + if (var13 >= 8) { // L: 872 + var50 = 240; // L: 873 + var15 = Tiles.Tiles_heights[var12][var9][var48] - var50; // L: 874 + var16 = Tiles.Tiles_heights[var11][var9][var48]; // L: 875 + Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var48 * 128, var48 * 128, var15, var16); // L: 876 + + for (var17 = var11; var17 <= var12; ++var17) { // L: 877 + for (var18 = var9; var18 <= var10; ++var18) { // L: 878 + var10000 = VerticalAlignment.field1993[var17][var18]; + var10000[var48] &= ~var3; + } + } + } + } + + if ((VerticalAlignment.field1993[var47][var49][var48] & var4) != 0) { // L: 882 + var9 = var49; // L: 883 + var10 = var49; // L: 884 + var11 = var48; // L: 885 + + for (var12 = var48; var11 > 0 && (VerticalAlignment.field1993[var47][var49][var11 - 1] & var4) != 0; --var11) { // L: 886 887 + } + + while (var12 < 104 && (VerticalAlignment.field1993[var47][var49][var12 + 1] & var4) != 0) { // L: 888 + ++var12; + } + + label528: + while (var9 > 0) { // L: 889 + for (var13 = var11; var13 <= var12; ++var13) { // L: 890 + if ((VerticalAlignment.field1993[var47][var9 - 1][var13] & var4) == 0) { + break label528; + } + } + + --var9; // L: 891 + } + + label517: + while (var10 < 104) { // L: 893 + for (var13 = var11; var13 <= var12; ++var13) { // L: 894 + if ((VerticalAlignment.field1993[var47][var10 + 1][var13] & var4) == 0) { + break label517; + } + } + + ++var10; // L: 895 + } + + if ((var12 - var11 + 1) * (var10 - var9 + 1) >= 4) { // L: 897 + var13 = Tiles.Tiles_heights[var47][var9][var11]; // L: 898 + Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); // L: 899 + + for (var14 = var9; var14 <= var10; ++var14) { // L: 900 + for (var15 = var11; var15 <= var12; ++var15) { // L: 901 + var10000 = VerticalAlignment.field1993[var47][var14]; + var10000[var15] &= ~var4; } } } @@ -684,5 +535,5 @@ public final class class268 { } } - } // L: 10695 + } // L: 909 } diff --git a/runescape-client/src/main/java/class269.java b/runescape-client/src/main/java/class269.java index 193a279275..e08fcb67e5 100644 --- a/runescape-client/src/main/java/class269.java +++ b/runescape-client/src/main/java/class269.java @@ -1,16 +1,16 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("jz") +@ObfuscatedName("jf") public final class class269 { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = 99828989158930681L + longValue = 1779677286756303947L ) - static long field3149; - @ObfuscatedName("c") + static long field3215; + @ObfuscatedName("q") @ObfuscatedGetter( - longValue = -6438905473157114757L + longValue = 189198080238779441L ) - static long field3147; + static long field3217; } diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java index cb86dec848..f499b70811 100644 --- a/runescape-client/src/main/java/class27.java +++ b/runescape-client/src/main/java/class27.java @@ -3,14 +3,14 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import netscape.javascript.JSObject; -@ObfuscatedName("aq") +@ObfuscatedName("ar") public class class27 { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)Ljava/lang/Object;", - garbageValue = "353327457" + garbageValue = "527172307" ) - public static Object method383(Applet var0, String var1) throws Throwable { + public static Object method370(Applet var0, String var1) throws Throwable { return JSObject.getWindow(var0).call(var1, (Object[])null); // L: 13 } } diff --git a/runescape-client/src/main/java/class270.java b/runescape-client/src/main/java/class270.java index 9fc4ea9376..19d45d0a56 100644 --- a/runescape-client/src/main/java/class270.java +++ b/runescape-client/src/main/java/class270.java @@ -1,44 +1,66 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jf") +@ObfuscatedName("jr") public class class270 { - @ObfuscatedName("v") + @ObfuscatedName("w") + public static boolean field3218; + + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", - garbageValue = "-20" + descriptor = "(I)V", + garbageValue = "2072054162" ) - public static String method5206(CharSequence var0) { - int var1 = var0.length(); // L: 11 - StringBuilder var2 = new StringBuilder(var1); // L: 12 + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; // L: 112 - 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 = class327.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 - } + try { + var0 = UserComparator3.getPreferencesFile("", ApproximateRouteStrategy.field473.name, true); // L: 114 + Buffer var1 = class12.clientPreferences.toBuffer(); // L: 115 + var0.write(var1.array, 0, var1.offset); // L: 116 + } catch (Exception var3) { // L: 118 } - return var2.toString(); // L: 28 + try { + if (var0 != null) { // L: 120 + var0.closeSync(true); // L: 121 + } + } catch (Exception var2) { // L: 124 + } + + } // L: 125 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(ILbb;ZI)I", + garbageValue = "416370156" + ) + static int method5036(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 1199 + if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1200 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.itemId; // L: 1201 + return 1; // L: 1202 + } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1204 + if (var3.itemId != -1) { // L: 1205 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1206 + } + + return 1; // L: 1207 + } else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1209 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1210 + return 1; // L: 1211 + } else if (var0 == 1707) { // L: 1213 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.method5498() ? 1 : 0; // L: 1214 + return 1; // L: 1215 + } else if (var0 == 1708) { // L: 1217 + return class293.method5430(var3); // L: 1218 + } else { + return var0 == 1708 ? class20.method269(var3) : 2; // L: 1220 1221 1223 + } } } diff --git a/runescape-client/src/main/java/class271.java b/runescape-client/src/main/java/class271.java index fa6caf22ec..967fea49d2 100644 --- a/runescape-client/src/main/java/class271.java +++ b/runescape-client/src/main/java/class271.java @@ -1,115 +1,76 @@ -import net.runelite.mapping.Export; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jw") +@ObfuscatedName("jo") public class class271 { - @ObfuscatedName("v") - static int[] field3155; - @ObfuscatedName("b") - @Export("SpriteBuffer_yOffsets") - public static int[] SpriteBuffer_yOffsets; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lly;" + @ObfuscatedName("tr") + @ObfuscatedGetter( + intValue = -2079311097 ) - @Export("NetCache_currentResponse") - public static NetFileRequest NetCache_currentResponse; + static int field3221; + @ObfuscatedName("o") + static int[] field3220; static { new Object(); - field3155 = new int[33]; // L: 8 - field3155[0] = 0; // L: 11 + field3220 = new int[33]; // L: 8 + field3220[0] = 0; // L: 11 int var0 = 2; // L: 12 for (int var1 = 1; var1 < 33; ++var1) { // L: 13 - field3155[var1] = var0 - 1; // L: 14 + field3220[var1] = var0 - 1; // L: 14 var0 += var0; // L: 15 } } // L: 17 - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(ILbd;ZB)I", - garbageValue = "27" + descriptor = "(Lfs;IIB)Lal;", + garbageValue = "-29" ) - static int method5220(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1410 - var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1411 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId; // L: 1412 - return 1; // L: 1413 - } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1415 - var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1416 - if (var3.itemId != -1) { // L: 1417 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1418 + public static final PcmPlayer method5045(TaskHandler var0, int var1, int var2) { + if (PcmPlayer.field300 == 0) { // L: 52 + throw new IllegalStateException(); + } else if (var1 >= 0 && var1 < 2) { // L: 53 + if (var2 < 256) { // L: 54 + var2 = 256; } - return 1; // L: 1419 - } else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1421 - int var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1422 - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); // L: 1423 - if (var4 != null) { // L: 1424 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1425 - } - - return 1; // L: 1426 - } else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1428 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1429 - return 1; // L: 1430 - } else if (var0 == 1707) { // L: 1432 - var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1433 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.method5690() ? 1 : 0; // L: 1434 - return 1; // L: 1435 - } else if (var0 == 1708) { // L: 1437 - var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1438 - return UserComparator9.method2617(var3); // L: 1439 - } else if (var0 == 1708) { // L: 1441 - var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1442 - return class305.method5782(var3); // L: 1443 - } else { - return 2; // L: 1445 - } - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "1452863306" - ) - static int method5221(int var0, Script var1, boolean var2) { - if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { // L: 4484 - if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { // L: 4489 - if (var0 == 6750) { // L: 4493 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 4494 - return 1; // L: 4495 - } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { // L: 4497 - if (var0 == 6754) { // L: 4501 - int var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4502 - NPCComposition var4 = KeyHandler.getNpcDefinition(var3); // L: 4503 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; // L: 4504 - return 1; // L: 4505 - } else { - return 2; // L: 4507 - } - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4498 - return 1; // L: 4499 + try { + PcmPlayer var3 = PcmPlayer.pcmPlayerProvider.player(); // L: 56 + var3.samples = new int[(ArchiveDiskAction.PcmPlayer_stereo ? 2 : 1) * 256]; // L: 57 + var3.field287 = var2; // L: 58 + var3.init(); // L: 59 + var3.capacity = (var2 & -1024) + 1024; // L: 60 + if (var3.capacity > 16384) { // L: 61 + var3.capacity = 16384; } - } else { - --Interpreter.Interpreter_intStackSize; // L: 4490 - return 1; // L: 4491 + + var3.open(var3.capacity); // L: 62 + if (class29.field172 > 0 && MusicPatchPcmStream.soundSystem == null) { // L: 63 + MusicPatchPcmStream.soundSystem = new SoundSystem(); // L: 64 + InterfaceParent.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 65 + InterfaceParent.soundSystemExecutor.scheduleAtFixedRate(MusicPatchPcmStream.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 66 + } + + if (MusicPatchPcmStream.soundSystem != null) { // L: 68 + if (MusicPatchPcmStream.soundSystem.players[var1] != null) { // L: 69 + throw new IllegalArgumentException(); + } + + MusicPatchPcmStream.soundSystem.players[var1] = var3; // L: 70 + } + + return var3; // L: 72 + } catch (Throwable var4) { // L: 74 + return new PcmPlayer(); // L: 75 } } else { - Interpreter.Interpreter_intStackSize -= 2; // L: 4485 - --class122.Interpreter_stringStackSize; // L: 4486 - return 1; // L: 4487 + throw new IllegalArgumentException(); } } } diff --git a/runescape-client/src/main/java/class273.java b/runescape-client/src/main/java/class273.java index ce64ff7971..221f0612dd 100644 --- a/runescape-client/src/main/java/class273.java +++ b/runescape-client/src/main/java/class273.java @@ -3,64 +3,62 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jj") +@ObfuscatedName("jk") public class class273 { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("musicPatchesArchive") public static AbstractArchive musicPatchesArchive; - @ObfuscatedName("c") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lln;" - ) - @Export("musicSamplesArchive") - public static AbstractArchive musicSamplesArchive; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Llp;" ) @Export("soundEffectsArchive") public static AbstractArchive soundEffectsArchive; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Ljw;" ) @Export("midiPcmStream") public static MidiPcmStream midiPcmStream; - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1398711083 + intValue = 1844825549 ) @Export("musicPlayerStatus") public static int musicPlayerStatus; - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Ljy;" ) - @Export("musicTrackArchive") - public static AbstractArchive musicTrackArchive; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -164167737 - ) - @Export("musicTrackFileId") - public static int musicTrackFileId; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -1426022031 - ) - @Export("musicTrackVolume") - public static int musicTrackVolume; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1631991279 - ) - @Export("pcmSampleLength") - public static int pcmSampleLength; + @Export("musicTrack") + public static MusicTrack musicTrack; static { musicPlayerStatus = 0; // L: 11 } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(ILki;IIIII[FB)Lki;", + garbageValue = "-124" + ) + static Widget method5077(int var0, Widget var1, int var2, int var3, int var4, int var5, int var6, float[] var7) { + Widget var8 = new Widget(); // L: 900 + var8.type = var0; // L: 901 + var8.parentId = var1.id; // L: 902 + var8.childIndex = var2; // L: 903 + var8.isIf3 = true; // L: 904 + var8.xAlignment = var3; // L: 905 + var8.yAlignment = var4; // L: 906 + var8.widthAlignment = var5; // L: 907 + var8.heightAlignment = var6; // L: 908 + var8.rawX = (int)(var7[0] * (float)var1.width); // L: 909 + var8.rawY = (int)(var7[1] * (float)var1.height); // L: 910 + var8.rawWidth = (int)((float)var1.width * var7[2]); // L: 911 + var8.rawHeight = (int)(var7[3] * (float)var1.height); // L: 912 + return var8; // L: 913 + } } diff --git a/runescape-client/src/main/java/class28.java b/runescape-client/src/main/java/class28.java index 55d3996f4d..30ada00b00 100644 --- a/runescape-client/src/main/java/class28.java +++ b/runescape-client/src/main/java/class28.java @@ -1,61 +1,87 @@ -import java.io.File; 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("aw") +@ObfuscatedName("am") public class class28 { - @ObfuscatedName("f") - @Export("JagexCache_locationFile") - static File JagexCache_locationFile; - @ObfuscatedName("ee") + @ObfuscatedName("ez") @ObfuscatedSignature( - descriptor = "Llx;" + descriptor = "Lnu;" ) - @Export("archive15") - static Archive archive15; + @Export("spriteIds") + static GraphicsDefaults spriteIds; + @ObfuscatedName("jy") + @ObfuscatedGetter( + intValue = -428607811 + ) + @Export("oculusOrbFocalPointY") + static int oculusOrbFocalPointY; static { ImageIO.setUseCache(false); // L: 12 } // L: 13 - @ObfuscatedName("hu") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1511751941" + descriptor = "(Llp;IS)Z", + garbageValue = "6502" ) - static final void method390() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7719 7720 7726 - if (var0.hitpoints == -1) { // L: 7721 - var0.delay = 0; // L: 7722 - class163.method3315(var0); // L: 7723 - } else { - var0.remove(); // L: 7725 + static boolean method374(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); // L: 172 + if (var2 == null) { // L: 173 + return false; + } else { + RouteStrategy.SpriteBuffer_decode(var2); // L: 174 + return true; // L: 175 + } + } + + @ObfuscatedName("lj") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZB)V", + garbageValue = "-55" + ) + @Export("findItemDefinitions") + static void findItemDefinitions(String var0, boolean var1) { + var0 = var0.toLowerCase(); // L: 12576 + short[] var2 = new short[16]; // L: 12577 + int var3 = 0; // L: 12578 + + for (int var4 = 0; var4 < ItemContainer.ItemDefinition_fileCount; ++var4) { // L: 12579 + ItemComposition var9 = FileSystem.ItemDefinition_get(var4); // L: 12580 + if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 12581 12582 12583 + if (var3 >= 250) { // L: 12584 + UserComparator9.foundItemIdCount = -1; // L: 12585 + class182.foundItemIds = null; // L: 12586 + return; // L: 12587 + } + + if (var3 >= var2.length) { // L: 12589 + short[] var6 = new short[var2.length * 2]; // L: 12590 + + for (int var7 = 0; var7 < var3; ++var7) { // L: 12591 + var6[var7] = var2[var7]; + } + + var2 = var6; // L: 12592 + } + + var2[var3++] = (short)var4; // L: 12594 } } - } // L: 7728 - - @ObfuscatedName("ig") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", - garbageValue = "157439460" - ) - @Export("insertMenuItem") - static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { - if (!Client.isMenuOpen) { // L: 9830 - if (Client.menuOptionsCount < 500) { // L: 9831 - Client.menuActions[Client.menuOptionsCount] = var0; // L: 9832 - Client.menuTargets[Client.menuOptionsCount] = var1; // L: 9833 - Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 9834 - Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 9835 - Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 9836 - Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 9837 - Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 9838 - ++Client.menuOptionsCount; // L: 9839 - } + class182.foundItemIds = var2; // L: 12596 + Coord.foundItemIndex = 0; // L: 12597 + UserComparator9.foundItemIdCount = var3; // L: 12598 + String[] var8 = new String[UserComparator9.foundItemIdCount]; // L: 12599 + for (int var5 = 0; var5 < UserComparator9.foundItemIdCount; ++var5) { // L: 12600 + var8[var5] = FileSystem.ItemDefinition_get(var2[var5]).name; } - } // L: 9841 + + short[] var10 = class182.foundItemIds; // L: 12601 + Occluder.sortItemsByName(var8, var10, 0, var8.length - 1); // L: 12603 + } // L: 12605 } diff --git a/runescape-client/src/main/java/class282.java b/runescape-client/src/main/java/class282.java index e0cabf3cee..c72202e7e3 100644 --- a/runescape-client/src/main/java/class282.java +++ b/runescape-client/src/main/java/class282.java @@ -1,96 +1,69 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jg") +@ObfuscatedName("jh") public class class282 { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Ljx;" ) @Export("huffman") - public static Huffman huffman; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - static AbstractArchive field3261; + static Huffman huffman; - @ObfuscatedName("v") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lpi;Ljava/lang/String;I)I", - garbageValue = "-825643804" + descriptor = "(CLlq;B)I", + garbageValue = "1" ) - public static int method5489(Buffer var0, String var1) { - int var2 = var0.offset; // L: 14 - int var4 = var1.length(); // L: 17 - byte[] var5 = new byte[var4]; // L: 18 - - for (int var6 = 0; var6 < var4; ++var6) { // L: 19 - char var7 = var1.charAt(var6); // L: 20 - if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 21 - var5[var6] = (byte)var7; - } else if (var7 == 8364) { // L: 22 - var5[var6] = -128; - } else if (var7 == 8218) { // L: 23 - var5[var6] = -126; - } else if (var7 == 402) { // L: 24 - var5[var6] = -125; - } else if (var7 == 8222) { // L: 25 - var5[var6] = -124; - } else if (var7 == 8230) { // L: 26 - var5[var6] = -123; - } else if (var7 == 8224) { // L: 27 - var5[var6] = -122; - } else if (var7 == 8225) { // L: 28 - var5[var6] = -121; - } else if (var7 == 710) { // L: 29 - var5[var6] = -120; - } else if (var7 == 8240) { // L: 30 - var5[var6] = -119; - } else if (var7 == 352) { // L: 31 - var5[var6] = -118; - } else if (var7 == 8249) { // L: 32 - var5[var6] = -117; - } else if (var7 == 338) { // L: 33 - var5[var6] = -116; - } else if (var7 == 381) { // L: 34 - var5[var6] = -114; - } else if (var7 == 8216) { // L: 35 - var5[var6] = -111; - } else if (var7 == 8217) { // L: 36 - var5[var6] = -110; - } else if (var7 == 8220) { // L: 37 - var5[var6] = -109; - } else if (var7 == 8221) { // L: 38 - var5[var6] = -108; - } else if (var7 == 8226) { // L: 39 - var5[var6] = -107; - } else if (var7 == 8211) { - var5[var6] = -106; // L: 40 - } else if (var7 == 8212) { // L: 41 - var5[var6] = -105; - } else if (var7 == 732) { // L: 42 - var5[var6] = -104; - } else if (var7 == 8482) { // L: 43 - var5[var6] = -103; - } else if (var7 == 353) { // L: 44 - var5[var6] = -102; - } else if (var7 == 8250) { // L: 45 - var5[var6] = -101; - } else if (var7 == 339) { // L: 46 - var5[var6] = -100; - } else if (var7 == 382) { // L: 47 - var5[var6] = -98; - } else if (var7 == 376) { // L: 48 - var5[var6] = -97; - } else { - var5[var6] = 63; // L: 49 - } + @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 } - var0.writeSmartByteShort(var5.length); // L: 54 - var0.offset += huffman.compress(var5, 0, var5.length, var0.array, var0.offset); // L: 55 - return var0.offset - var2; // L: 56 + if (var0 == 241 && var1 == Language.Language_ES) { // L: 109 + var2 = 1762; + } + + return var2; // L: 110 + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(ILbb;ZI)I", + garbageValue = "1978275561" + ) + static int method5334(int var0, Script var1, boolean var2) { + Widget var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1449 + if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1450 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = WorldMapSection1.Widget_unpackTargetMask(UrlRequester.getWidgetFlags(var3)); // L: 1451 + return 1; // L: 1452 + } else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1454 + if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1461 + if (var3.dataText == null) { // L: 1462 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1463 + } + + return 1; // L: 1464 + } else { + return 2; // L: 1466 + } + } else { + int var4 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1455 + --var4; // L: 1456 + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1457 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1458 + } else { + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; + } + + return 1; // L: 1459 + } } } diff --git a/runescape-client/src/main/java/class286.java b/runescape-client/src/main/java/class286.java index 64d349aa77..6e022fdad5 100644 --- a/runescape-client/src/main/java/class286.java +++ b/runescape-client/src/main/java/class286.java @@ -1,11 +1,5 @@ -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kn") +@ObfuscatedName("kf") public class class286 { - @ObfuscatedName("sj") - @ObfuscatedGetter( - intValue = -604088997 - ) - static int field3274; } diff --git a/runescape-client/src/main/java/class29.java b/runescape-client/src/main/java/class29.java index df16fcce1f..f3dbf78609 100644 --- a/runescape-client/src/main/java/class29.java +++ b/runescape-client/src/main/java/class29.java @@ -4,168 +4,43 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("am") +@ObfuscatedName("ac") public class class29 { - @ObfuscatedName("v") - static Applet field176; - @ObfuscatedName("c") - static String field175; - @ObfuscatedName("ha") + @ObfuscatedName("o") + static Applet field170; + @ObfuscatedName("q") + static String field168; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1188608561 + intValue = -1437756653 ) - static int field181; - @ObfuscatedName("ij") + static int field172; + @ObfuscatedName("ie") @ObfuscatedSignature( - descriptor = "[Lqq;" + descriptor = "[Lqd;" ) - @Export("scrollBarSprites") - static IndexedSprite[] scrollBarSprites; + @Export("mapSceneSprites") + static IndexedSprite[] mapSceneSprites; static { - field176 = null; // L: 10 - field175 = ""; // L: 11 + field170 = null; // L: 10 + field168 = ""; // L: 11 } - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IILgt;Lgv;B)Z", - garbageValue = "0" - ) - public static final boolean method404(int var0, int var1, RouteStrategy var2, CollisionMap var3) { - int var4 = var0; // L: 19 - int var5 = var1; // L: 20 - byte var6 = 64; // L: 21 - byte var7 = 64; // L: 22 - int var8 = var0 - var6; // L: 23 - int var9 = var1 - var7; // L: 24 - class194.directions[var6][var7] = 99; // L: 25 - class194.distances[var6][var7] = 0; // L: 26 - byte var10 = 0; // L: 27 - int var11 = 0; // L: 28 - class194.bufferX[var10] = var0; // L: 29 - byte var10001 = var10; - int var18 = var10 + 1; - class194.bufferY[var10001] = var1; // L: 30 - int[][] var12 = var3.flags; // L: 31 - - while (var18 != var11) { // L: 34 - var4 = class194.bufferX[var11]; // L: 35 - var5 = class194.bufferY[var11]; // L: 36 - var11 = var11 + 1 & 4095; // L: 37 - int var16 = var4 - var8; // L: 38 - int var17 = var5 - var9; // L: 39 - int var13 = var4 - var3.xInset; // L: 40 - int var14 = var5 - var3.yInset; // L: 41 - if (var2.hasArrived(1, var4, var5, var3)) { // L: 42 - HealthBarUpdate.field1189 = var4; // L: 43 - StructComposition.field1988 = var5; // L: 44 - return true; // L: 45 - } - - int var15 = class194.distances[var16][var17] + 1; // L: 47 - if (var16 > 0 && class194.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) { // L: 48 - class194.bufferX[var18] = var4 - 1; // L: 49 - class194.bufferY[var18] = var5; // L: 50 - var18 = var18 + 1 & 4095; // L: 51 - class194.directions[var16 - 1][var17] = 2; // L: 52 - class194.distances[var16 - 1][var17] = var15; // L: 53 - } - - if (var16 < 127 && class194.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) { // L: 55 - class194.bufferX[var18] = var4 + 1; // L: 56 - class194.bufferY[var18] = var5; // L: 57 - var18 = var18 + 1 & 4095; // L: 58 - class194.directions[var16 + 1][var17] = 8; // L: 59 - class194.distances[var16 + 1][var17] = var15; // L: 60 - } - - if (var17 > 0 && class194.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { // L: 62 - class194.bufferX[var18] = var4; // L: 63 - class194.bufferY[var18] = var5 - 1; // L: 64 - var18 = var18 + 1 & 4095; // L: 65 - class194.directions[var16][var17 - 1] = 1; // L: 66 - class194.distances[var16][var17 - 1] = var15; // L: 67 - } - - if (var17 < 127 && class194.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { // L: 69 - class194.bufferX[var18] = var4; // L: 70 - class194.bufferY[var18] = var5 + 1; // L: 71 - var18 = var18 + 1 & 4095; // L: 72 - class194.directions[var16][var17 + 1] = 4; // L: 73 - class194.distances[var16][var17 + 1] = var15; // L: 74 - } - - if (var16 > 0 && var17 > 0 && class194.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: 76 - class194.bufferX[var18] = var4 - 1; // L: 77 - class194.bufferY[var18] = var5 - 1; // L: 78 - var18 = var18 + 1 & 4095; // L: 79 - class194.directions[var16 - 1][var17 - 1] = 3; // L: 80 - class194.distances[var16 - 1][var17 - 1] = var15; // L: 81 - } - - if (var16 < 127 && var17 > 0 && class194.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: 83 - class194.bufferX[var18] = var4 + 1; // L: 84 - class194.bufferY[var18] = var5 - 1; // L: 85 - var18 = var18 + 1 & 4095; // L: 86 - class194.directions[var16 + 1][var17 - 1] = 9; // L: 87 - class194.distances[var16 + 1][var17 - 1] = var15; // L: 88 - } - - if (var16 > 0 && var17 < 127 && class194.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: 90 - class194.bufferX[var18] = var4 - 1; // L: 91 - class194.bufferY[var18] = var5 + 1; // L: 92 - var18 = var18 + 1 & 4095; // L: 93 - class194.directions[var16 - 1][var17 + 1] = 6; // L: 94 - class194.distances[var16 - 1][var17 + 1] = var15; // L: 95 - } - - if (var16 < 127 && var17 < 127 && class194.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: 97 - class194.bufferX[var18] = var4 + 1; // L: 98 - class194.bufferY[var18] = var5 + 1; // L: 99 - var18 = var18 + 1 & 4095; // L: 100 - class194.directions[var16 + 1][var17 + 1] = 12; // L: 101 - class194.distances[var16 + 1][var17 + 1] = var15; // L: 102 - } - } - - HealthBarUpdate.field1189 = var4; // L: 105 - StructComposition.field1988 = var5; // L: 106 - return false; // L: 107 - } - - @ObfuscatedName("kk") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "28" + garbageValue = "11" ) - @Export("Widget_resetModelFrames") - static final void Widget_resetModelFrames(int var0) { - if (class155.loadInterface(var0)) { // L: 11925 - Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 11926 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11927 - Widget var3 = var1[var2]; // L: 11928 - if (var3 != null) { // L: 11929 - var3.modelFrame = 0; // L: 11930 - var3.modelFrameCycle = 0; // L: 11931 - } + @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 } } - } // L: 11933 - - @ObfuscatedName("lc") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1249255220" - ) - static void method403(int var0) { - for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { // L: 12449 - if ((long)var0 == (var1.key >> 48 & 65535L)) { // L: 12450 - var1.remove(); // L: 12451 - } - } - - } // L: 12454 + } // L: 69 } diff --git a/runescape-client/src/main/java/class290.java b/runescape-client/src/main/java/class290.java index b5d0a5ea44..d6d05360f8 100644 --- a/runescape-client/src/main/java/class290.java +++ b/runescape-client/src/main/java/class290.java @@ -1,47 +1,44 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("kj") +@ObfuscatedName("kh") public class class290 { - @ObfuscatedName("b") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Float;Ljava/lang/Float;B)V", - garbageValue = "-14" + descriptor = "(III)I", + garbageValue = "1384321322" ) - static void method5558(Float var0, Float var1) { - var1 = 1.0F - var1; // L: 311 - if (var0 < 0.0F) { // L: 312 - var0 = 0.0F; + @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 { + return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; // L: 23 24 } + } - if (var1 < 0.0F) { // L: 313 - var1 = 0.0F; - } - - if (var0 > 1.0F || var1 > 1.0F) { // L: 314 - float var2 = (float)((double)(var0 * (var0 - 2.0F + var1)) + (double)var1 * ((double)var1 - 2.0D) + 1.0D); // L: 315 - if (class114.field1382 + var2 > 0.0F) { // L: 316 - Float var4; - if (var0 + class114.field1382 < 1.3333334F) { // L: 320 - float var5 = var0 - 2.0F; // L: 321 - float var6 = var0 - 1.0F; // L: 322 - float var7 = (float)Math.sqrt((double)(var5 * var5 - var6 * 4.0F * var6)); // L: 323 - float var8 = (var7 + -var5) * 0.5F; // L: 324 - if (var1 + class114.field1382 > var8) { // L: 325 - var4 = var8 - class114.field1382; // L: 326 - } else { - var8 = (-var5 - var7) * 0.5F; // L: 329 - if (var1 < var8 + class114.field1382) { // L: 330 - var4 = var8 + class114.field1382; // L: 331 - } - } - } else { - Float var3 = 1.3333334F - class114.field1382; // L: 336 - var4 = 0.33333334F - class114.field1382; // L: 337 - } + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(ILbb;ZI)I", + garbageValue = "-1624974891" + ) + static int method5389(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.LOGOUT) { // L: 3821 + Client.logoutTimer = 250; // L: 3822 + return 1; // L: 3823 + } else if (var0 != 5631 && var0 != 5633) { // L: 3825 + if (var0 == 5632) { // L: 3829 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 26; // L: 3830 + return 1; // L: 3831 + } else { + return 2; // L: 3833 } + } else { + class9.Interpreter_stringStackSize -= 2; // L: 3826 + return 1; // L: 3827 } - - var1 = 1.0F - var1; // L: 342 - } // L: 343 + } } diff --git a/runescape-client/src/main/java/class291.java b/runescape-client/src/main/java/class291.java index 154394822d..2dc99bcc0d 100644 --- a/runescape-client/src/main/java/class291.java +++ b/runescape-client/src/main/java/class291.java @@ -4,167 +4,96 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kf") +@ObfuscatedName("kk") public class class291 { - @ObfuscatedName("et") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Llx;" + descriptor = "Lcb;" ) - @Export("archive14") - static Archive archive14; - @ObfuscatedName("v") + UrlRequest field3356; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lcw;" + descriptor = "Lqr;" ) - UrlRequest field3295; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lqi;" - ) - SpritePixels field3293; + SpritePixels field3357; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lck;)V" + descriptor = "(Ljava/lang/String;Lce;)V" ) class291(String var1, UrlRequester var2) { try { - this.field3295 = var2.request(new URL(var1)); // L: 16 - } catch (MalformedURLException var4) { // L: 18 - this.field3295 = null; // L: 19 + this.field3356 = var2.request(new URL(var1)); // L: 16 + } catch (MalformedURLException var4) { + this.field3356 = null; } - } // L: 21 + } @ObfuscatedSignature( - descriptor = "(Lcw;)V" + descriptor = "(Lcb;)V" ) class291(UrlRequest var1) { - this.field3295 = var1; // L: 24 - } // L: 25 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)Lqi;", - garbageValue = "-159877432" - ) - SpritePixels method5563() { - if (this.field3293 == null && this.field3295 != null && this.field3295.isDone()) { // L: 28 - if (this.field3295.getResponse() != null) { // L: 29 - this.field3293 = Interpreter.method1889(this.field3295.getResponse()); // L: 30 - } - - this.field3295 = null; // L: 32 - } - - return this.field3293; // L: 34 + this.field3356 = var1; // L: 24 } - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(CLlo;B)C", - garbageValue = "20" + descriptor = "(I)Lqr;", + garbageValue = "1905006321" ) - @Export("standardizeChar") - static char standardizeChar(char var0, Language var1) { - if (var0 >= 192 && var0 <= 255) { // L: 117 - if (var0 >= 192 && var0 <= 198) { // L: 118 - return 'A'; + SpritePixels method5391() { + if (this.field3357 == null && this.field3356 != null && this.field3356.isDone()) { // L: 28 + if (this.field3356.getResponse() != null) { // L: 29 + this.field3357 = Frames.method4217(this.field3356.getResponse()); // L: 30 } - if (var0 == 199) { // L: 119 - return 'C'; - } + this.field3356 = null; // L: 32 + } - if (var0 >= 200 && var0 <= 203) { // L: 120 - return 'E'; - } + return this.field3357; // L: 34 + } - if (var0 >= 204 && var0 <= 207) { // L: 121 - return 'I'; - } + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "([Llk;II)Llk;", + garbageValue = "-1552191752" + ) + @Export("findEnumerated") + public static MouseWheel findEnumerated(MouseWheel[] var0, int var1) { + MouseWheel[] var2 = var0; // L: 17 - if (var0 == 209 && var1 != Language.Language_ES) { // L: 122 - return 'N'; - } - - if (var0 >= 210 && var0 <= 214) { // L: 123 - return 'O'; - } - - if (var0 >= 217 && var0 <= 220) { // L: 124 - return 'U'; - } - - if (var0 == 221) { // L: 125 - return 'Y'; - } - - if (var0 == 223) { // L: 126 - return 's'; - } - - if (var0 >= 224 && var0 <= 230) { // L: 127 - return 'a'; - } - - if (var0 == 231) { // L: 128 - return 'c'; - } - - if (var0 >= 232 && var0 <= 235) { // L: 129 - return 'e'; - } - - if (var0 >= 236 && var0 <= 239) { // L: 130 - return 'i'; - } - - if (var0 == 241 && var1 != Language.Language_ES) { // L: 131 - return 'n'; - } - - if (var0 >= 242 && var0 <= 246) { // L: 132 - return 'o'; - } - - if (var0 >= 249 && var0 <= 252) { // L: 133 - return 'u'; - } - - if (var0 == 253 || var0 == 255) { // L: 134 - return 'y'; + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18 + MouseWheel var4 = var2[var3]; // L: 19 + if (var1 == var4.rsOrdinal()) { + return var4; // L: 21 } } - if (var0 == 338) { // L: 136 - return 'O'; - } else if (var0 == 339) { // L: 137 - return 'o'; - } else if (var0 == 376) { // L: 138 - return 'Y'; - } else { - return var0; // L: 139 + return null; // L: 25 + } + + @ObfuscatedName("kl") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "16" + ) + static final void method5390(int var0) { + var0 = Math.min(Math.max(var0, 0), 255); // L: 12054 + if (var0 != class12.clientPreferences.method2248()) { // L: 12055 + if (class12.clientPreferences.method2248() == 0 && Client.currentTrackGroupId != -1) { // L: 12056 + UserComparator8.method2574(AbstractUserComparator.archive6, Client.currentTrackGroupId, 0, var0, false); // L: 12057 + Client.playingJingle = false; // L: 12058 + } else if (var0 == 0) { // L: 12060 + ApproximateRouteStrategy.method1110(); // L: 12061 + Client.playingJingle = false; // L: 12062 + } else if (class273.musicPlayerStatus != 0) { // L: 12065 + Clock.musicTrackVolume = var0; + } else { + class273.midiPcmStream.setPcmStreamVolume(var0); // L: 12066 + } + + class12.clientPreferences.method2234(var0); // L: 12068 } - } - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(IIS)Lbe;", - garbageValue = "-15672" - ) - @Export("Messages_getByChannelAndID") - 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("f") - @ObfuscatedSignature( - descriptor = "(I)[Lqe;", - garbageValue = "-868128197" - ) - @Export("FillMode_values") - public static FillMode[] FillMode_values() { - return new FillMode[]{FillMode.field4694, FillMode.field4695, FillMode.SOLID}; // L: 15 - } + } // L: 12070 } diff --git a/runescape-client/src/main/java/class293.java b/runescape-client/src/main/java/class293.java index 93b5a07614..11541c32f4 100644 --- a/runescape-client/src/main/java/class293.java +++ b/runescape-client/src/main/java/class293.java @@ -1,70 +1,74 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kk") +@ObfuscatedName("kl") public class class293 { - @ObfuscatedName("v") - public static final short[] field3308; - @ObfuscatedName("c") - public static final short[][] field3309; - @ObfuscatedName("i") - public static final short[] field3310; - @ObfuscatedName("f") - public static final short[][] field3312; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 763909349 - ) - @Export("ItemDefinition_fileCount") - public static int ItemDefinition_fileCount; @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lcw;" - ) - @Export("World_request") - static UrlRequest World_request; + public static final short[] field3375; + @ObfuscatedName("q") + public static final short[][] field3371; + @ObfuscatedName("l") + public static final short[] field3376; + @ObfuscatedName("k") + public static final short[][] field3374; static { - field3308 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4 - field3309 = 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 - field3310 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12 - field3312 = 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 + field3375 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4 + field3371 = 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 + field3376 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12 + field3374 = 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("b") - @ObfuscatedSignature( - descriptor = "(BB)C", - garbageValue = "105" - ) - public static char method5600(byte var0) { - int var1 = var0 & 255; // L: 84 - if (var1 == 0) { // L: 85 - throw new IllegalArgumentException("" + Integer.toString(var1, 16)); - } else { - if (var1 >= 128 && var1 < 160) { // L: 86 - char var2 = class345.cp1252AsciiExtension[var1 - 128]; // L: 87 - if (var2 == 0) { // L: 88 - var2 = '?'; + @ObfuscatedName("q") + public static String method5431(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { // L: 31 + if (var0 % 37L == 0L) { // L: 32 + return null; + } else { + int var2 = 0; // L: 33 + + for (long var3 = var0; var3 != 0L; var3 /= 37L) { // L: 34 35 37 + ++var2; // L: 36 } - var1 = var2; // L: 89 - } + StringBuilder var5 = new StringBuilder(var2); // L: 39 - return (char)var1; // L: 91 + while (var0 != 0L) { // L: 40 + long var6 = var0; // L: 41 + var0 /= 37L; // L: 42 + var5.append(class345.base37Table[(int)(var6 - 37L * var0)]); // L: 43 + } + + return var5.reverse().toString(); // L: 45 + } + } else { + return null; } } @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-102" + descriptor = "(I)I", + garbageValue = "1650429787" ) - static final int method5599(int var0, int var1) { - int var2 = class12.method117(var0 - 1, var1 - 1) + class12.method117(var0 + 1, var1 - 1) + class12.method117(var0 - 1, 1 + var1) + class12.method117(1 + var0, 1 + var1); // L: 920 - int var3 = class12.method117(var0 - 1, var1) + class12.method117(1 + var0, var1) + class12.method117(var0, var1 - 1) + class12.method117(var0, var1 + 1); // L: 921 - int var4 = class12.method117(var0, var1); // L: 922 - return var2 / 16 + var3 / 8 + var4 / 4; // L: 923 + public static int method5429() { + return ++MouseHandler.MouseHandler_idleCycles - 1; // L: 64 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Lki;I)I", + garbageValue = "619797497" + ) + static int method5430(Widget var0) { + if (var0.type != 11) { // L: 1227 + --class9.Interpreter_stringStackSize; // L: 1228 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 1229 + return 1; // L: 1230 + } else { + String var1 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1232 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var0.method5455(var1); // L: 1233 + return 1; // L: 1234 + } } } diff --git a/runescape-client/src/main/java/class295.java b/runescape-client/src/main/java/class295.java index d507f92903..3954816ec6 100644 --- a/runescape-client/src/main/java/class295.java +++ b/runescape-client/src/main/java/class295.java @@ -1,32 +1,29 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kc") +@ObfuscatedName("kv") public class class295 { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)[Lfg;", - garbageValue = "1171437373" + @ObfuscatedName("jm") + @ObfuscatedGetter( + intValue = 595148927 ) - static VerticalAlignment[] method5745() { - return new VerticalAlignment[]{VerticalAlignment.field1932, VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1935}; // L: 14 + @Export("cameraY") + static int cameraY; + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(II)Ldt;", + garbageValue = "1680740460" + ) + static class123 method5560(int var0) { + class123[] var1 = new class123[]{class123.field1550, class123.field1545, class123.field1540, class123.field1542, class123.field1543, class123.field1539, class123.field1541, class123.field1546, class123.field1547}; // L: 118 + class123 var2 = (class123)class291.findEnumerated(var1, var0); // L: 120 + if (var2 == null) { // L: 121 + var2 = class123.field1547; + } + + return var2; // L: 122 } - - @ObfuscatedName("lg") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "176339284" - ) - static final void method5732() { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 12343 - Player var1 = Client.players[Players.Players_indices[var0]]; // L: 12344 - var1.clearIsFriend(); // L: 12345 - } - - ObjectComposition.method3674(); // L: 12347 - if (ClientPacket.friendsChat != null) { // L: 12348 - ClientPacket.friendsChat.clearFriends(); // L: 12349 - } - - } // L: 12351 } diff --git a/runescape-client/src/main/java/class296.java b/runescape-client/src/main/java/class296.java index 81b3409987..d4e73fd466 100644 --- a/runescape-client/src/main/java/class296.java +++ b/runescape-client/src/main/java/class296.java @@ -2,106 +2,52 @@ 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("kw") +@ObfuscatedName("ks") public enum class296 implements MouseWheel { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkw;" + descriptor = "Lks;" ) - field3493(0), - @ObfuscatedName("c") + field3550(0), + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lkw;" + descriptor = "Lks;" ) - field3491(1), - @ObfuscatedName("i") + field3554(1), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lkw;" + descriptor = "Lks;" ) - field3490(2), - @ObfuscatedName("f") + field3551(2), + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lkw;" + descriptor = "Lks;" ) - field3492(3), - @ObfuscatedName("b") + field3552(3), + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lkw;" + descriptor = "Lks;" ) - field3494(4); + field3553(4); - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lqq;" - ) - static IndexedSprite field3496; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1277728875 + intValue = 228576199 ) - final int field3495; + final int field3549; class296(int var3) { - this.field3495 = var3; // L: 14 + this.field3549 = var3; // L: 14 } // L: 15 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field3495; // L: 18 + return this.field3549; // L: 19 } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "1938318651" - ) - static int method5749(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1101 - if (var0 == ScriptOpcodes.CC_GETX) { // L: 1102 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; // L: 1103 - return 1; // L: 1104 - } else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1106 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; // L: 1107 - return 1; // L: 1108 - } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1110 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; // L: 1111 - return 1; // L: 1112 - } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1114 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; // L: 1115 - return 1; // L: 1116 - } else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1118 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1119 - return 1; // L: 1120 - } else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1122 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; // L: 1123 - return 1; // L: 1124 - } else { - return 2; // L: 1126 - } - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(Laf;I)V", - garbageValue = "1364149382" - ) - @Export("PcmStream_disable") - static final void PcmStream_disable(PcmStream var0) { - var0.active = false; // L: 266 - if (var0.sound != null) { // L: 267 - var0.sound.position = 0; - } - - for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { - PcmStream_disable(var1); // L: 268 - } - - } // L: 269 } diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index e3c43f26ec..727e22c135 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -1,11 +1,11 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("f") +@ObfuscatedName("k") public interface class3 { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;)Lpi;" + descriptor = "(Lpx;)Lpx;" ) - Buffer vmethod12(Buffer var1); + Buffer vmethod19(Buffer var1); } diff --git a/runescape-client/src/main/java/class300.java b/runescape-client/src/main/java/class300.java index ecf9c1f1f5..b6e2ce347f 100644 --- a/runescape-client/src/main/java/class300.java +++ b/runescape-client/src/main/java/class300.java @@ -2,15 +2,12 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ku") +@ObfuscatedName("kc") public final class class300 { - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Z", - garbageValue = "1395576392" + descriptor = "Lpx;" ) - @Export("isNumber") - public static boolean isNumber(CharSequence var0) { - return TextureProvider.method4963(var0, 10, true); // L: 34 - } + @Export("NetCache_reference") + public static Buffer NetCache_reference; } diff --git a/runescape-client/src/main/java/class301.java b/runescape-client/src/main/java/class301.java index c73be01157..584e6dc000 100644 --- a/runescape-client/src/main/java/class301.java +++ b/runescape-client/src/main/java/class301.java @@ -2,34 +2,555 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kx") +@ObfuscatedName("kr") public class class301 { - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - static GameBuild field3545; - static { Math.sqrt(8192.0D); // L: 9 } // L: 10 + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IB)Lbb;", + garbageValue = "1" + ) + @Export("getScript") + static Script getScript(int var0) { + Script var1 = (Script)Script.Script_cached.get((long)var0); // L: 26 + if (var1 != null) { // L: 27 + return var1; + } else { + byte[] var2 = class115.archive12.takeFile(var0, 0); // L: 28 + if (var2 == null) { // L: 29 + return null; // L: 30 + } else { + var1 = PcmPlayer.newScript(var2); // L: 32 + Script.Script_cached.put(var1, (long)var0); // L: 33 + return var1; // L: 34 + } + } + } + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1793224392" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "2143337015" ) - @Export("addChatMessage") - 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 + static final String method5583(int var0) { + if (var0 < 100000) { // L: 425 + return "" + var0 + ""; + } else { + return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; // L: 426 427 + } + } + + @ObfuscatedName("gh") + @ObfuscatedSignature( + descriptor = "(Lcx;II)V", + garbageValue = "-1751178883" + ) + @Export("updateActorSequence") + static final void updateActorSequence(Actor var0, int var1) { + int var2; + int var3; + int var4; + if (var0.field1191 >= Client.cycle) { // L: 3994 + var2 = Math.max(1, var0.field1191 - Client.cycle); // L: 3995 + var3 = var0.field1167 * 64 + var0.field1187 * 128; // L: 3996 + var4 = var0.field1167 * 64 + var0.field1189 * 128; // L: 3997 + var0.x += (var3 - var0.x) / var2; // L: 3998 + var0.y += (var4 - var0.y) / var2; // L: 3999 + var0.field1194 = 0; // L: 4000 + var0.orientation = var0.field1139; // L: 4001 + } else if (var0.field1192 >= Client.cycle) { // L: 4003 + if (var0.field1192 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > class114.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 4004 + var2 = var0.field1192 - var0.field1191; // L: 4005 + var3 = Client.cycle - var0.field1191; // L: 4006 + var4 = var0.field1167 * 64 + var0.field1187 * 128; // L: 4007 + int var5 = var0.field1167 * 64 + var0.field1189 * 128; // L: 4008 + int var6 = var0.field1167 * 64 + var0.field1188 * 128; // L: 4009 + int var7 = var0.field1167 * 64 + var0.field1190 * 128; // L: 4010 + var0.x = (var6 * var3 + var4 * (var2 - var3)) / var2; // L: 4011 + var0.y = (var7 * var3 + var5 * (var2 - var3)) / var2; // L: 4012 + } + + var0.field1194 = 0; // L: 4014 + var0.orientation = var0.field1139; // L: 4015 + var0.rotation = var0.orientation; // L: 4016 + } else { + class115.method2680(var0); // L: 4018 } - 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; // L: 31 - } // L: 32 + if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 4019 + var0.sequence = -1; // L: 4020 + var0.spotAnimation = -1; // L: 4021 + var0.field1191 = 0; // L: 4022 + var0.field1192 = 0; // L: 4023 + var0.x = var0.field1167 * 64 + var0.pathX[0] * 128; // L: 4024 + var0.y = var0.pathY[0] * 128 + var0.field1167 * 64; // L: 4025 + var0.method2180(); // L: 4026 + } + + if (ModelData0.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 4028 4029 + var0.sequence = -1; // L: 4030 + var0.spotAnimation = -1; // L: 4031 + var0.field1191 = 0; // L: 4032 + var0.field1192 = 0; // L: 4033 + var0.x = var0.field1167 * 64 + var0.pathX[0] * 128; // L: 4034 + var0.y = var0.pathY[0] * 128 + var0.field1167 * 64; // L: 4035 + var0.method2180(); // L: 4036 + } + + if (var0.field1204 != 0) { // L: 4040 + if (var0.targetIndex != -1) { // L: 4041 + Object var8 = null; // L: 4042 + if (var0.targetIndex < 32768) { // L: 4043 + var8 = Client.npcs[var0.targetIndex]; + } else if (var0.targetIndex >= 32768) { // L: 4044 + var8 = Client.players[var0.targetIndex - 32768]; + } + + if (var8 != null) { // L: 4045 + var3 = var0.x - ((Actor)var8).x; // L: 4046 + var4 = var0.y - ((Actor)var8).y; // L: 4047 + if (var3 != 0 || var4 != 0) { // L: 4048 + var0.orientation = (int)(Math.atan2((double)var3, (double)var4) * 325.949D) & 2047; + } + } else if (var0.false0) { // L: 4050 + var0.targetIndex = -1; // L: 4051 + var0.false0 = false; // L: 4052 + } + } + + if (var0.field1172 != -1 && (var0.pathLength == 0 || var0.field1194 > 0)) { // L: 4055 + var0.orientation = var0.field1172; // L: 4056 + var0.field1172 = -1; // L: 4057 + } + + var2 = var0.orientation - var0.rotation & 2047; // L: 4059 + if (var2 == 0 && var0.false0) { // L: 4060 + var0.targetIndex = -1; // L: 4061 + var0.false0 = false; // L: 4062 + } + + if (var2 != 0) { // L: 4064 + ++var0.field1203; // L: 4065 + boolean var10; + if (var2 > 1024) { // L: 4066 + var0.rotation -= var0.field1173 ? var2 : var0.field1204 * 1818380337 * -1019211567; // L: 4067 + var10 = true; // L: 4068 + if (var2 < var0.field1204 || var2 > 2048 - var0.field1204) { // L: 4069 + var0.rotation = var0.orientation; // L: 4070 + var10 = false; // L: 4071 + } + + if (!var0.field1173 && var0.movementSequence == var0.idleSequence && (var0.field1203 > 25 || var10)) { // L: 4073 + if (var0.turnLeftSequence != -1) { // L: 4074 + var0.movementSequence = var0.turnLeftSequence; + } else { + var0.movementSequence = var0.walkSequence; // L: 4075 + } + } + } else { + var0.rotation += var0.field1173 ? var2 : 1818380337 * var0.field1204 * -1019211567; // L: 4079 + var10 = true; // L: 4080 + if (var2 < var0.field1204 || var2 > 2048 - var0.field1204) { // L: 4081 + var0.rotation = var0.orientation; // L: 4082 + var10 = false; // L: 4083 + } + + if (!var0.field1173 && var0.idleSequence == var0.movementSequence && (var0.field1203 > 25 || var10)) { // L: 4085 + if (var0.turnRightSequence != -1) { // L: 4086 + var0.movementSequence = var0.turnRightSequence; + } else { + var0.movementSequence = var0.walkSequence; // L: 4087 + } + } + } + + var0.rotation &= 2047; // L: 4091 + var0.field1173 = false; // L: 4092 + } else { + var0.field1203 = 0; // L: 4094 + } + } + + var0.isWalking = false; // L: 4097 + SequenceDefinition var11; + if (var0.movementSequence != -1) { // L: 4098 + var11 = class114.SequenceDefinition_get(var0.movementSequence); // L: 4099 + if (var11 != null) { // L: 4100 + if (!var11.isCachedModelIdSet() && var11.frameIds != null) { // L: 4101 + ++var0.movementFrameCycle; // L: 4102 + if (var0.movementFrame < var11.frameIds.length && var0.movementFrameCycle > var11.frameLengths[var0.movementFrame]) { // L: 4103 + var0.movementFrameCycle = 1; // L: 4104 + ++var0.movementFrame; // L: 4105 + class16.method182(var11, var0.movementFrame, var0.x, var0.y); // L: 4106 + } + + if (var0.movementFrame >= var11.frameIds.length) { // L: 4108 + var0.movementFrameCycle = 0; // L: 4109 + var0.movementFrame = 0; // L: 4110 + class16.method182(var11, var0.movementFrame, var0.x, var0.y); // L: 4111 + } + } else if (var11.isCachedModelIdSet()) { // L: 4114 + ++var0.movementFrame; // L: 4115 + var3 = var11.method3729(); // L: 4116 + if (var0.movementFrame < var3) { // L: 4117 + TileItem.method2407(var11, var0.movementFrame, var0.x, var0.y); // L: 4118 + } else { + var0.movementFrameCycle = 0; // L: 4121 + var0.movementFrame = 0; // L: 4122 + TileItem.method2407(var11, var0.movementFrame, var0.x, var0.y); // L: 4123 + } + } else { + var0.movementSequence = -1; // L: 4126 + } + } else { + var0.movementSequence = -1; // L: 4128 + } + } + + if (var0.spotAnimation != -1 && Client.cycle >= var0.field1185) { // L: 4130 + if (var0.spotAnimationFrame < 0) { // L: 4131 + var0.spotAnimationFrame = 0; + } + + var2 = class136.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 4132 + if (var2 != -1) { // L: 4133 + SequenceDefinition var9 = class114.SequenceDefinition_get(var2); // L: 4134 + if (var9 != null && var9.frameIds != null) { // L: 4135 + ++var0.spotAnimationFrameCycle; // L: 4136 + if (var0.spotAnimationFrame < var9.frameIds.length && var0.spotAnimationFrameCycle > var9.frameLengths[var0.spotAnimationFrame]) { // L: 4137 + var0.spotAnimationFrameCycle = 1; // L: 4138 + ++var0.spotAnimationFrame; // L: 4139 + class16.method182(var9, var0.spotAnimationFrame, var0.x, var0.y); // L: 4140 + } + + if (var0.spotAnimationFrame >= var9.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var9.frameIds.length)) { // L: 4142 4143 + var0.spotAnimation = -1; + } + } else if (var9.isCachedModelIdSet()) { // L: 4146 + ++var0.spotAnimationFrame; // L: 4147 + var4 = var9.method3729(); // L: 4148 + if (var0.spotAnimationFrame < var4) { // L: 4149 + TileItem.method2407(var9, var0.spotAnimationFrame, var0.x, var0.y); // L: 4150 + } else if (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var4) { // L: 4153 + var0.spotAnimation = -1; + } + } else { + var0.spotAnimation = -1; // L: 4156 + } + } else { + var0.spotAnimation = -1; // L: 4158 + } + } + + if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 4160 + var11 = class114.SequenceDefinition_get(var0.sequence); // L: 4161 + if (var11.field2224 == 1 && var0.field1200 > 0 && var0.field1191 <= Client.cycle && var0.field1192 < Client.cycle) { // L: 4162 4163 + var0.sequenceDelay = 1; // L: 4164 + return; // L: 4208 + } + } + + if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4169 + var11 = class114.SequenceDefinition_get(var0.sequence); // L: 4170 + if (var11 == null) { // L: 4171 + var0.sequence = -1; // L: 4204 + } else if (!var11.isCachedModelIdSet() && var11.frameIds != null) { // L: 4172 + ++var0.sequenceFrameCycle; // L: 4173 + if (var0.sequenceFrame < var11.frameIds.length && var0.sequenceFrameCycle > var11.frameLengths[var0.sequenceFrame]) { // L: 4174 + var0.sequenceFrameCycle = 1; // L: 4175 + ++var0.sequenceFrame; // L: 4176 + class16.method182(var11, var0.sequenceFrame, var0.x, var0.y); // L: 4177 + } + + if (var0.sequenceFrame >= var11.frameIds.length) { // L: 4179 + var0.sequenceFrame -= var11.frameCount; // L: 4180 + ++var0.field1186; // L: 4181 + if (var0.field1186 >= var11.field2223) { // L: 4182 + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var11.frameIds.length) { // L: 4183 + class16.method182(var11, var0.sequenceFrame, var0.x, var0.y); // L: 4184 + } else { + var0.sequence = -1; + } + } + + var0.isWalking = var11.field2201; // L: 4186 + } else if (var11.isCachedModelIdSet()) { // L: 4188 + ++var0.sequenceFrame; // L: 4189 + var3 = var11.method3735().method2754(); // L: 4190 + if (var0.sequenceFrame < var3) { // L: 4191 + TileItem.method2407(var11, var0.sequenceFrame, var0.x, var0.y); // L: 4192 + } else { + var0.sequenceFrame -= var11.frameCount; // L: 4195 + ++var0.field1186; // L: 4196 + if (var0.field1186 >= var11.field2223) { // L: 4197 + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var3) { // L: 4198 + TileItem.method2407(var11, var0.sequenceFrame, var0.x, var0.y); // L: 4199 + } else { + var0.sequence = -1; + } + } + } else { + var0.sequence = -1; // L: 4202 + } + } + + if (var0.sequenceDelay > 0) { // L: 4206 + --var0.sequenceDelay; + } + + } + + @ObfuscatedName("hx") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1223845461" + ) + static final void method5580() { + InvDefinition.method3268(false); // L: 5753 + Client.field545 = 0; // L: 5754 + boolean var0 = true; // L: 5755 + + int var1; + for (var1 = 0; var1 < InterfaceParent.regionLandArchives.length; ++var1) { // L: 5756 + if (class83.regionMapArchiveIds[var1] != -1 && InterfaceParent.regionLandArchives[var1] == null) { // L: 5757 5758 + InterfaceParent.regionLandArchives[var1] = Message.archive5.takeFile(class83.regionMapArchiveIds[var1], 0); // L: 5759 + if (InterfaceParent.regionLandArchives[var1] == null) { // L: 5760 + var0 = false; // L: 5761 + ++Client.field545; // L: 5762 + } + } + + if (class17.regionLandArchiveIds[var1] != -1 && FloorUnderlayDefinition.regionMapArchives[var1] == null) { // L: 5766 5767 + FloorUnderlayDefinition.regionMapArchives[var1] = Message.archive5.takeFileEncrypted(class17.regionLandArchiveIds[var1], 0, class138.xteaKeys[var1]); // L: 5768 + if (FloorUnderlayDefinition.regionMapArchives[var1] == null) { // L: 5769 + var0 = false; // L: 5770 + ++Client.field545; // L: 5771 + } + } + } + + if (!var0) { // L: 5776 + Client.field597 = 1; // L: 5777 + } else { + Client.field570 = 0; // L: 5780 + var0 = true; // L: 5781 + + int var3; + int var4; + for (var1 = 0; var1 < InterfaceParent.regionLandArchives.length; ++var1) { // L: 5782 + byte[] var15 = FloorUnderlayDefinition.regionMapArchives[var1]; // L: 5783 + if (var15 != null) { // L: 5784 + var3 = (class241.regions[var1] >> 8) * 64 - SecureRandomCallable.baseX; // L: 5785 + var4 = (class241.regions[var1] & 255) * 64 - GrandExchangeOfferOwnWorldComparator.baseY; // L: 5786 + if (Client.isInInstance) { // L: 5787 + var3 = 10; // L: 5788 + var4 = 10; // L: 5789 + } + + var0 &= class132.method2834(var15, var3, var4); // L: 5791 + } + } + + if (!var0) { // L: 5794 + Client.field597 = 2; // L: 5795 + } else { + if (Client.field597 != 0) { // L: 5798 + class259.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + } + + ArchiveLoader.playPcmPlayers(); // L: 5799 + class175.scene.clear(); // L: 5800 + + for (var1 = 0; var1 < 4; ++var1) { // L: 5801 + Client.collisionMaps[var1].clear(); + } + + int var2; + for (var1 = 0; var1 < 4; ++var1) { // L: 5802 + for (var2 = 0; var2 < 104; ++var2) { // L: 5803 + for (var3 = 0; var3 < 104; ++var3) { // L: 5804 + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 5805 + } + } + } + + ArchiveLoader.playPcmPlayers(); // L: 5809 + class149.method3024(); // L: 5810 + var1 = InterfaceParent.regionLandArchives.length; // L: 5811 + Varcs.method2466(); // L: 5812 + InvDefinition.method3268(true); // L: 5813 + int var5; + if (!Client.isInInstance) { // L: 5814 + byte[] var14; + for (var2 = 0; var2 < var1; ++var2) { // L: 5815 + var3 = (class241.regions[var2] >> 8) * 64 - SecureRandomCallable.baseX; // L: 5816 + var4 = (class241.regions[var2] & 255) * 64 - GrandExchangeOfferOwnWorldComparator.baseY; // L: 5817 + var14 = InterfaceParent.regionLandArchives[var2]; // L: 5818 + if (var14 != null) { // L: 5819 + ArchiveLoader.playPcmPlayers(); // L: 5820 + PacketBufferNode.method5009(var14, var3, var4, WorldMapSectionType.field2828 * 8 - 48, class433.field4657 * 8 - 48, Client.collisionMaps); // L: 5821 + } + } + + for (var2 = 0; var2 < var1; ++var2) { // L: 5824 + var3 = (class241.regions[var2] >> 8) * 64 - SecureRandomCallable.baseX; // L: 5825 + var4 = (class241.regions[var2] & 255) * 64 - GrandExchangeOfferOwnWorldComparator.baseY; // L: 5826 + var14 = InterfaceParent.regionLandArchives[var2]; // L: 5827 + if (var14 == null && class433.field4657 < 800) { // L: 5828 + ArchiveLoader.playPcmPlayers(); // L: 5829 + PlayerComposition.method5408(var3, var4, 64, 64); // L: 5830 + } + } + + InvDefinition.method3268(true); // L: 5833 + + for (var2 = 0; var2 < var1; ++var2) { // L: 5834 + byte[] var13 = FloorUnderlayDefinition.regionMapArchives[var2]; // L: 5835 + if (var13 != null) { // L: 5836 + var4 = (class241.regions[var2] >> 8) * 64 - SecureRandomCallable.baseX; // L: 5837 + var5 = (class241.regions[var2] & 255) * 64 - GrandExchangeOfferOwnWorldComparator.baseY; // L: 5838 + ArchiveLoader.playPcmPlayers(); // L: 5839 + VertexNormal.method4376(var13, var4, var5, class175.scene, Client.collisionMaps); // L: 5840 + } + } + } + + int var6; + int var7; + int var8; + if (Client.isInInstance) { // L: 5844 + int var9; + int var10; + int var11; + for (var2 = 0; var2 < 4; ++var2) { // L: 5845 + ArchiveLoader.playPcmPlayers(); // L: 5846 + + for (var3 = 0; var3 < 13; ++var3) { // L: 5847 + for (var4 = 0; var4 < 13; ++var4) { // L: 5848 + boolean var16 = false; // L: 5849 + var6 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5850 + if (var6 != -1) { // L: 5851 + var7 = var6 >> 24 & 3; // L: 5852 + var8 = var6 >> 1 & 3; // L: 5853 + var9 = var6 >> 14 & 1023; // L: 5854 + var10 = var6 >> 3 & 2047; // L: 5855 + var11 = (var9 / 8 << 8) + var10 / 8; // L: 5856 + + for (int var12 = 0; var12 < class241.regions.length; ++var12) { // L: 5857 + if (class241.regions[var12] == var11 && InterfaceParent.regionLandArchives[var12] != null) { // L: 5858 + class125.method2794(InterfaceParent.regionLandArchives[var12], var2, var3 * 8, var4 * 8, var7, (var9 & 7) * 8, (var10 & 7) * 8, var8, Client.collisionMaps); // L: 5859 + var16 = true; // L: 5860 + break; + } + } + } + + if (!var16) { // L: 5865 + World.method1661(var2, var3 * 8, var4 * 8); // L: 5866 + } + } + } + } + + for (var2 = 0; var2 < 13; ++var2) { // L: 5871 + for (var3 = 0; var3 < 13; ++var3) { // L: 5872 + var4 = Client.instanceChunkTemplates[0][var2][var3]; // L: 5873 + if (var4 == -1) { // L: 5874 + PlayerComposition.method5408(var2 * 8, var3 * 8, 8, 8); // L: 5875 + } + } + } + + InvDefinition.method3268(true); // L: 5879 + + for (var2 = 0; var2 < 4; ++var2) { // L: 5880 + ArchiveLoader.playPcmPlayers(); // L: 5881 + + for (var3 = 0; var3 < 13; ++var3) { // L: 5882 + for (var4 = 0; var4 < 13; ++var4) { // L: 5883 + var5 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5884 + if (var5 != -1) { // L: 5885 + var6 = var5 >> 24 & 3; // L: 5886 + var7 = var5 >> 1 & 3; // L: 5887 + var8 = var5 >> 14 & 1023; // L: 5888 + var9 = var5 >> 3 & 2047; // L: 5889 + var10 = (var8 / 8 << 8) + var9 / 8; // L: 5890 + + for (var11 = 0; var11 < class241.regions.length; ++var11) { // L: 5891 + if (class241.regions[var11] == var10 && FloorUnderlayDefinition.regionMapArchives[var11] != null) { // L: 5892 + Tiles.method2033(FloorUnderlayDefinition.regionMapArchives[var11], var2, var3 * 8, var4 * 8, var6, (var8 & 7) * 8, (var9 & 7) * 8, var7, class175.scene, Client.collisionMaps); // L: 5893 + break; // L: 5894 + } + } + } + } + } + } + } + + InvDefinition.method3268(true); // L: 5902 + ArchiveLoader.playPcmPlayers(); // L: 5903 + class268.method5029(class175.scene, Client.collisionMaps); // L: 5904 + InvDefinition.method3268(true); // L: 5905 + var2 = Tiles.Tiles_minPlane; // L: 5906 + if (var2 > class128.Client_plane) { // L: 5907 + var2 = class128.Client_plane; + } + + if (var2 < class128.Client_plane - 1) { // L: 5908 + var2 = class128.Client_plane - 1; + } + + if (Client.isLowDetail) { // L: 5909 + class175.scene.init(Tiles.Tiles_minPlane); + } else { + class175.scene.init(0); // L: 5910 + } + + for (var3 = 0; var3 < 104; ++var3) { // L: 5911 + for (var4 = 0; var4 < 104; ++var4) { // L: 5912 + Frames.updateItemPile(var3, var4); // L: 5913 + } + } + + ArchiveLoader.playPcmPlayers(); // L: 5916 + ReflectionCheck.method600(); // L: 5917 + ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 5918 + PacketBufferNode var17; + if (class82.client.hasFrame()) { // L: 5919 + var17 = WallDecoration.getPacketBufferNode(ClientPacket.field2948, Client.packetWriter.isaacCipher); // L: 5921 + var17.packetBuffer.writeInt(1057001181); // L: 5922 + Client.packetWriter.addNode(var17); // L: 5923 + } + + if (!Client.isInInstance) { // L: 5925 + var3 = (WorldMapSectionType.field2828 - 6) / 8; // L: 5926 + var4 = (WorldMapSectionType.field2828 + 6) / 8; // L: 5927 + var5 = (class433.field4657 - 6) / 8; // L: 5928 + var6 = (class433.field4657 + 6) / 8; // L: 5929 + + for (var7 = var3 - 1; var7 <= var4 + 1; ++var7) { // L: 5930 + for (var8 = var5 - 1; var8 <= var6 + 1; ++var8) { // L: 5931 + if (var7 < var3 || var7 > var4 || var8 < var5 || var8 > var6) { // L: 5932 + Message.archive5.loadRegionFromName("m" + var7 + "_" + var8); // L: 5933 + Message.archive5.loadRegionFromName("l" + var7 + "_" + var8); // L: 5934 + } + } + } + } + + PendingSpawn.updateGameState(30); // L: 5938 + ArchiveLoader.playPcmPlayers(); // L: 5939 + PcmPlayer.method753(); // L: 5940 + var17 = WallDecoration.getPacketBufferNode(ClientPacket.field3031, Client.packetWriter.isaacCipher); // L: 5941 + Client.packetWriter.addNode(var17); // L: 5942 + WorldMap.method7222(); // L: 5943 + } + } + } // L: 5778 5796 5944 } diff --git a/runescape-client/src/main/java/class302.java b/runescape-client/src/main/java/class302.java index 00e896b4bd..c5ae59fd4e 100644 --- a/runescape-client/src/main/java/class302.java +++ b/runescape-client/src/main/java/class302.java @@ -1,61 +1,249 @@ -import java.util.LinkedHashMap; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("km") +@ObfuscatedName("kx") public class class302 { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Lkx;" ) - static final class302 field3551; - @ObfuscatedName("c") + static final class302 field3612; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Lkx;" ) - static final class302 field3549; - @ObfuscatedName("i") + static final class302 field3611; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1906155943 + intValue = -928384515 ) - final int field3550; - @ObfuscatedName("f") + final int field3613; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1137794979 + intValue = 381472807 ) - final int field3548; + final int field3610; static { - field3551 = new class302(51, 27, 800, 0, 16, 16); // L: 29 - field3549 = new class302(25, 28, 800, 656, 40, 40); // L: 30 + field3612 = new class302(51, 27, 800, 0, 16, 16); // L: 33 + field3611 = new class302(25, 28, 800, 656, 40, 40); // L: 34 } class302(int var1, int var2, int var3, int var4, int var5, int var6) { - this.field3550 = var5; // L: 39 - this.field3548 = var6; // L: 40 + this.field3613 = var5; // L: 39 + this.field3610 = var6; // L: 40 } // L: 41 - @ObfuscatedName("fq") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "15" + descriptor = "(ILbb;ZI)I", + garbageValue = "-1771352209" ) - static final void method5766(boolean var0) { - if (var0) { // L: 2978 - Client.field531 = Login.field907 ? class124.field1498 : class124.field1496; // L: 2979 + static int method5584(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == ScriptOpcodes.ADD) { // L: 3039 + class12.Interpreter_intStackSize -= 2; // L: 3040 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3041 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3042 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 + var4; // L: 3043 + return 1; // L: 3044 + } else if (var0 == ScriptOpcodes.SUB) { // L: 3046 + class12.Interpreter_intStackSize -= 2; // L: 3047 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3048 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3049 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 - var4; // L: 3050 + return 1; // L: 3051 + } else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 3053 + class12.Interpreter_intStackSize -= 2; // L: 3054 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3055 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3056 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4 * var3; // L: 3057 + return 1; // L: 3058 + } else if (var0 == ScriptOpcodes.DIV) { // L: 3060 + class12.Interpreter_intStackSize -= 2; // L: 3061 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3062 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3063 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 / var4; // L: 3064 + return 1; // L: 3065 + } else if (var0 == ScriptOpcodes.RANDOM) { // L: 3067 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3068 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); // L: 3069 + return 1; // L: 3070 + } else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 3072 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3073 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); // L: 3074 + return 1; // L: 3075 } else { - LinkedHashMap var1 = class131.clientPreferences.parameters; // L: 2982 - String var3 = Login.Login_username; // L: 2984 - int var4 = var3.length(); // L: 2986 - int var5 = 0; // L: 2987 + int var5; + int var6; + int var7; + if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 3077 + class12.Interpreter_intStackSize -= 5; // L: 3078 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3079 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3080 + var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 3081 + var6 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 3]; // L: 3082 + var7 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 4]; // L: 3083 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5); // L: 3084 + return 1; // L: 3085 + } else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 3087 + class12.Interpreter_intStackSize -= 2; // L: 3088 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3089 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3090 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100; // L: 3091 + return 1; // L: 3092 + } else if (var0 == ScriptOpcodes.SETBIT) { // L: 3094 + class12.Interpreter_intStackSize -= 2; // L: 3095 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3096 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3097 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 | 1 << var4; // L: 3098 + return 1; // L: 3099 + } else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 3101 + class12.Interpreter_intStackSize -= 2; // L: 3102 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3103 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3104 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); // L: 3105 + return 1; // L: 3106 + } else if (var0 == ScriptOpcodes.TESTBIT) { // L: 3108 + class12.Interpreter_intStackSize -= 2; // L: 3109 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3110 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3111 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; // L: 3112 + return 1; // L: 3113 + } else if (var0 == ScriptOpcodes.MOD) { // L: 3115 + class12.Interpreter_intStackSize -= 2; // L: 3116 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3117 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3118 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 % var4; // L: 3119 + return 1; // L: 3120 + } else if (var0 == ScriptOpcodes.POW) { // L: 3122 + class12.Interpreter_intStackSize -= 2; // L: 3123 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3124 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3125 + if (var3 == 0) { // L: 3126 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); // L: 3127 + } - for (int var6 = 0; var6 < var4; ++var6) { // L: 2988 - var5 = (var5 << 5) - var5 + var3.charAt(var6); + return 1; // L: 3128 + } else if (var0 == ScriptOpcodes.INVPOW) { // L: 3130 + class12.Interpreter_intStackSize -= 2; // L: 3131 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3132 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3133 + if (var3 == 0) { // L: 3134 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3135 + return 1; // L: 3136 + } else { + switch(var4) { // L: 3138 + case 0: + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 3166 + break; + case 1: + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3; // L: 3156 + break; // L: 3157 + case 2: + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); // L: 3141 + break; + case 3: + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); // L: 3151 + break; // L: 3152 + case 4: + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); // L: 3146 + break; // L: 3147 + default: + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); // L: 3161 + } + + return 1; // L: 3170 + } + } else if (var0 == ScriptOpcodes.AND) { // L: 3172 + class12.Interpreter_intStackSize -= 2; // L: 3173 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3174 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3175 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 & var4; // L: 3176 + return 1; // L: 3177 + } else if (var0 == ScriptOpcodes.OR) { // L: 3179 + class12.Interpreter_intStackSize -= 2; // L: 3180 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3181 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3182 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 | var4; // L: 3183 + return 1; // L: 3184 + } else if (var0 == ScriptOpcodes.SCALE) { // L: 3186 + class12.Interpreter_intStackSize -= 3; // L: 3187 + long var9 = (long)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3188 + long var11 = (long)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3189 + long var13 = (long)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 3190 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11); // L: 3191 + return 1; // L: 3192 + } else if (var0 == ScriptOpcodes.BITCOUNT) { // L: 3194 + var3 = VarcInt.method3324(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 3195 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3; // L: 3196 + return 1; // L: 3197 + } else if (var0 == ScriptOpcodes.TOGGLEBIT) { // L: 3199 + class12.Interpreter_intStackSize -= 2; // L: 3200 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3201 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3202 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; // L: 3203 + return 1; // L: 3204 + } else if (var0 == ScriptOpcodes.SETBIT_RANGE) { // L: 3206 + class12.Interpreter_intStackSize -= 3; // L: 3207 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3208 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3209 + var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 3210 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class92.method2376(var3, var4, var5); // L: 3211 + return 1; // L: 3212 + } else if (var0 == ScriptOpcodes.CLEARBIT_RANGE) { // L: 3214 + class12.Interpreter_intStackSize -= 3; // L: 3215 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3216 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3217 + var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 3218 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = DynamicObject.method1957(var3, var4, var5); // L: 3219 + return 1; // L: 3220 + } else if (var0 == ScriptOpcodes.GETBIT_RANGE) { // L: 3222 + class12.Interpreter_intStackSize -= 3; // L: 3223 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3224 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3225 + var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 3226 + var6 = 31 - var5; // L: 3227 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 << var6 >>> var4 + var6; // L: 3228 + return 1; // L: 3229 + } else if (var0 == 4030) { // L: 3231 + class12.Interpreter_intStackSize -= 4; // L: 3232 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3233 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3234 + var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 3235 + var6 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 3]; // L: 3236 + var3 = DynamicObject.method1957(var3, var5, var6); // L: 3237 + var7 = class147.method3000(var6 - var5 + 1); // L: 3238 + if (var4 > var7) { // L: 3239 + var4 = var7; + } + + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 | var4 << var5; // L: 3240 + return 1; // L: 3241 + } else if (var0 == 4032) { // L: 3243 + Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1] = GameEngine.method555(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1]); // L: 3244 + return 1; // L: 3245 + } else if (var0 == 4033) { // L: 3247 + Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1] = Occluder.method4220(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1]); // L: 3248 + return 1; // L: 3249 + } else if (var0 == 4034) { // L: 3251 + class12.Interpreter_intStackSize -= 2; // L: 3252 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3253 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3254 + var5 = class1.method12(var3, var4); // L: 3255 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5; // L: 3256 + return 1; // L: 3257 + } else if (var0 == 4035) { // L: 3259 + Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1]); // L: 3260 + return 1; // L: 3261 + } else { + return 2; // L: 3263 } - - Client.field531 = var1.containsKey(var5) ? class124.field1501 : class124.field1495; // L: 2991 } - - } // L: 2993 + } } diff --git a/runescape-client/src/main/java/class305.java b/runescape-client/src/main/java/class305.java index 127a9d4944..f913a4f26b 100644 --- a/runescape-client/src/main/java/class305.java +++ b/runescape-client/src/main/java/class305.java @@ -1,79 +1,384 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ke") +@ObfuscatedName("kz") public class class305 { - @ObfuscatedName("b") + @ObfuscatedName("ew") @ObfuscatedSignature( - descriptor = "([BIIIIIII[Lgv;I)V", - garbageValue = "-2138515466" + descriptor = "Lle;" ) - static final void method5781(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: 111 - for (var10 = 0; var10 < 8; ++var10) { // L: 112 - if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { // L: 113 - int[] var10000 = var8[var1].flags[var9 + var2]; - var10000[var3 + var10] &= -16777217; - } + @Export("archive8") + static Archive archive8; + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Llp;I)V", + garbageValue = "1856967280" + ) + public static void method5592(AbstractArchive var0) { + ParamComposition.ParamDefinition_archive = var0; // L: 21 + } // L: 22 + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(ILbb;ZI)I", + garbageValue = "286394891" + ) + static int method5591(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 2341 + if (BufferedSource.friendSystem.field803 == 0) { // L: 2342 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -2; + } else if (BufferedSource.friendSystem.field803 == 1) { // L: 2343 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = BufferedSource.friendSystem.friendsList.getSize(); // L: 2344 } - } - Buffer var21 = new Buffer(var0); // L: 116 - - for (var10 = 0; var10 < 4; ++var10) { // L: 117 - for (int var11 = 0; var11 < 64; ++var11) { // L: 118 - for (int var12 = 0; var12 < 64; ++var12) { // L: 119 - if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { // L: 120 - int var15 = var2 + Script.method1996(var11 & 7, var12 & 7, var7); // L: 123 - int var18 = var11 & 7; // L: 126 - int var19 = var12 & 7; // L: 127 - int var20 = var7 & 3; // L: 130 - int var17; - if (var20 == 0) { // L: 131 - var17 = var19; // L: 132 - } else if (var20 == 1) { // L: 135 - var17 = 7 - var18; // L: 136 - } else if (var20 == 2) { // L: 139 - var17 = 7 - var19; // L: 140 - } else { - var17 = var18; // L: 143 - } - - class20.loadTerrain(var21, var1, var15, var17 + var3, 0, 0, var7); // L: 145 - } else { - class20.loadTerrain(var21, 0, -1, -1, 0, 0, 0); // L: 147 - } - } - } - } - - } // L: 151 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(I)Lbb;", - garbageValue = "1287117449" - ) - @Export("getNextWorldListWorld") - static World getNextWorldListWorld() { - return World.World_listCount < World.World_count ? DevicePcmPlayerProvider.World_worlds[++World.World_listCount - 1] : null; // L: 242 243 - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Lky;I)I", - garbageValue = "-1357521539" - ) - static int method5782(Widget var0) { - if (var0.type != 11) { // L: 1238 - Interpreter.Interpreter_stringStack[class122.Interpreter_stringStackSize - 1] = ""; // L: 1239 - return 1; // L: 1240 + return 1; // L: 2345 } else { - String var1 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 1242 - Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var0.method5624(var1); // L: 1243 - return 1; // L: 1244 + int var3; + if (var0 == ScriptOpcodes.FRIEND_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2348 + if (BufferedSource.friendSystem.method1666() && var3 >= 0 && var3 < BufferedSource.friendSystem.friendsList.getSize()) { // L: 2349 + Friend var8 = (Friend)BufferedSource.friendSystem.friendsList.get(var3); // L: 2350 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var8.getName(); // L: 2351 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 2352 + } else { + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 2355 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 2356 + } + + return 1; // L: 2358 + } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2361 + if (BufferedSource.friendSystem.method1666() && var3 >= 0 && var3 < BufferedSource.friendSystem.friendsList.getSize()) { // L: 2362 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = ((Buddy)BufferedSource.friendSystem.friendsList.get(var3)).world; // L: 2363 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2365 + } + + return 1; // L: 2366 + } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2369 + if (BufferedSource.friendSystem.method1666() && var3 >= 0 && var3 < BufferedSource.friendSystem.friendsList.getSize()) { // L: 2370 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = ((Buddy)BufferedSource.friendSystem.friendsList.get(var3)).rank; // L: 2371 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2373 + } + + return 1; // L: 2374 + } else { + String var5; + if (var0 == ScriptOpcodes.FRIEND_SETRANK) { + var5 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 2377 + int var6 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2378 + WallDecoration.method4392(var5, var6); // L: 2379 + return 1; // L: 2380 + } else if (var0 == ScriptOpcodes.FRIEND_ADD) { + var5 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 2383 + BufferedSource.friendSystem.addFriend(var5); // L: 2384 + return 1; // L: 2385 + } else if (var0 == ScriptOpcodes.FRIEND_DEL) { + var5 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 2388 + BufferedSource.friendSystem.removeFriend(var5); // L: 2389 + return 1; // L: 2390 + } else if (var0 == ScriptOpcodes.IGNORE_ADD) { + var5 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 2393 + BufferedSource.friendSystem.addIgnore(var5); // L: 2394 + return 1; // L: 2395 + } else if (var0 == ScriptOpcodes.IGNORE_DEL) { + var5 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 2398 + BufferedSource.friendSystem.removeIgnore(var5); // L: 2399 + return 1; // L: 2400 + } else if (var0 == ScriptOpcodes.FRIEND_TEST) { + var5 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 2403 + var5 = class150.method3026(var5); // L: 2404 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = BufferedSource.friendSystem.isFriended(new Username(var5, class391.loginType), false) ? 1 : 0; // L: 2405 + return 1; // L: 2406 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { + if (PcmPlayer.friendsChat != null) { // L: 2409 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = PcmPlayer.friendsChat.name; // L: 2410 + } else { + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 2412 + } + + return 1; // L: 2413 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { + if (PcmPlayer.friendsChat != null) { // L: 2416 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = PcmPlayer.friendsChat.getSize(); // L: 2417 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2419 + } + + return 1; // L: 2420 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2423 + if (PcmPlayer.friendsChat != null && var3 < PcmPlayer.friendsChat.getSize()) { // L: 2424 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = PcmPlayer.friendsChat.get(var3).getUsername().getName(); // L: 2425 + } else { + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 2427 + } + + return 1; // L: 2428 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2431 + if (PcmPlayer.friendsChat != null && var3 < PcmPlayer.friendsChat.getSize()) { // L: 2432 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = ((Buddy)PcmPlayer.friendsChat.get(var3)).getWorld(); // L: 2433 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2435 + } + + return 1; // L: 2436 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2439 + if (PcmPlayer.friendsChat != null && var3 < PcmPlayer.friendsChat.getSize()) { // L: 2440 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = ((Buddy)PcmPlayer.friendsChat.get(var3)).rank; // L: 2441 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2443 + } + + return 1; // L: 2444 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = PcmPlayer.friendsChat != null ? PcmPlayer.friendsChat.minKick : 0; // L: 2447 + return 1; // L: 2448 + } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { + var5 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 2451 + class19.clanKickUser(var5); // L: 2452 + return 1; // L: 2453 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = PcmPlayer.friendsChat != null ? PcmPlayer.friendsChat.rank * -546532963 * 284785845 : 0; // L: 2456 + return 1; // L: 2457 + } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { + var5 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 2460 + Skills.Clan_joinChat(var5); // L: 2461 + return 1; // L: 2462 + } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { + class78.Clan_leaveChat(); // L: 2465 + return 1; // L: 2466 + } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { + if (!BufferedSource.friendSystem.method1666()) { // L: 2469 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = BufferedSource.friendSystem.ignoreList.getSize(); // L: 2470 + } + + return 1; // L: 2471 + } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2474 + if (BufferedSource.friendSystem.method1666() && var3 >= 0 && var3 < BufferedSource.friendSystem.ignoreList.getSize()) { // L: 2475 + Ignored var4 = (Ignored)BufferedSource.friendSystem.ignoreList.get(var3); // L: 2476 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2477 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2478 + } else { + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 2481 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 2482 + } + + return 1; // L: 2484 + } else if (var0 == ScriptOpcodes.IGNORE_TEST) { + var5 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 2487 + var5 = class150.method3026(var5); // L: 2488 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = BufferedSource.friendSystem.isIgnored(new Username(var5, class391.loginType)) ? 1 : 0; // L: 2489 + return 1; // L: 2490 + } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2493 + if (PcmPlayer.friendsChat != null && var3 < PcmPlayer.friendsChat.getSize() && PcmPlayer.friendsChat.get(var3).getUsername().equals(ModelData0.localPlayer.username)) { // L: 2494 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 2495 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2497 + } + + return 1; // L: 2498 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { + if (PcmPlayer.friendsChat != null && PcmPlayer.friendsChat.owner != null) { // L: 2501 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = PcmPlayer.friendsChat.owner; // L: 2502 + } else { + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 2504 + } + + return 1; // L: 2505 + } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2508 + if (PcmPlayer.friendsChat != null && var3 < PcmPlayer.friendsChat.getSize() && ((ClanMate)PcmPlayer.friendsChat.get(var3)).isFriend()) { // L: 2509 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 2510 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2512 + } + + return 1; // L: 2513 + } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { + if (var0 == 3628) { + BufferedSource.friendSystem.friendsList.removeComparator(); // L: 2524 + return 1; // L: 2525 + } else { + boolean var7; + if (var0 == 3629) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2528 + BufferedSource.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2529 + return 1; // L: 2530 + } else if (var0 == 3630) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2533 + BufferedSource.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2534 + return 1; // L: 2535 + } else if (var0 == 3631) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2538 + BufferedSource.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2539 + return 1; // L: 2540 + } else if (var0 == 3632) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2543 + BufferedSource.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2544 + return 1; // L: 2545 + } else if (var0 == 3633) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2548 + BufferedSource.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2549 + return 1; // L: 2550 + } else if (var0 == 3634) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2553 + BufferedSource.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2554 + return 1; // L: 2555 + } else if (var0 == 3635) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2558 + BufferedSource.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2559 + return 1; // L: 2560 + } else if (var0 == 3636) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2563 + BufferedSource.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2564 + return 1; // L: 2565 + } else if (var0 == 3637) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2568 + BufferedSource.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2569 + return 1; // L: 2570 + } else if (var0 == 3638) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2573 + BufferedSource.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2574 + return 1; // L: 2575 + } else if (var0 == 3639) { + BufferedSource.friendSystem.friendsList.sort(); // L: 2578 + return 1; // L: 2579 + } else if (var0 == 3640) { + BufferedSource.friendSystem.ignoreList.removeComparator(); // L: 2582 + return 1; // L: 2583 + } else if (var0 == 3641) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2586 + BufferedSource.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2587 + return 1; // L: 2588 + } else if (var0 == 3642) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2591 + BufferedSource.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2592 + return 1; // L: 2593 + } else if (var0 == 3643) { + BufferedSource.friendSystem.ignoreList.sort(); // L: 2596 + return 1; // L: 2597 + } else if (var0 == 3644) { + if (PcmPlayer.friendsChat != null) { // L: 2600 + PcmPlayer.friendsChat.removeComparator(); // L: 2601 + } + + return 1; // L: 2603 + } else if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2606 + if (PcmPlayer.friendsChat != null) { // L: 2607 + PcmPlayer.friendsChat.addComparator(new UserComparator1(var7)); // L: 2608 + } + + return 1; // L: 2610 + } else if (var0 == 3646) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2613 + if (PcmPlayer.friendsChat != null) { // L: 2614 + PcmPlayer.friendsChat.addComparator(new UserComparator2(var7)); // L: 2615 + } + + return 1; // L: 2617 + } else if (var0 == 3647) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2620 + if (PcmPlayer.friendsChat != null) { // L: 2621 + PcmPlayer.friendsChat.addComparator(new UserComparator3(var7)); // L: 2622 + } + + return 1; // L: 2624 + } else if (var0 == 3648) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2627 + if (PcmPlayer.friendsChat != null) { // L: 2628 + PcmPlayer.friendsChat.addComparator(new UserComparator4(var7)); // L: 2629 + } + + return 1; // L: 2631 + } else if (var0 == 3649) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2634 + if (PcmPlayer.friendsChat != null) { // L: 2635 + PcmPlayer.friendsChat.addComparator(new UserComparator5(var7)); // L: 2636 + } + + return 1; // L: 2638 + } else if (var0 == 3650) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2641 + if (PcmPlayer.friendsChat != null) { // L: 2642 + PcmPlayer.friendsChat.addComparator(new UserComparator6(var7)); // L: 2643 + } + + return 1; // L: 2645 + } else if (var0 == 3651) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2648 + if (PcmPlayer.friendsChat != null) { // L: 2649 + PcmPlayer.friendsChat.addComparator(new UserComparator7(var7)); // L: 2650 + } + + return 1; // L: 2652 + } else if (var0 == 3652) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2655 + if (PcmPlayer.friendsChat != null) { // L: 2656 + PcmPlayer.friendsChat.addComparator(new UserComparator8(var7)); // L: 2657 + } + + return 1; // L: 2659 + } else if (var0 == 3653) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2662 + if (PcmPlayer.friendsChat != null) { // L: 2663 + PcmPlayer.friendsChat.addComparator(new UserComparator9(var7)); // L: 2664 + } + + return 1; // L: 2666 + } else if (var0 == 3654) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2669 + if (PcmPlayer.friendsChat != null) { // L: 2670 + PcmPlayer.friendsChat.addComparator(new UserComparator10(var7)); // L: 2671 + } + + return 1; // L: 2673 + } else if (var0 == 3655) { + if (PcmPlayer.friendsChat != null) { // L: 2676 + PcmPlayer.friendsChat.sort(); // L: 2677 + } + + return 1; // L: 2679 + } else if (var0 == 3656) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2682 + BufferedSource.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2683 + return 1; // L: 2684 + } else if (var0 == 3657) { + var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2687 + if (PcmPlayer.friendsChat != null) { // L: 2688 + PcmPlayer.friendsChat.addComparator(new BuddyRankComparator(var7)); // L: 2689 + } + + return 1; // L: 2691 + } else { + return 2; // L: 2693 + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2516 + if (PcmPlayer.friendsChat != null && var3 < PcmPlayer.friendsChat.getSize() && ((ClanMate)PcmPlayer.friendsChat.get(var3)).isIgnored()) { // L: 2517 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 2518 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2520 + } + + return 1; // L: 2521 + } + } } } } diff --git a/runescape-client/src/main/java/class306.java b/runescape-client/src/main/java/class306.java index 4aac3c2efb..4a206982b9 100644 --- a/runescape-client/src/main/java/class306.java +++ b/runescape-client/src/main/java/class306.java @@ -1,20 +1,82 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kd") +@ObfuscatedName("ku") public class class306 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "([FIFI)F", - garbageValue = "-1652525463" - ) - static float method5786(float[] var0, int var1, float var2) { - float var3 = var0[var1]; // L: 108 + static { + int var0 = 0; // L: 9 + int var1 = 0; // L: 10 + class302[] var2 = new class302[]{class302.field3612, class302.field3611}; // L: 14 + class302[] var3 = var2; // L: 16 - for (int var4 = var1 - 1; var4 >= 0; --var4) { // L: 109 - var3 = var0[var4] + var3 * var2; // L: 110 + for (int var4 = 0; var4 < var3.length; ++var4) { // L: 17 + class302 var5 = var3[var4]; // L: 18 + if (var5.field3613 > var0) { // L: 20 + var0 = var5.field3613; + } + + if (var5.field3610 > var1) { // L: 21 + var1 = var5.field3610; + } } - return var3; // L: 112 - } + } // L: 25 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1403614530" + ) + @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 + } + } + + World.World_sortOption1 = var2; // L: 75 + World.World_sortOption2 = var3; // L: 76 + UserComparator8.sortWorlds(World.World_worlds, 0, World.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77 + } // L: 78 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1939050344" + ) + static void method5595() { + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 48 + if (ArchiveDiskActionHandler.field3998 == 0) { // L: 49 + class131.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 50 + class131.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 51 + class131.ArchiveDiskActionHandler_thread.start(); // L: 52 + class131.ArchiveDiskActionHandler_thread.setPriority(5); // L: 53 + } + + ArchiveDiskActionHandler.field3998 = 600; // L: 55 + } + } // L: 57 + + @ObfuscatedName("ge") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-341201892" + ) + static void method5593(int var0, int var1) { + if (class12.clientPreferences.method2248() != 0 && var0 != -1) { // L: 3820 + UserComparator8.method2574(UrlRequest.archive11, var0, 0, class12.clientPreferences.method2248(), false); // L: 3821 + Client.playingJingle = true; // L: 3822 + } + + } // L: 3824 } diff --git a/runescape-client/src/main/java/class307.java b/runescape-client/src/main/java/class307.java deleted file mode 100644 index 5dd0d3c383..0000000000 --- a/runescape-client/src/main/java/class307.java +++ /dev/null @@ -1,38 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kh") -public class class307 { - @ObfuscatedName("oj") - @ObfuscatedSignature( - descriptor = "[Lky;" - ) - static Widget[] field3585; - - static { - int var0 = 0; // L: 9 - int var1 = 0; // L: 10 - class302[] var2 = class216.method4365(); // L: 12 - - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 13 - class302 var4 = var2[var3]; // L: 14 - if (var4.field3550 > var0) { - var0 = var4.field3550; // L: 16 - } - - if (var4.field3548 > var1) { // L: 17 - var1 = var4.field3548; - } - } - - } // L: 21 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1276900291" - ) - public static boolean method5789() { - return class273.musicPlayerStatus != 0 ? true : class273.midiPcmStream.isReady(); // L: 70 71 - } -} diff --git a/runescape-client/src/main/java/class309.java b/runescape-client/src/main/java/class309.java index 09a9927a4b..5562fd4712 100644 --- a/runescape-client/src/main/java/class309.java +++ b/runescape-client/src/main/java/class309.java @@ -2,47 +2,129 @@ 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("kr") +@ObfuscatedName("km") public enum class309 implements MouseWheel { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Lkm;" ) - field3914(-1), - @ObfuscatedName("c") + field3976(-1), + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Lkm;" ) - field3911(0), - @ObfuscatedName("i") + field3973(0), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Lkm;" ) - field3915(1), - @ObfuscatedName("f") + field3974(1), + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Lkm;" ) - field3913(2); + field3972(2); - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1882933983 + intValue = -965823037 ) - final int field3910; + final int field3975; class309(int var3) { - this.field3910 = var3; // L: 19 - } // L: 20 + this.field3975 = var3; // L: 15 + } // L: 16 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field3910; // L: 23 + return this.field3975; // L: 20 + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(ILbb;ZB)I", + garbageValue = "25" + ) + static int method5600(int var0, Script var1, boolean var2) { + int var3; + int var6; + int var9; + if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 2270 + class12.Interpreter_intStackSize -= 2; // L: 2271 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 2272 + var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2273 + EnumComposition var10 = Calendar.getEnum(var3); // L: 2274 + if (var10.outputType != 's') { // L: 2275 + } + + for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 2276 + if (var9 == var10.keys[var6]) { // L: 2277 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 2278 + var10 = null; // L: 2279 + break; + } + } + + if (var10 != null) { // L: 2283 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var10.defaultStr; + } + + return 1; // L: 2284 + } else if (var0 != ScriptOpcodes.ENUM) { // L: 2286 + if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 2312 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2313 + EnumComposition var4 = Calendar.getEnum(var3); // L: 2314 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.size(); // L: 2315 + return 1; // L: 2316 + } else { + return 2; // L: 2318 + } + } else { + class12.Interpreter_intStackSize -= 4; // L: 2287 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 2288 + var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2289 + int var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 2290 + var6 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 3]; // L: 2291 + EnumComposition var7 = Calendar.getEnum(var5); // L: 2292 + if (var3 == var7.inputType && var9 == var7.outputType) { // L: 2293 + for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 2298 + if (var6 == var7.keys[var8]) { // L: 2299 + if (var9 == 115) { // L: 2300 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var7.strVals[var8]; + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 2301 + } + + var7 = null; // L: 2302 + break; + } + } + + if (var7 != null) { // L: 2306 + if (var9 == 115) { // L: 2307 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var7.defaultStr; + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 2308 + } + } + + return 1; // L: 2310 + } else { + if (var9 == 115) { // L: 2294 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = "null"; + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2295 + } + + return 1; // L: 2296 + } + } } } diff --git a/runescape-client/src/main/java/class321.java b/runescape-client/src/main/java/class321.java index 637b55e5e2..6f774b3f8b 100644 --- a/runescape-client/src/main/java/class321.java +++ b/runescape-client/src/main/java/class321.java @@ -3,33 +3,201 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ll") +@ObfuscatedName("lg") public class class321 { - @ObfuscatedName("z") + @ObfuscatedName("ih") @ObfuscatedGetter( - intValue = 1459846877 + intValue = 1257274213 ) - @Export("canvasHeight") - public static int canvasHeight; + static int field4076; - @ObfuscatedName("v") + @ObfuscatedName("jw") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-884405686" + descriptor = "(Lki;Lgl;IIZB)V", + garbageValue = "1" ) - static void method5996() { - Tiles.Tiles_minPlane = 99; // L: 48 - Tiles.Tiles_underlays = new byte[4][104][104]; // L: 49 - class14.Tiles_overlays = new byte[4][104][104]; // L: 50 - class147.Tiles_shapes = new byte[4][104][104]; // L: 51 - Tiles.field983 = new byte[4][104][104]; // L: 52 - class420.field4545 = new int[4][105][105]; // L: 53 - class392.field4374 = new byte[4][105][105]; // L: 54 - Tiles.field998 = new int[105][105]; // L: 55 - BufferedNetSocket.Tiles_hue = new int[104]; // L: 56 - class116.Tiles_saturation = new int[104]; // L: 57 - Tiles.Tiles_lightness = new int[104]; // L: 58 - class357.Tiles_hueMultiplier = new int[104]; // L: 59 - class361.field4213 = new int[104]; // L: 60 - } // L: 61 + @Export("addWidgetItemMenuItem") + static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) { + String[] var5 = var1.inventoryActions; // L: 10985 + byte var6 = -1; // L: 10986 + String var7 = null; // L: 10987 + if (var5 != null && var5[var3] != null) { // L: 10988 + if (var3 == 0) { // L: 10989 + var6 = 33; + } else if (var3 == 1) { // L: 10990 + var6 = 34; + } else if (var3 == 2) { + var6 = 35; // L: 10991 + } else if (var3 == 3) { // L: 10992 + var6 = 36; + } else { + var6 = 37; // L: 10993 + } + + var7 = var5[var3]; // L: 10994 + } else if (var3 == 4) { // L: 10997 + var6 = 37; // L: 10998 + var7 = "Drop"; // L: 10999 + } + + if (var6 != -1 && var7 != null) { // L: 11002 + class175.insertMenuItem(var7, class166.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 11003 + } + + } // L: 11005 + + @ObfuscatedName("ks") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1133585766" + ) + @Export("changeGameOptions") + static final void changeGameOptions(int var0) { + class119.method2737(); // L: 12083 + + for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 12085 + if (var1.obj != null) { // L: 12086 + var1.set(); + } + } + + int var3 = class21.VarpDefinition_get(var0).type; // L: 12089 + if (var3 != 0) { // L: 12090 + int var2 = Varps.Varps_main[var0]; // L: 12091 + if (var3 == 1) { // L: 12092 + if (var2 == 1) { // L: 12093 + Rasterizer3D.Rasterizer3D_setBrightness(0.9D); // L: 12094 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.9D); // L: 12095 + VerticalAlignment.method3446(); // L: 12096 + class12.clientPreferences.method2232(0.9D); // L: 12097 + } + + if (var2 == 2) { // L: 12099 + Rasterizer3D.Rasterizer3D_setBrightness(0.8D); // L: 12100 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.8D); // L: 12101 + VerticalAlignment.method3446(); // L: 12102 + class12.clientPreferences.method2232(0.8D); // L: 12103 + } + + if (var2 == 3) { // L: 12105 + Rasterizer3D.Rasterizer3D_setBrightness(0.7D); // L: 12106 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.7D); // L: 12107 + VerticalAlignment.method3446(); // L: 12108 + class12.clientPreferences.method2232(0.7D); // L: 12109 + } + + if (var2 == 4) { // L: 12111 + Rasterizer3D.Rasterizer3D_setBrightness(0.6D); // L: 12112 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.6D); // L: 12113 + VerticalAlignment.method3446(); // L: 12114 + class12.clientPreferences.method2232(0.6D); // L: 12115 + } + } + + if (var3 == 3) { // L: 12118 + if (var2 == 0) { // L: 12119 + class291.method5390(255); + } + + if (var2 == 1) { // L: 12120 + class291.method5390(192); + } + + if (var2 == 2) { // L: 12121 + class291.method5390(128); + } + + if (var2 == 3) { + class291.method5390(64); // L: 12122 + } + + if (var2 == 4) { // L: 12123 + class291.method5390(0); + } + } + + if (var3 == 4) { // L: 12125 + if (var2 == 0) { // L: 12126 + class67.method1881(127); + } + + if (var2 == 1) { // L: 12127 + class67.method1881(96); + } + + if (var2 == 2) { // L: 12128 + class67.method1881(64); + } + + if (var2 == 3) { // L: 12129 + class67.method1881(32); + } + + if (var2 == 4) { // L: 12130 + class67.method1881(0); + } + } + + if (var3 == 5) { // L: 12132 + Client.leftClickOpensMenu = var2; + } + + if (var3 == 6) { // L: 12133 + Client.chatEffects = var2; + } + + if (var3 == 9) { // L: 12134 + Client.field480 = var2; + } + + if (var3 == 10) { // L: 12135 + if (var2 == 0) { // L: 12136 + MouseHandler.method591(127); + } + + if (var2 == 1) { // L: 12137 + MouseHandler.method591(96); + } + + if (var2 == 2) { // L: 12138 + MouseHandler.method591(64); + } + + if (var2 == 3) { // L: 12139 + MouseHandler.method591(32); + } + + if (var2 == 4) { // L: 12140 + MouseHandler.method591(0); + } + } + + if (var3 == 17) { // L: 12142 + Client.followerIndex = var2 & 65535; // L: 12143 + } + + if (var3 == 18) { // L: 12145 + Client.playerAttackOption = (AttackOption)class291.findEnumerated(ApproximateRouteStrategy.method1108(), var2); // L: 12146 + if (Client.playerAttackOption == null) { // L: 12147 + Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + if (var3 == 19) { // L: 12149 + if (var2 == -1) { // L: 12150 + Client.combatTargetPlayerIndex = -1; + } else { + Client.combatTargetPlayerIndex = var2 & 2047; // L: 12151 + } + } + + if (var3 == 22) { // L: 12153 + Client.npcAttackOption = (AttackOption)class291.findEnumerated(ApproximateRouteStrategy.method1108(), var2); // L: 12154 + if (Client.npcAttackOption == null) { // L: 12155 + Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + } + } // L: 12157 } diff --git a/runescape-client/src/main/java/class326.java b/runescape-client/src/main/java/class326.java index 57b55c31bc..fecf9a64e2 100644 --- a/runescape-client/src/main/java/class326.java +++ b/runescape-client/src/main/java/class326.java @@ -3,45 +3,44 @@ 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("lf") +@ObfuscatedName("lh") public class class326 { - @ObfuscatedName("q") - static int[] field4041; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("spriteMap") final HashMap spriteMap; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lne;" ) @Export("bounds") Bounds bounds; - @ObfuscatedName("i") - int[] field4034; - @ObfuscatedName("f") - int[] field4037; - @ObfuscatedName("b") + @ObfuscatedName("l") + int[] field4099; + @ObfuscatedName("k") + int[] field4102; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -2113149807 + intValue = 259027383 ) - int field4038; + int field4103; public class326() { this.spriteMap = new HashMap(); // L: 10 this.bounds = new Bounds(0, 0); // L: 11 - this.field4034 = new int[2048]; // L: 12 - this.field4037 = new int[2048]; // L: 13 - this.field4038 = 0; // L: 14 - WorldMapSection2.method3959(); // L: 21 + this.field4099 = new int[2048]; // L: 12 + this.field4102 = new int[2048]; // L: 13 + this.field4103 = 0; // L: 14 + ScriptEvent.method2074(); // L: 21 } // L: 22 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1093596616" + garbageValue = "-1955100783" ) - void method6042(int var1) { + void method5849(int var1) { int var2 = var1 * 2 + 1; // L: 46 double var4 = (double)((float)var1 / 3.0F); // L: 48 int var6 = var1 * 2 + 1; // L: 50 @@ -49,156 +48,503 @@ public class class326 { int var8 = -var1; for (int var9 = 0; var8 <= var1; ++var9) { - var7[var9] = AbstractWorldMapIcon.method4415((double)var8, 0.0D, var4); // L: 53 + double var20 = WorldMapID.method4811((double)(var8 - 0) / var4) / var4; // L: 57 + var7[var9] = var20; // L: 59 ++var8; // L: 52 } - double[] var14 = var7; // L: 57 - double var15 = var7[var1] * var7[var1]; // L: 58 - int[] var17 = new int[var2 * var2]; // L: 59 - boolean var10 = false; // L: 60 + double[] var14 = var7; // L: 63 + double var15 = var7[var1] * var7[var1]; // L: 64 + int[] var17 = new int[var2 * var2]; // L: 65 + boolean var10 = false; // L: 66 - for (int var11 = 0; var11 < var2; ++var11) { // L: 61 - for (int var12 = 0; var12 < var2; ++var12) { // L: 62 - int var13 = var17[var12 + var2 * var11] = (int)(var14[var11] * var14[var12] / var15 * 256.0D); // L: 63 - if (!var10 && var13 > 0) { // L: 64 - var10 = true; // L: 65 + for (int var11 = 0; var11 < var2; ++var11) { // L: 67 + for (int var12 = 0; var12 < var2; ++var12) { // L: 68 + int var13 = var17[var12 + var2 * var11] = (int)(256.0D * (var14[var12] * var14[var11] / var15)); // L: 69 + if (!var10 && var13 > 0) { // L: 70 + var10 = true; // L: 71 } } } - SpritePixels var18 = new SpritePixels(var17, var2, var2); // L: 69 - this.spriteMap.put(var1, var18); // L: 70 - } // L: 71 + SpritePixels var18 = new SpritePixels(var17, var2, var2); // L: 75 + this.spriteMap.put(var1, var18); // L: 76 + } // L: 77 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IS)Lqi;", - garbageValue = "255" + descriptor = "(IB)Lqr;", + garbageValue = "125" ) - SpritePixels method6043(int var1) { - if (!this.spriteMap.containsKey(var1)) { // L: 74 - this.method6042(var1); // L: 75 + SpritePixels method5866(int var1) { + if (!this.spriteMap.containsKey(var1)) { // L: 80 + this.method5849(var1); // L: 81 } - return (SpritePixels)this.spriteMap.get(var1); // L: 77 + return (SpritePixels)this.spriteMap.get(var1); // L: 83 } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-73" + descriptor = "(III)V", + garbageValue = "-2103923209" ) - public final void method6044(int var1, int var2) { - if (this.field4038 < this.field4034.length) { // L: 81 - this.field4034[this.field4038] = var1; // L: 82 - this.field4037[this.field4038] = var2; // L: 83 - ++this.field4038; // L: 84 + public final void method5848(int var1, int var2) { + if (this.field4103 < this.field4099.length) { // L: 87 + this.field4099[this.field4103] = var1; // L: 88 + this.field4102[this.field4103] = var2; // L: 89 + ++this.field4103; // L: 90 } - } // L: 85 + } // L: 91 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1343978449" + garbageValue = "-1637877740" ) - public final void method6057() { - this.field4038 = 0; // L: 88 - } // L: 89 + public final void method5851() { + this.field4103 = 0; // L: 94 + } // L: 95 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IILqi;FI)V", - garbageValue = "1463676048" + descriptor = "(IILqr;FB)V", + garbageValue = "5" ) - public final void method6045(int var1, int var2, SpritePixels var3, float var4) { - int var5 = (int)(18.0F * var4); // L: 92 - SpritePixels var6 = this.method6043(var5); // L: 93 - int var7 = var5 * 2 + 1; // L: 94 - Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); // L: 95 - Bounds var9 = new Bounds(0, 0); // L: 96 - this.bounds.setHigh(var7, var7); // L: 97 - System.nanoTime(); // L: 98 + public final void method5852(int var1, int var2, SpritePixels var3, float var4) { + int var5 = (int)(18.0F * var4); // L: 98 + SpritePixels var6 = this.method5866(var5); // L: 99 + int var7 = var5 * 2 + 1; // L: 100 + Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); // L: 101 + Bounds var9 = new Bounds(0, 0); // L: 102 + this.bounds.setHigh(var7, var7); // L: 103 + System.nanoTime(); // L: 104 int var10; int var11; int var12; - for (var10 = 0; var10 < this.field4038; ++var10) { // L: 99 - var11 = this.field4034[var10]; // L: 100 - var12 = this.field4037[var10]; // L: 101 - int var13 = (int)(var4 * (float)(var11 - var1)) - var5; // L: 102 - int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; // L: 103 - this.bounds.setLow(var13, var14); // L: 104 - this.bounds.method6945(var8, var9); // L: 105 - this.method6046(var6, var3, var9); // L: 106 + for (var10 = 0; var10 < this.field4103; ++var10) { // L: 105 + var11 = this.field4099[var10]; // L: 106 + var12 = this.field4102[var10]; // L: 107 + int var13 = (int)((float)(var11 - var1) * var4) - var5; // L: 108 + int var14 = (int)((float)var3.subHeight - var4 * (float)(var12 - var2)) - var5; // L: 109 + this.bounds.setLow(var13, var14); // L: 110 + this.bounds.method6758(var8, var9); // L: 111 + this.method5853(var6, var3, var9); // L: 112 } - System.nanoTime(); // L: 108 - System.nanoTime(); // L: 109 + System.nanoTime(); // L: 114 + System.nanoTime(); // L: 115 - for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 110 - if (var3.pixels[var10] == 0) { // L: 111 - var3.pixels[var10] = -16777216; // L: 112 + for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 116 + if (var3.pixels[var10] == 0) { // L: 117 + var3.pixels[var10] = -16777216; // L: 118 } else { - var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 115 - if (var11 <= 0) { // L: 116 - var3.pixels[var10] = -16777216; // L: 117 + var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 121 + if (var11 <= 0) { // L: 122 + var3.pixels[var10] = -16777216; // L: 123 } else { - if (var11 > field4041.length) { // L: 120 - var11 = field4041.length; + if (var11 > class82.field1072.length) { // L: 126 + var11 = class82.field1072.length; } - var12 = field4041[var11 - 1]; // L: 121 - var3.pixels[var10] = -16777216 | var12; // L: 122 + var12 = class82.field1072[var11 - 1]; // L: 127 + var3.pixels[var10] = -16777216 | var12; // L: 128 } } } - System.nanoTime(); // L: 124 - } // L: 125 + System.nanoTime(); // L: 130 + } // L: 131 - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lqi;Lqi;Lnm;I)V", - garbageValue = "-1856311554" + descriptor = "(Lqr;Lqr;Lne;B)V", + garbageValue = "-99" ) - void method6046(SpritePixels var1, SpritePixels var2, Bounds var3) { - if (var3.highX != 0 && var3.highY != 0) { // L: 128 - int var4 = 0; // L: 129 - int var5 = 0; // L: 130 - if (var3.lowX == 0) { // L: 131 + void method5853(SpritePixels var1, SpritePixels var2, Bounds var3) { + if (var3.highX != 0 && var3.highY != 0) { // L: 134 + int var4 = 0; // L: 135 + int var5 = 0; // L: 136 + if (var3.lowX == 0) { // L: 137 var4 = var1.subWidth - var3.highX; } - if (var3.lowY == 0) { // L: 132 + if (var3.lowY == 0) { // L: 138 var5 = var1.subHeight - var3.highY; } - int var6 = var4 + var5 * var1.subWidth; // L: 133 - int var7 = var2.subWidth * var3.lowY + var3.lowX; // L: 134 + int var6 = var4 + var5 * var1.subWidth; // L: 139 + int var7 = var3.lowX + var2.subWidth * var3.lowY; // L: 140 - for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 135 - for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 136 - int[] var10000 = var2.pixels; // L: 137 + for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 141 + for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 142 + int[] var10000 = var2.pixels; // L: 143 int var10001 = var7++; var10000[var10001] += var1.pixels[var6++]; } - var6 += var1.subWidth - var3.highX; // L: 139 - var7 += var2.subWidth - var3.highX; // L: 140 + var6 += var1.subWidth - var3.highX; // L: 145 + var7 += var2.subWidth - var3.highX; // L: 146 } } - } // L: 142 + } // L: 148 - @ObfuscatedName("lh") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(Lky;I)I", - garbageValue = "-658194090" + descriptor = "(ILbb;ZB)I", + garbageValue = "-63" ) - @Export("getWidgetFlags") - static int getWidgetFlags(Widget var0) { - IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex); // L: 12457 - return var1 != null ? var1.integer : var0.flags; // L: 12458 12459 + static int method5868(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 6600) { // L: 4118 + var3 = class128.Client_plane; // L: 4119 + int var15 = (ModelData0.localPlayer.x >> 7) + SecureRandomCallable.baseX; // L: 4120 + int var8 = (ModelData0.localPlayer.y >> 7) + GrandExchangeOfferOwnWorldComparator.baseY; // L: 4121 + MilliClock.getWorldMap().method7033(var3, var15, var8, true); // L: 4122 + return 1; // L: 4123 + } else { + WorldMapArea var9; + if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 4125 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4126 + String var16 = ""; // L: 4127 + var9 = MilliClock.getWorldMap().getMapArea(var3); // L: 4128 + if (var9 != null) { // L: 4129 + var16 = var9.getExternalName(); // L: 4130 + } + + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var16; // L: 4132 + return 1; // L: 4133 + } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 4135 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4136 + MilliClock.getWorldMap().setCurrentMapAreaId(var3); // L: 4137 + return 1; // L: 4138 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 4140 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = MilliClock.getWorldMap().getZoomLevel(); // L: 4141 + return 1; // L: 4142 + } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 4144 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4145 + MilliClock.getWorldMap().setZoomPercentage(var3); // L: 4146 + return 1; // L: 4147 + } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 4149 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = MilliClock.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 4150 + return 1; // L: 4151 + } else { + Coord var14; + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 4153 + var14 = new Coord(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 4154 + MilliClock.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 4155 + return 1; // L: 4156 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 4158 + var14 = new Coord(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 4159 + MilliClock.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 4160 + return 1; // L: 4161 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 4163 + var14 = new Coord(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 4164 + MilliClock.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 4165 + return 1; // L: 4166 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 4168 + var14 = new Coord(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 4169 + MilliClock.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 4170 + return 1; // L: 4171 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 4173 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = MilliClock.getWorldMap().getDisplayX(); // L: 4174 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = MilliClock.getWorldMap().getDisplayY(); // L: 4175 + return 1; // L: 4176 + } else { + WorldMapArea var11; + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 4178 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4179 + var11 = MilliClock.getWorldMap().getMapArea(var3); // L: 4180 + if (var11 == null) { // L: 4181 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4182 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 4185 + } + + return 1; // L: 4187 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 4189 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4190 + var11 = MilliClock.getWorldMap().getMapArea(var3); // L: 4191 + if (var11 == null) { // L: 4192 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4193 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4194 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 4197 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 4198 + } + + return 1; // L: 4200 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 4202 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4203 + var11 = MilliClock.getWorldMap().getMapArea(var3); // L: 4204 + if (var11 == null) { // L: 4205 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4206 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4207 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4208 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4209 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 4212 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 4213 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 4214 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 4215 + } + + return 1; // L: 4217 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 4219 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4220 + var11 = MilliClock.getWorldMap().getMapArea(var3); // L: 4221 + if (var11 == null) { // L: 4222 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4223 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 4226 + } + + return 1; // L: 4228 + } else if (var0 == 6615) { // L: 4230 + var14 = MilliClock.getWorldMap().getDisplayCoord(); // L: 4231 + if (var14 == null) { // L: 4232 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4233 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4234 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var14.x; // L: 4237 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var14.y; // L: 4238 + } + + return 1; // L: 4240 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 4242 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = MilliClock.getWorldMap().currentMapAreaId(); // L: 4243 + return 1; // L: 4244 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 4246 + var14 = new Coord(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 4247 + var11 = MilliClock.getWorldMap().getCurrentMapArea(); // L: 4248 + if (var11 == null) { // L: 4249 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4250 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4251 + return 1; // L: 4252 + } else { + int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 4254 + if (var12 == null) { // L: 4255 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4256 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4257 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var12[0]; // L: 4260 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var12[1]; // L: 4261 + } + + return 1; // L: 4263 + } + } else { + Coord var5; + if (var0 == 6618) { // L: 4265 + var14 = new Coord(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 4266 + var11 = MilliClock.getWorldMap().getCurrentMapArea(); // L: 4267 + if (var11 == null) { // L: 4268 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4269 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4270 + return 1; // L: 4271 + } else { + var5 = var11.coord(var14.x, var14.y); // L: 4273 + if (var5 == null) { // L: 4274 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4275 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.packed(); // L: 4278 + } + + return 1; // L: 4280 + } + } else { + Coord var10; + if (var0 == 6619) { // L: 4282 + class12.Interpreter_intStackSize -= 2; // L: 4283 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 4284 + var10 = new Coord(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]); // L: 4285 + FriendsList.method6449(var3, var10, false); // L: 4286 + return 1; // L: 4287 + } else if (var0 == 6620) { // L: 4289 + class12.Interpreter_intStackSize -= 2; // L: 4290 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 4291 + var10 = new Coord(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]); // L: 4292 + FriendsList.method6449(var3, var10, true); // L: 4293 + return 1; // L: 4294 + } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 4296 + class12.Interpreter_intStackSize -= 2; // L: 4297 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 4298 + var10 = new Coord(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]); // L: 4299 + var9 = MilliClock.getWorldMap().getMapArea(var3); // L: 4300 + if (var9 == null) { // L: 4301 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4302 + return 1; // L: 4303 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 4305 + return 1; // L: 4306 + } + } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 4308 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = MilliClock.getWorldMap().getDisplayWith(); // L: 4309 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = MilliClock.getWorldMap().getDisplayHeight(); // L: 4310 + return 1; // L: 4311 + } else if (var0 == 6623) { // L: 4313 + var14 = new Coord(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 4314 + var11 = MilliClock.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 4315 + if (var11 == null) { // L: 4316 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4317 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var11.getId(); // L: 4320 + } + + return 1; // L: 4322 + } else if (var0 == 6624) { // L: 4324 + MilliClock.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 4325 + return 1; // L: 4326 + } else if (var0 == 6625) { // L: 4328 + MilliClock.getWorldMap().resetMaxFlashCount(); // L: 4329 + return 1; // L: 4330 + } else if (var0 == 6626) { // L: 4332 + MilliClock.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 4333 + return 1; // L: 4334 + } else if (var0 == 6627) { // L: 4336 + MilliClock.getWorldMap().resetCyclesPerFlash(); // L: 4337 + return 1; // L: 4338 + } else { + boolean var13; + if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 4340 + var13 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 4341 + MilliClock.getWorldMap().setPerpetualFlash(var13); // L: 4342 + return 1; // L: 4343 + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 4345 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4346 + MilliClock.getWorldMap().flashElement(var3); // L: 4347 + return 1; // L: 4348 + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 4350 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4351 + MilliClock.getWorldMap().flashCategory(var3); // L: 4352 + return 1; // L: 4353 + } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 4355 + MilliClock.getWorldMap().stopCurrentFlashes(); // L: 4356 + return 1; // L: 4357 + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 4359 + var13 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 4360 + MilliClock.getWorldMap().setElementsDisabled(var13); // L: 4361 + return 1; // L: 4362 + } else { + boolean var7; + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 4364 + class12.Interpreter_intStackSize -= 2; // L: 4365 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 4366 + var7 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1] == 1; // L: 4367 + MilliClock.getWorldMap().disableElement(var3, var7); // L: 4368 + return 1; // L: 4369 + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 4371 + class12.Interpreter_intStackSize -= 2; // L: 4372 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 4373 + var7 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1] == 1; // L: 4374 + MilliClock.getWorldMap().setCategoryDisabled(var3, var7); // L: 4375 + return 1; // L: 4376 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 4378 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = MilliClock.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 4379 + return 1; // L: 4380 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 4382 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4383 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = MilliClock.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 4384 + return 1; // L: 4385 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 4387 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4388 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = MilliClock.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 4389 + return 1; // L: 4390 + } else if (var0 == 6638) { // L: 4392 + class12.Interpreter_intStackSize -= 2; // L: 4393 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 4394 + var10 = new Coord(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]); // L: 4395 + var5 = MilliClock.getWorldMap().method7076(var3, var10); // L: 4396 + if (var5 == null) { // L: 4397 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4398 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.packed(); // L: 4401 + } + + return 1; // L: 4403 + } else { + AbstractWorldMapIcon var6; + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 4405 + var6 = MilliClock.getWorldMap().iconStart(); // L: 4406 + if (var6 == null) { // L: 4407 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4408 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4409 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4412 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4413 + } + + return 1; // L: 4415 + } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 4417 + var6 = MilliClock.getWorldMap().iconNext(); // L: 4418 + if (var6 == null) { // L: 4419 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4420 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4421 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4424 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4425 + } + + return 1; // L: 4427 + } else { + WorldMapElement var4; + if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 4429 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4430 + var4 = class120.WorldMapElement_get(var3); // L: 4431 + if (var4.name == null) { // L: 4432 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 4433 + } else { + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.name; // L: 4436 + } + + return 1; // L: 4438 + } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 4440 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4441 + var4 = class120.WorldMapElement_get(var3); // L: 4442 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.textSize; // L: 4443 + return 1; // L: 4444 + } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 4446 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4447 + var4 = class120.WorldMapElement_get(var3); // L: 4448 + if (var4 == null) { // L: 4449 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4450 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.category; // L: 4453 + } + + return 1; // L: 4455 + } else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 4457 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4458 + var4 = class120.WorldMapElement_get(var3); // L: 4459 + if (var4 == null) { // L: 4460 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4461 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.sprite1; // L: 4464 + } + + return 1; // L: 4466 + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 4468 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class9.worldMapEvent.mapElement; // L: 4469 + return 1; // L: 4470 + } else if (var0 == 6698) { // L: 4472 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class9.worldMapEvent.coord1.packed(); // L: 4473 + return 1; // L: 4474 + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 4476 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class9.worldMapEvent.coord2.packed(); // L: 4477 + return 1; // L: 4478 + } else { + return 2; // L: 4480 + } + } + } + } + } + } + } + } + } + } } } diff --git a/runescape-client/src/main/java/class327.java b/runescape-client/src/main/java/class327.java index deb62d457a..8188f617a1 100644 --- a/runescape-client/src/main/java/class327.java +++ b/runescape-client/src/main/java/class327.java @@ -1,102 +1,42 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lb") +@ObfuscatedName("ls") public class class327 { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Llb;" + descriptor = "Lls;" ) - static final class327 field4044; - @ObfuscatedName("c") + static final class327 field4110; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Llb;" + descriptor = "Lls;" ) - static final class327 field4043; - @ObfuscatedName("i") + static final class327 field4108; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llb;" + descriptor = "Lls;" ) - static final class327 field4042; + static final class327 field4109; static { - field4044 = new class327(); // L: 4 - field4043 = new class327(); // L: 5 - field4042 = new class327(); // L: 6 + field4110 = new class327(); // L: 4 + field4108 = new class327(); // L: 5 + field4109 = new class327(); // L: 6 } class327() { } // L: 8 - @ObfuscatedName("v") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(CB)B", - garbageValue = "4" + descriptor = "(III)I", + garbageValue = "-1970190123" ) - @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) { - var1 = -111; // L: 26 - } 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 + static final int method5869(int var0, int var1) { + int var2 = var0 + var1 * 57; // L: 962 + var2 ^= var2 << 13; // L: 963 + int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; // L: 964 + return var3 >> 19 & 255; // L: 965 } } diff --git a/runescape-client/src/main/java/class329.java b/runescape-client/src/main/java/class329.java index 22e6c5fa4e..13c021e24e 100644 --- a/runescape-client/src/main/java/class329.java +++ b/runescape-client/src/main/java/class329.java @@ -1,18 +1,127 @@ 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("lm") +@ObfuscatedName("lu") public class class329 { - @ObfuscatedName("fa") - @ObfuscatedGetter( - intValue = 1869767523 - ) - @Export("currentPort") - static int currentPort; - static { new HashMap(); } // L: 9 + + @ObfuscatedName("hk") + @ObfuscatedSignature( + descriptor = "(IIZI)V", + garbageValue = "-1240601508" + ) + static final void method5875(int var0, int var1, boolean var2) { + if (!var2 || var0 != WorldMapSectionType.field2828 || class433.field4657 != var1) { // L: 5647 + WorldMapSectionType.field2828 = var0; // L: 5650 + class433.field4657 = var1; // L: 5651 + PendingSpawn.updateGameState(25); // L: 5652 + class259.drawLoadingMessage("Loading - please wait.", true); // L: 5653 + int var3 = SecureRandomCallable.baseX; // L: 5654 + int var4 = GrandExchangeOfferOwnWorldComparator.baseY; // L: 5655 + SecureRandomCallable.baseX = (var0 - 6) * 8; // L: 5656 + GrandExchangeOfferOwnWorldComparator.baseY = (var1 - 6) * 8; // L: 5657 + int var5 = SecureRandomCallable.baseX - var3; // L: 5658 + int var6 = GrandExchangeOfferOwnWorldComparator.baseY - var4; // L: 5659 + var3 = SecureRandomCallable.baseX; // L: 5660 + var4 = GrandExchangeOfferOwnWorldComparator.baseY; // L: 5661 + + int var7; + int var9; + int[] var10000; + for (var7 = 0; var7 < 32768; ++var7) { // L: 5662 + NPC var19 = Client.npcs[var7]; // L: 5663 + if (var19 != null) { // L: 5664 + for (var9 = 0; var9 < 10; ++var9) { // L: 5665 + var10000 = var19.pathX; // L: 5666 + var10000[var9] -= var5; + var10000 = var19.pathY; // L: 5667 + var10000[var9] -= var6; + } + + var19.x -= var5 * 128; // L: 5669 + var19.y -= var6 * 128; // L: 5670 + } + } + + for (var7 = 0; var7 < 2048; ++var7) { // L: 5673 + Player var22 = Client.players[var7]; // L: 5674 + if (var22 != null) { // L: 5675 + for (var9 = 0; var9 < 10; ++var9) { // L: 5676 + var10000 = var22.pathX; // L: 5677 + var10000[var9] -= var5; + var10000 = var22.pathY; // L: 5678 + var10000[var9] -= var6; + } + + var22.x -= var5 * 128; // L: 5680 + var22.y -= var6 * 128; // L: 5681 + } + } + + byte var20 = 0; // L: 5684 + byte var8 = 104; // L: 5685 + byte var21 = 1; // L: 5686 + if (var5 < 0) { // L: 5687 + var20 = 103; // L: 5688 + var8 = -1; // L: 5689 + var21 = -1; // L: 5690 + } + + byte var10 = 0; // L: 5692 + byte var11 = 104; // L: 5693 + byte var12 = 1; // L: 5694 + if (var6 < 0) { // L: 5695 + var10 = 103; // L: 5696 + var11 = -1; // L: 5697 + var12 = -1; // L: 5698 + } + + int var14; + for (int var13 = var20; var8 != var13; var13 += var21) { // L: 5700 + for (var14 = var10; var14 != var11; var14 += var12) { // L: 5701 + int var15 = var13 + var5; // L: 5702 + int var16 = var14 + var6; // L: 5703 + + for (int var17 = 0; var17 < 4; ++var17) { // L: 5704 + if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { + Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 5705 + } else { + Client.groundItems[var17][var13][var14] = null; // L: 5706 + } + } + } + } + + for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5710 5711 5715 + var18.x -= var5; // L: 5712 + var18.y -= var6; // L: 5713 + if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 5714 + var18.remove(); + } + } + + if (Client.destinationX != 0) { // L: 5717 + Client.destinationX -= var5; // L: 5718 + Client.destinationY -= var6; // L: 5719 + } + + Client.soundEffectCount = 0; // L: 5721 + Client.isCameraLocked = false; // L: 5722 + class343.cameraX -= var5 << 7; // L: 5723 + FaceNormal.cameraZ -= var6 << 7; // L: 5724 + HorizontalAlignment.oculusOrbFocalPointX -= var5 << 7; // L: 5725 + class28.oculusOrbFocalPointY -= var6 << 7; // L: 5726 + Client.field515 = -1; // L: 5727 + Client.graphicsObjects.clear(); // L: 5728 + Client.projectiles.clear(); // L: 5729 + + for (var14 = 0; var14 < 4; ++var14) { // L: 5730 + Client.collisionMaps[var14].clear(); + } + + } + } // L: 5648 5731 } diff --git a/runescape-client/src/main/java/class33.java b/runescape-client/src/main/java/class33.java new file mode 100644 index 0000000000..843552df4b --- /dev/null +++ b/runescape-client/src/main/java/class33.java @@ -0,0 +1,231 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("az") +public class class33 { + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Llo;" + ) + @Export("reflectionChecks") + public static IterableNodeDeque reflectionChecks; + + static { + reflectionChecks = new IterableNodeDeque(); // L: 17 + } + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(ILbb;ZI)I", + garbageValue = "525584260" + ) + static int method592(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3917 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = ClientPreferences.loadWorlds() ? 1 : 0; // L: 3918 + return 1; // L: 3919 + } else { + World var9; + if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3921 + var9 = ClientPreferences.worldListStart(); // L: 3922 + if (var9 != null) { // L: 3923 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var9.id; // L: 3924 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var9.properties; // L: 3925 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var9.activity; // L: 3926 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var9.location; // L: 3927 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var9.population; // L: 3928 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var9.host; // L: 3929 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3932 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3933 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3934 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3935 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3936 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3937 + } + + return 1; // L: 3939 + } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3941 + var9 = class146.getNextWorldListWorld(); // L: 3942 + if (var9 != null) { // L: 3943 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var9.id; // L: 3944 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var9.properties; // L: 3945 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var9.activity; // L: 3946 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var9.location; // L: 3947 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var9.population; // L: 3948 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var9.host; // L: 3949 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3952 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3953 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3954 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3955 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3956 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3957 + } + + return 1; // L: 3959 + } else { + int var3; + World var7; + int var8; + if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3961 + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3962 + var7 = null; // L: 3963 + + for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3964 + if (var3 == World.World_worlds[var8].id) { // L: 3965 + var7 = World.World_worlds[var8]; // L: 3966 + break; + } + } + + if (var7 != null) { // L: 3970 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.id; // L: 3971 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.properties; // L: 3972 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var7.activity; // L: 3973 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.location; // L: 3974 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.population; // L: 3975 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var7.host; // L: 3976 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3979 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3980 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3981 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3982 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3983 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3984 + } + + return 1; // L: 3986 + } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3988 + class12.Interpreter_intStackSize -= 4; // L: 3989 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3990 + boolean var10 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1] == 1; // L: 3991 + var8 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 3992 + boolean var6 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 3] == 1; // L: 3993 + GraphicsDefaults.sortWorldList(var3, var10, var8, var6); // L: 3994 + return 1; // L: 3995 + } else if (var0 != 6511) { // L: 3997 + if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 4018 + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 4019 + return 1; // L: 4020 + } else { + int var4; + ParamComposition var5; + if (var0 == ScriptOpcodes.NC_PARAM) { // L: 4022 + class12.Interpreter_intStackSize -= 2; // L: 4023 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 4024 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 4025 + var5 = class78.getParamDefinition(var4); // L: 4026 + if (var5.isString()) { // L: 4027 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = WorldMapSectionType.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 4028 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = WorldMapSectionType.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 4031 + } + + return 1; // L: 4033 + } else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 4035 + class12.Interpreter_intStackSize -= 2; // L: 4036 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 4037 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 4038 + var5 = class78.getParamDefinition(var4); // L: 4039 + if (var5.isString()) { // L: 4040 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = class82.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 4041 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class82.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 4044 + } + + return 1; // L: 4046 + } else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 4048 + class12.Interpreter_intStackSize -= 2; // L: 4049 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 4050 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 4051 + var5 = class78.getParamDefinition(var4); // L: 4052 + if (var5.isString()) { // L: 4053 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = FileSystem.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 4054 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FileSystem.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 4057 + } + + return 1; // L: 4059 + } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 4061 + class12.Interpreter_intStackSize -= 2; // L: 4062 + var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 4063 + var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 4064 + var5 = class78.getParamDefinition(var4); // L: 4065 + if (var5.isString()) { // L: 4066 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = class401.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 4067 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class401.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 4070 + } + + return 1; // L: 4072 + } else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 4074 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 4075 + return 1; // L: 4076 + } else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 4078 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.clientType; // L: 4079 + return 1; // L: 4080 + } else if (var0 == 6520) { // L: 4082 + return 1; // L: 4083 + } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 4085 + return 1; // L: 4086 + } else if (var0 == 6522) { // L: 4088 + --class9.Interpreter_stringStackSize; // L: 4089 + --class12.Interpreter_intStackSize; // L: 4090 + return 1; // L: 4091 + } else if (var0 == 6523) { // L: 4093 + --class9.Interpreter_stringStackSize; // L: 4094 + --class12.Interpreter_intStackSize; // L: 4095 + return 1; // L: 4096 + } else if (var0 == ScriptOpcodes.MOBILE_BATTERYLEVEL) { // L: 4098 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4099 + return 1; // L: 4100 + } else if (var0 == ScriptOpcodes.MOBILE_BATTERYCHARGING) { // L: 4102 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 4103 + return 1; // L: 4104 + } else if (var0 == ScriptOpcodes.MOBILE_WIFIAVAILABLE) { // L: 4106 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 4107 + return 1; // L: 4108 + } else if (var0 == 6527) { // L: 4110 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.field486; // L: 4111 + return 1; // L: 4112 + } else { + return 2; // L: 4114 + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3998 + if (var3 >= 0 && var3 < World.World_count) { // L: 3999 + var7 = World.World_worlds[var3]; // L: 4000 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.id; // L: 4001 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.properties; // L: 4002 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var7.activity; // L: 4003 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.location; // L: 4004 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.population; // L: 4005 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var7.host; // L: 4006 + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4009 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4010 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 4011 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4012 + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4013 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 4014 + } + + return 1; // L: 4016 + } + } + } + } + + @ObfuscatedName("jt") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "368469089" + ) + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { + Client.tapToDrop = var0; // L: 11196 + } // L: 11197 +} diff --git a/runescape-client/src/main/java/class340.java b/runescape-client/src/main/java/class340.java index 3e62ea0c9d..273c6123df 100644 --- a/runescape-client/src/main/java/class340.java +++ b/runescape-client/src/main/java/class340.java @@ -1,18 +1,7 @@ -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mk") +@ObfuscatedName("mi") public final class class340 { - @ObfuscatedName("v") - final Object field4096; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 1768359201 - ) - int field4095; - - class340(Object var1, int var2) { - this.field4096 = var1; // L: 158 - this.field4095 = var2; // L: 159 - } // L: 160 + @ObfuscatedName("y") + public static short[] field4156; } diff --git a/runescape-client/src/main/java/class341.java b/runescape-client/src/main/java/class341.java index 1d01bcfc27..a80e55320a 100644 --- a/runescape-client/src/main/java/class341.java +++ b/runescape-client/src/main/java/class341.java @@ -1,429 +1,30 @@ -import java.util.ConcurrentModificationException; -import java.util.Iterator; -import java.util.NoSuchElementException; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mq") -public class class341 implements Iterator { - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lco;" - ) - @Export("loginScreenRunesAnimation") - static LoginScreenAnimation loginScreenRunesAnimation; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lmn;" - ) - class342 field4102; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1686021093 - ) - int field4099; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 2018103079 - ) - int field4100; +@ObfuscatedName("ms") +public class class341 { + @ObfuscatedName("o") + @Export("cp1252AsciiExtension") + public static final char[] cp1252AsciiExtension; - @ObfuscatedSignature( - descriptor = "(Lmn;)V" - ) - class341(class342 var1) { - this.field4099 = 0; // L: 165 - this.field4100 = this.field4102.field4108; // L: 166 - this.field4102 = var1; // L: 169 - } // L: 170 - - public boolean hasNext() { - return this.field4099 < this.field4102.field4106; // L: 173 + static { + cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4 } - public void remove() { - throw new UnsupportedOperationException(); // L: 187 - } - - public Object next() { - if (this.field4102.field4108 != this.field4100) { // L: 177 - throw new ConcurrentModificationException(); - } else if (this.field4099 < this.field4102.field4106) { // L: 178 - Object var1 = this.field4102.field4104[this.field4099].field4096; // L: 179 - ++this.field4099; // L: 180 - return var1; // L: 181 - } else { - throw new NoSuchElementException(); // L: 183 - } - } - - @ObfuscatedName("c") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "968220447" + descriptor = "(FFFF[FB)V", + garbageValue = "1" ) - static int method6280(int var0, int var1, int var2) { - return var0 << 28 | var1 << 14 | var2; // L: 34 - } - - @ObfuscatedName("im") - @ObfuscatedSignature( - descriptor = "(Lcz;IILgm;I)V", - garbageValue = "214021877" - ) - static final void method6279(Player var0, int var1, int var2, class193 var3) { - int var4 = var0.pathX[0]; // L: 8351 - int var5 = var0.pathY[0]; // L: 8352 - int var6 = var0.transformedSize(); // L: 8353 - if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { // L: 8354 - if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { // L: 8355 - int var8 = var0.transformedSize(); // L: 8357 - RouteStrategy var9 = UserComparator10.method2623(var1, var2); // L: 8358 - CollisionMap var10 = Client.collisionMaps[var0.plane]; // L: 8359 - int[] var11 = Client.field784; // L: 8360 - int[] var12 = Client.field785; // L: 8361 - - int var13; - int var14; - for (var13 = 0; var13 < 128; ++var13) { // L: 8363 - for (var14 = 0; var14 < 128; ++var14) { // L: 8364 - class194.directions[var13][var14] = 0; // L: 8365 - class194.distances[var13][var14] = 99999999; // L: 8366 - } - } - - int var15; - int var16; - byte var18; - int var19; - int var20; - int var22; - int var24; - int var25; - int var26; - int var27; - boolean var33; - int var35; - int var36; - int var38; - if (var8 == 1) { // L: 8370 - var33 = class29.method404(var4, var5, var9, var10); - } else if (var8 == 2) { // L: 8371 - var33 = Calendar.method5507(var4, var5, var9, var10); - } else { - var15 = var4; // L: 8375 - var16 = var5; // L: 8376 - byte var17 = 64; // L: 8377 - var18 = 64; // L: 8378 - var19 = var4 - var17; // L: 8379 - var20 = var5 - var18; // L: 8380 - class194.directions[var17][var18] = 99; // L: 8381 - class194.distances[var17][var18] = 0; // L: 8382 - byte var21 = 0; // L: 8383 - var22 = 0; // L: 8384 - class194.bufferX[var21] = var4; // L: 8385 - var38 = var21 + 1; - class194.bufferY[var21] = var5; // L: 8386 - int[][] var23 = var10.flags; // L: 8387 - - boolean var34; - label496: - while (true) { - label494: - while (true) { - do { - do { - do { - label471: - do { - if (var38 == var22) { // L: 8388 - HealthBarUpdate.field1189 = var15; // L: 8508 - StructComposition.field1988 = var16; // L: 8509 - var34 = false; // L: 8510 - break label496; - } - - var15 = class194.bufferX[var22]; // L: 8389 - var16 = class194.bufferY[var22]; // L: 8390 - var22 = var22 + 1 & 4095; // L: 8391 - var35 = var15 - var19; // L: 8392 - var36 = var16 - var20; // L: 8393 - var24 = var15 - var10.xInset; // L: 8394 - var25 = var16 - var10.yInset; // L: 8395 - if (var9.hasArrived(var8, var15, var16, var10)) { // L: 8396 - HealthBarUpdate.field1189 = var15; // L: 8397 - StructComposition.field1988 = var16; // L: 8398 - var34 = true; // L: 8399 - break label496; - } - - var26 = class194.distances[var35][var36] + 1; // L: 8402 - if (var35 > 0 && class194.directions[var35 - 1][var36] == 0 && (var23[var24 - 1][var25] & 19136782) == 0 && (var23[var24 - 1][var8 + var25 - 1] & 19136824) == 0) { // L: 8403 8404 8405 8406 - var27 = 1; - - while (true) { - if (var27 >= var8 - 1) { - class194.bufferX[var38] = var15 - 1; // L: 8410 - class194.bufferY[var38] = var16; // L: 8411 - var38 = var38 + 1 & 4095; // L: 8412 - class194.directions[var35 - 1][var36] = 2; // L: 8413 - class194.distances[var35 - 1][var36] = var26; // L: 8414 - break; - } - - if ((var23[var24 - 1][var27 + var25] & 19136830) != 0) { // L: 8408 - break; - } - - ++var27; // L: 8407 - } - } - - if (var35 < 128 - var8 && class194.directions[var35 + 1][var36] == 0 && (var23[var24 + var8][var25] & 19136899) == 0 && (var23[var24 + var8][var8 + var25 - 1] & 19136992) == 0) { // L: 8416 8417 8418 8419 - var27 = 1; - - while (true) { - if (var27 >= var8 - 1) { - class194.bufferX[var38] = var15 + 1; // L: 8423 - class194.bufferY[var38] = var16; // L: 8424 - var38 = var38 + 1 & 4095; // L: 8425 - class194.directions[var35 + 1][var36] = 8; // L: 8426 - class194.distances[var35 + 1][var36] = var26; // L: 8427 - break; - } - - if ((var23[var24 + var8][var27 + var25] & 19136995) != 0) { // L: 8421 - break; - } - - ++var27; // L: 8420 - } - } - - if (var36 > 0 && class194.directions[var35][var36 - 1] == 0 && (var23[var24][var25 - 1] & 19136782) == 0 && (var23[var24 + var8 - 1][var25 - 1] & 19136899) == 0) { // L: 8429 8430 8431 8432 - var27 = 1; - - while (true) { - if (var27 >= var8 - 1) { - class194.bufferX[var38] = var15; // L: 8436 - class194.bufferY[var38] = var16 - 1; // L: 8437 - var38 = var38 + 1 & 4095; // L: 8438 - class194.directions[var35][var36 - 1] = 1; // L: 8439 - class194.distances[var35][var36 - 1] = var26; // L: 8440 - break; - } - - if ((var23[var27 + var24][var25 - 1] & 19136911) != 0) { // L: 8434 - break; - } - - ++var27; // L: 8433 - } - } - - if (var36 < 128 - var8 && class194.directions[var35][var36 + 1] == 0 && (var23[var24][var8 + var25] & 19136824) == 0 && (var23[var8 + var24 - 1][var25 + var8] & 19136992) == 0) { // L: 8442 8443 8444 8445 - var27 = 1; - - while (true) { - if (var27 >= var8 - 1) { - class194.bufferX[var38] = var15; // L: 8449 - class194.bufferY[var38] = var16 + 1; // L: 8450 - var38 = var38 + 1 & 4095; // L: 8451 - class194.directions[var35][var36 + 1] = 4; // L: 8452 - class194.distances[var35][var36 + 1] = var26; // L: 8453 - break; - } - - if ((var23[var27 + var24][var8 + var25] & 19137016) != 0) { // L: 8447 - break; - } - - ++var27; // L: 8446 - } - } - - if (var35 > 0 && var36 > 0 && class194.directions[var35 - 1][var36 - 1] == 0 && (var23[var24 - 1][var25 - 1] & 19136782) == 0) { // L: 8455 8456 8457 - var27 = 1; - - while (true) { - if (var27 >= var8) { - class194.bufferX[var38] = var15 - 1; // L: 8462 - class194.bufferY[var38] = var16 - 1; // L: 8463 - var38 = var38 + 1 & 4095; // L: 8464 - class194.directions[var35 - 1][var36 - 1] = 3; // L: 8465 - class194.distances[var35 - 1][var36 - 1] = var26; // L: 8466 - break; - } - - if ((var23[var24 - 1][var27 + (var25 - 1)] & 19136830) != 0 || (var23[var27 + (var24 - 1)][var25 - 1] & 19136911) != 0) { // L: 8459 8460 - break; - } - - ++var27; // L: 8458 - } - } - - if (var35 < 128 - var8 && var36 > 0 && class194.directions[var35 + 1][var36 - 1] == 0 && (var23[var24 + var8][var25 - 1] & 19136899) == 0) { // L: 8468 8469 8470 - var27 = 1; - - while (true) { - if (var27 >= var8) { - class194.bufferX[var38] = var15 + 1; // L: 8475 - class194.bufferY[var38] = var16 - 1; // L: 8476 - var38 = var38 + 1 & 4095; // L: 8477 - class194.directions[var35 + 1][var36 - 1] = 9; // L: 8478 - class194.distances[var35 + 1][var36 - 1] = var26; // L: 8479 - break; - } - - if ((var23[var8 + var24][var27 + (var25 - 1)] & 19136995) != 0 || (var23[var24 + var27][var25 - 1] & 19136911) != 0) { // L: 8472 8473 - break; - } - - ++var27; // L: 8471 - } - } - - if (var35 > 0 && var36 < 128 - var8 && class194.directions[var35 - 1][var36 + 1] == 0 && (var23[var24 - 1][var8 + var25] & 19136824) == 0) { // L: 8481 8482 8483 - for (var27 = 1; var27 < var8; ++var27) { // L: 8484 - if ((var23[var24 - 1][var27 + var25] & 19136830) != 0 || (var23[var27 + (var24 - 1)][var25 + var8] & 19137016) != 0) { // L: 8485 8486 - continue label471; - } - } - - class194.bufferX[var38] = var15 - 1; // L: 8488 - class194.bufferY[var38] = var16 + 1; // L: 8489 - var38 = var38 + 1 & 4095; // L: 8490 - class194.directions[var35 - 1][var36 + 1] = 6; // L: 8491 - class194.distances[var35 - 1][var36 + 1] = var26; // L: 8492 - } - } while(var35 >= 128 - var8); // L: 8494 - } while(var36 >= 128 - var8); - } while(class194.directions[var35 + 1][var36 + 1] != 0); // L: 8495 - } while((var23[var8 + var24][var25 + var8] & 19136992) != 0); // L: 8496 - - for (var27 = 1; var27 < var8; ++var27) { // L: 8497 - if ((var23[var24 + var27][var25 + var8] & 19137016) != 0 || (var23[var8 + var24][var25 + var27] & 19136995) != 0) { // L: 8498 8499 - continue label494; - } - } - - class194.bufferX[var38] = var15 + 1; // L: 8501 - class194.bufferY[var38] = var16 + 1; // L: 8502 - var38 = var38 + 1 & 4095; // L: 8503 - class194.directions[var35 + 1][var36 + 1] = 12; // L: 8504 - class194.distances[var35 + 1][var36 + 1] = var26; // L: 8505 - } - } - - var33 = var34; // L: 8512 - } - - int var7; - label542: { - var14 = var4 - 64; // L: 8514 - var15 = var5 - 64; // L: 8515 - var16 = HealthBarUpdate.field1189; // L: 8516 - var35 = StructComposition.field1988; // L: 8517 - if (!var33) { // L: 8518 - var36 = Integer.MAX_VALUE; // L: 8520 - var19 = Integer.MAX_VALUE; // L: 8521 - byte var37 = 10; // L: 8522 - var38 = var9.approxDestinationX; // L: 8523 - var22 = var9.approxDestinationY; // L: 8524 - int var32 = var9.approxDestinationSizeX; // L: 8525 - var24 = var9.approxDestinationSizeY; // L: 8526 - - for (var25 = var38 - var37; var25 <= var38 + var37; ++var25) { // L: 8527 - for (var26 = var22 - var37; var26 <= var22 + var37; ++var26) { // L: 8528 - var27 = var25 - var14; // L: 8529 - int var28 = var26 - var15; // L: 8530 - if (var27 >= 0 && var28 >= 0 && var27 < 128 && var28 < 128 && class194.distances[var27][var28] < 100) { // L: 8531 8532 - int var29 = 0; // L: 8533 - if (var25 < var38) { // L: 8534 - var29 = var38 - var25; - } else if (var25 > var32 + var38 - 1) { // L: 8535 - var29 = var25 - (var38 + var32 - 1); - } - - int var30 = 0; // L: 8536 - if (var26 < var22) { // L: 8537 - var30 = var22 - var26; - } else if (var26 > var24 + var22 - 1) { // L: 8538 - var30 = var26 - (var24 + var22 - 1); - } - - int var31 = var29 * var29 + var30 * var30; // L: 8539 - if (var31 < var36 || var31 == var36 && class194.distances[var27][var28] < var19) { // L: 8540 - var36 = var31; // L: 8541 - var19 = class194.distances[var27][var28]; // L: 8542 - var16 = var25; // L: 8543 - var35 = var26; // L: 8544 - } - } - } - } - - if (var36 == Integer.MAX_VALUE) { // L: 8550 - var7 = -1; // L: 8551 - break label542; - } - } - - if (var16 == var4 && var5 == var35) { // L: 8560 - var11[0] = var16; // L: 8561 - var12[0] = var35; // L: 8562 - var7 = 0; // L: 8563 - } else { - var18 = 0; // L: 8566 - class194.bufferX[var18] = var16; // L: 8569 - var36 = var18 + 1; - class194.bufferY[var18] = var35; // L: 8570 - - for (var19 = var20 = class194.directions[var16 - var14][var35 - var15]; var4 != var16 || var5 != var35; var19 = class194.directions[var16 - var14][var35 - var15]) { // L: 8571 8572 8582 - if (var19 != var20) { // L: 8573 - var20 = var19; // L: 8574 - class194.bufferX[var36] = var16; // L: 8575 - class194.bufferY[var36++] = var35; // L: 8576 - } - - if ((var19 & 2) != 0) { // L: 8578 - ++var16; - } else if ((var19 & 8) != 0) { // L: 8579 - --var16; - } - - if ((var19 & 1) != 0) { // L: 8580 - ++var35; - } else if ((var19 & 4) != 0) { // L: 8581 - --var35; - } - } - - var38 = 0; // L: 8584 - - while (var36-- > 0) { // L: 8585 - var11[var38] = class194.bufferX[var36]; // L: 8586 - var12[var38++] = class194.bufferY[var36]; // L: 8587 - if (var38 >= var11.length) { // L: 8588 - break; - } - } - - var7 = var38; // L: 8590 - } - } - - var13 = var7; // L: 8592 - if (var7 >= 1) { // L: 8593 - for (var14 = 0; var14 < var13 - 1; ++var14) { // L: 8594 - var0.method2127(Client.field784[var14], Client.field785[var14], var3); - } - - } - } - } - } // L: 8595 + static void method6090(float var0, float var1, float var2, float var3, float[] var4) { + float var5 = var1 - var0; // L: 321 + float var6 = var2 - var1; // L: 322 + float var7 = var3 - var2; // L: 323 + float var8 = var6 - var5; // L: 324 + var4[3] = var7 - var6 - var8; // L: 325 + var4[2] = var8 + var8 + var8; // L: 326 + var4[1] = var5 + var5 + var5; // L: 327 + var4[0] = var0; // L: 328 + } // L: 329 } diff --git a/runescape-client/src/main/java/class342.java b/runescape-client/src/main/java/class342.java index c803460463..7e57a6192c 100644 --- a/runescape-client/src/main/java/class342.java +++ b/runescape-client/src/main/java/class342.java @@ -1,263 +1,167 @@ -import java.util.AbstractQueue; -import java.util.Arrays; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mn") -public class class342 extends AbstractQueue { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "[Lmk;" - ) - class340[] field4104; - @ObfuscatedName("c") - Map field4105; - @ObfuscatedName("i") +@ObfuscatedName("ml") +public class class342 { + @ObfuscatedName("o") + static char[] field4158; + @ObfuscatedName("q") + static char[] field4161; + @ObfuscatedName("l") + static char[] field4160; + @ObfuscatedName("k") + static int[] field4159; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -609081385 + intValue = -1886529381 ) - int field4106; - @ObfuscatedName("f") - final Comparator field4107; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -1292007073 - ) - int field4108; + static int field4162; - public class342(int var1, Comparator var2) { - this.field4108 = 0; // L: 10 - this.field4104 = new class340[var1]; // L: 17 - this.field4105 = new HashMap(); // L: 18 - this.field4107 = var2; // L: 19 - } // L: 20 + static { + field4158 = new char[64]; // L: 7 - public class342(int var1) { - this(var1, (Comparator)null); // L: 13 - } // L: 14 + int var0; + for (var0 = 0; var0 < 26; ++var0) { // L: 8 + field4158[var0] = (char)(var0 + 65); + } - @ObfuscatedName("v") + for (var0 = 26; var0 < 52; ++var0) { // L: 9 + field4158[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { // L: 10 + field4158[var0] = (char)(var0 + 48 - 52); + } + + field4158[62] = '+'; // L: 11 + field4158[63] = '/'; // L: 12 + field4161 = new char[64]; // L: 18 + + for (var0 = 0; var0 < 26; ++var0) { // L: 19 + field4161[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { // L: 20 + field4161[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { // L: 21 + field4161[var0] = (char)(var0 + 48 - 52); + } + + field4161[62] = '*'; // L: 22 + field4161[63] = '-'; // L: 23 + field4160 = new char[64]; // L: 29 + + for (var0 = 0; var0 < 26; ++var0) { // L: 30 + field4160[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { // L: 31 + field4160[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { // L: 32 + field4160[var0] = (char)(var0 + 48 - 52); + } + + field4160[62] = '-'; // L: 33 + field4160[63] = '_'; // L: 34 + field4159 = new int[128]; // L: 40 + + for (var0 = 0; var0 < field4159.length; ++var0) { // L: 41 + field4159[var0] = -1; + } + + for (var0 = 65; var0 <= 90; ++var0) { // L: 42 + field4159[var0] = var0 - 65; + } + + for (var0 = 97; var0 <= 122; ++var0) { // L: 43 + field4159[var0] = var0 - 97 + 26; + } + + for (var0 = 48; var0 <= 57; ++var0) { // L: 44 + field4159[var0] = var0 - 48 + 52; + } + + int[] var2 = field4159; // L: 45 + field4159[43] = 62; // L: 46 + var2[42] = 62; // L: 47 + int[] var1 = field4159; // L: 48 + field4159[47] = 63; // L: 49 + var1[45] = 63; // L: 50 + } // L: 51 + + @ObfuscatedName("kh") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1379999236" + descriptor = "([Lki;II)V", + garbageValue = "-1118405651" ) - void method6297() { - int var1 = (this.field4104.length << 1) + 1; // L: 23 - this.field4104 = (class340[])((class340[])Arrays.copyOf(this.field4104, var1)); // L: 24 - } // L: 25 + @Export("drawModelComponents") + static final void drawModelComponents(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11985 + Widget var3 = var0[var2]; // L: 11986 + if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !class434.isComponentHidden(var3))) { // L: 11987 11988 11989 + int var5; + if (var3.type == 0) { // L: 11990 + if (!var3.isIf3 && class434.isComponentHidden(var3) && var3 != class144.mousedOverWidgetIf1) { // L: 11991 + continue; + } - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-54903220" - ) - void method6285(int var1) { - class340 var2; - int var3; - for (var2 = this.field4104[var1]; var1 > 0; var1 = var3) { // L: 89 90 101 - var3 = var1 - 1 >>> 1; // L: 91 - class340 var4 = this.field4104[var3]; // L: 92 - if (this.field4107 != null) { // L: 93 - if (this.field4107.compare(var2.field4096, var4.field4096) >= 0) { // L: 94 - break; - } - } else if (((Comparable)var2.field4096).compareTo(var4.field4096) >= 0) { // L: 97 - break; - } + drawModelComponents(var0, var3.id); // L: 11992 + if (var3.children != null) { // L: 11993 + drawModelComponents(var3.children, var3.id); + } - this.field4104[var1] = var4; // L: 99 - this.field4104[var1].field4095 = var1; // L: 100 - } - - this.field4104[var1] = var2; // L: 103 - this.field4104[var1].field4095 = var1; // L: 104 - } // L: 105 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "45" - ) - void method6309(int var1) { - class340 var2 = this.field4104[var1]; // L: 108 - - int var8; - for (int var3 = this.field4106 >>> 1; var1 < var3; var1 = var8) { // L: 109 110 132 - int var4 = (var1 << 1) + 1; // L: 111 - class340 var5 = this.field4104[var4]; // L: 112 - int var6 = (var1 << 1) + 2; // L: 113 - class340 var7 = this.field4104[var6]; // L: 114 - if (this.field4107 != null) { // L: 116 - if (var6 < this.field4106 && this.field4107.compare(var5.field4096, var7.field4096) > 0) { // L: 117 - var8 = var6; - } else { - var8 = var4; // L: 118 - } - } else if (var6 < this.field4106 && ((Comparable)var5.field4096).compareTo(var7.field4096) > 0) { // L: 121 - var8 = var6; - } else { - var8 = var4; // L: 122 - } - - if (this.field4107 != null) { // L: 124 - if (this.field4107.compare(var2.field4096, this.field4104[var8].field4096) <= 0) { // L: 125 - break; - } - } else if (((Comparable)var2.field4096).compareTo(this.field4104[var8].field4096) <= 0) { // L: 128 - break; - } - - this.field4104[var1] = this.field4104[var8]; // L: 130 - this.field4104[var1].field4095 = var1; // L: 131 - } - - this.field4104[var1] = var2; // L: 134 - this.field4104[var1].field4095 = var1; // L: 135 - } // L: 136 - - public boolean remove(Object var1) { - class340 var2 = (class340)this.field4105.remove(var1); // L: 71 - if (var2 == null) { // L: 72 - return false; - } else { - ++this.field4108; // L: 73 - --this.field4106; // L: 74 - if (var2.field4095 == this.field4106) { // L: 75 - this.field4104[this.field4106] = null; // L: 76 - return true; // L: 77 - } else { - class340 var3 = this.field4104[this.field4106]; // L: 79 - this.field4104[this.field4106] = null; // L: 80 - this.field4104[var2.field4095] = var3; // L: 81 - this.field4104[var2.field4095].field4095 = var2.field4095; // L: 82 - this.method6309(var2.field4095); // L: 83 - if (var3 == this.field4104[var2.field4095]) { // L: 84 - this.method6285(var2.field4095); + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11994 + if (var4 != null) { // L: 11995 + var5 = var4.group; // L: 11996 + if (WorldMapDecoration.loadInterface(var5)) { // L: 11998 + drawModelComponents(NetSocket.Widget_interfaceComponents[var5], -1); // L: 11999 + } + } } - return true; // L: 85 - } - } - } + if (var3.type == 6) { // L: 12003 + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 12004 + boolean var7 = class401.runCs1(var3); // L: 12005 + if (var7) { // L: 12007 + var5 = var3.sequenceId2; + } else { + var5 = var3.sequenceId; // L: 12008 + } - public Object peek() { - return this.field4106 == 0 ? null : this.field4104[0].field4096; // L: 50 51 - } + if (var5 != -1) { // L: 12009 + SequenceDefinition var6 = class114.SequenceDefinition_get(var5); // L: 12010 - public Object[] toArray() { - Object[] var1 = super.toArray(); // L: 143 - if (this.field4107 != null) { - Arrays.sort(var1, this.field4107); // L: 144 - } else { - Arrays.sort(var1); // L: 145 - } + for (var3.modelFrameCycle += Client.field727; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3)) { // L: 12011 12012 12019 + var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 12013 + ++var3.modelFrame; // L: 12014 + if (var3.modelFrame >= var6.frameIds.length) { // L: 12015 + var3.modelFrame -= var6.frameCount; // L: 12016 + if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 12017 + var3.modelFrame = 0; + } + } + } + } + } - return var1; // L: 146 - } - - public Object poll() { - if (this.field4106 == 0) { // L: 55 - return null; - } else { - ++this.field4108; // L: 56 - Object var1 = this.field4104[0].field4096; // L: 57 - this.field4105.remove(var1); // L: 58 - --this.field4106; // L: 59 - if (this.field4106 == 0) { - this.field4104[this.field4106] = null; // L: 60 - } else { - this.field4104[0] = this.field4104[this.field4106]; // L: 62 - this.field4104[0].field4095 = 0; // L: 63 - this.field4104[this.field4106] = null; // L: 64 - this.method6309(0); // L: 65 - } - - return var1; // L: 67 - } - } - - public int size() { - return this.field4106; // L: 28 - } - - public Iterator iterator() { - return new class341(this); // L: 150 - } - - public boolean offer(Object var1) { - if (this.field4105.containsKey(var1)) { // L: 32 - throw new IllegalArgumentException(""); - } else { - ++this.field4108; // L: 33 - int var2 = this.field4106; // L: 34 - if (var2 >= this.field4104.length) { // L: 35 - this.method6297(); - } - - ++this.field4106; // L: 36 - if (var2 == 0) { // L: 37 - this.field4104[0] = new class340(var1, 0); // L: 38 - this.field4105.put(var1, this.field4104[0]); // L: 39 - } else { - this.field4104[var2] = new class340(var1, var2); // L: 42 - this.field4105.put(var1, this.field4104[var2]); // L: 43 - this.method6285(var2); // L: 44 - } - - return true; // L: 46 - } - } - - public boolean contains(Object var1) { - return this.field4105.containsKey(var1); // L: 139 - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(II)Ldo;", - garbageValue = "901392143" - ) - static class122 method6314(int var0) { - class122 var1 = (class122)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var0); // L: 339 - if (var1 != null) { // L: 340 - return var1; - } else { - AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; // L: 342 - AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive; // L: 343 - boolean var5 = true; // L: 345 - byte[] var6 = var3.takeFile(var0 >> 16 & 65535, var0 & 65535); // L: 346 - class122 var2; - if (var6 == null) { // L: 347 - var5 = false; // L: 348 - var2 = null; // L: 349 - } else { - int var7 = (var6[1] & 255) << 8 | var6[2] & 255; // L: 352 - byte[] var8 = var4.getFile(var7, 0); // L: 355 - if (var8 == null) { // L: 356 - var5 = false; - } - - if (!var5) { // L: 357 - var2 = null; // L: 358 - } else { - try { - var2 = new class122(var3, var4, var0, false); // L: 362 - } catch (Exception var10) { // L: 364 - var2 = null; // L: 365 + if (var3.field3451 != 0 && !var3.isIf3) { // L: 12023 + int var8 = var3.field3451 >> 16; // L: 12024 + var5 = var3.field3451 << 16 >> 16; // L: 12025 + var8 *= Client.field727; // L: 12026 + var5 *= Client.field727; // L: 12027 + var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 12028 + var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 12029 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 12030 } } } - - if (var2 != null) { // L: 369 - SequenceDefinition.SequenceDefinition_cachedModel.put(var2, (long)var0); - } - - return var2; // L: 370 } - } + + } // L: 12034 } diff --git a/runescape-client/src/main/java/class343.java b/runescape-client/src/main/java/class343.java new file mode 100644 index 0000000000..8c447376d2 --- /dev/null +++ b/runescape-client/src/main/java/class343.java @@ -0,0 +1,124 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mt") +public final class class343 { + @ObfuscatedName("ja") + @ObfuscatedGetter( + intValue = -1471582955 + ) + @Export("cameraX") + static int cameraX; + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1487973043" + ) + public static int method6137(int var0, int var1) { + int var2; + if (var1 > var0) { // L: 35 + var2 = var0; // L: 36 + var0 = var1; // L: 37 + var1 = var2; // L: 38 + } + + while (var1 != 0) { // L: 40 + var2 = var0 % var1; // L: 41 + var0 = var1; // L: 42 + var1 = var2; // L: 43 + } + + return var0; // L: 45 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(CLlq;I)C", + garbageValue = "-41366365" + ) + @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/class344.java b/runescape-client/src/main/java/class344.java new file mode 100644 index 0000000000..e64da6d71c --- /dev/null +++ b/runescape-client/src/main/java/class344.java @@ -0,0 +1,19 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mv") +public class class344 { + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "[Lfx;" + ) + @Export("WorldMapElement_cached") + static WorldMapElement[] WorldMapElement_cached; + @ObfuscatedName("id") + @ObfuscatedSignature( + descriptor = "Lqr;" + ) + @Export("redHintArrowSprite") + static SpritePixels redHintArrowSprite; +} diff --git a/runescape-client/src/main/java/class345.java b/runescape-client/src/main/java/class345.java index f79aee367c..490f743077 100644 --- a/runescape-client/src/main/java/class345.java +++ b/runescape-client/src/main/java/class345.java @@ -1,44 +1,60 @@ -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ma") -public class class345 { - @ObfuscatedName("v") - @Export("cp1252AsciiExtension") - static final char[] cp1252AsciiExtension; +@ObfuscatedName("me") +public final class class345 { + @ObfuscatedName("o") + @Export("base37Table") + static final char[] base37Table; + @ObfuscatedName("q") + static long[] field4168; static { - cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4 - } + 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 + field4168 = new long[12]; // L: 5 - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(B)Ljava/util/Date;", - garbageValue = "12" - ) - static Date method6441() throws ParseException { - SimpleDateFormat var0 = new SimpleDateFormat("ddMMyyyyHH", Locale.ENGLISH); // L: 1099 - var0.setLenient(false); // L: 1100 - StringBuilder var1 = new StringBuilder(); // L: 1101 - String[] var2 = Login.field904; // L: 1103 - - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 1104 - String var4 = var2[var3]; // L: 1105 - if (var4 == null) { // L: 1107 - Ignored.method6828(7); // L: 1109 - class4.setLoginResponseString("Date not valid.", "Please ensure all characters are populated.", ""); // L: 1110 - return null; // L: 1112 - } - - var1.append(var4); // L: 1114 + for (int var0 = 0; var0 < field4168.length; ++var0) { // L: 8 + field4168[var0] = (long)Math.pow(37.0D, (double)var0); } - var1.append("12"); // L: 1118 - return var0.parse(var1.toString()); // L: 1119 + } // L: 9 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "1009595940" + ) + static int method6156(int var0, int var1, int var2) { + if (var2 > 179) { // L: 33 + var1 /= 2; + } + + if (var2 > 192) { // L: 34 + var1 /= 2; + } + + if (var2 > 217) { // L: 35 + var1 /= 2; + } + + if (var2 > 243) { // L: 36 + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 37 + return var3; // L: 38 } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-127167673" + ) + @Export("setLoginResponseString") + static void setLoginResponseString(String var0, String var1, String var2) { + Login.Login_response1 = var0; // L: 1655 + Login.Login_response2 = var1; // L: 1656 + Login.Login_response3 = var2; // L: 1657 + } // L: 1658 } diff --git a/runescape-client/src/main/java/class346.java b/runescape-client/src/main/java/class346.java index 10e7c6f98f..b885e41441 100644 --- a/runescape-client/src/main/java/class346.java +++ b/runescape-client/src/main/java/class346.java @@ -1,104 +1,18 @@ -import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mz") -public class class346 { - @ObfuscatedName("v") - static char[] field4136; - @ObfuscatedName("c") - static char[] field4133; - @ObfuscatedName("i") - static char[] field4134; - @ObfuscatedName("f") - static int[] field4135; - - static { - field4136 = new char[64]; // L: 7 - - int var0; - for (var0 = 0; var0 < 26; ++var0) { // L: 8 - field4136[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { // L: 9 - field4136[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { // L: 10 - field4136[var0] = (char)(var0 + 48 - 52); - } - - field4136[62] = '+'; // L: 11 - field4136[63] = '/'; // L: 12 - field4133 = new char[64]; // L: 18 - - for (var0 = 0; var0 < 26; ++var0) { // L: 19 - field4133[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { // L: 20 - field4133[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { // L: 21 - field4133[var0] = (char)(var0 + 48 - 52); - } - - field4133[62] = '*'; // L: 22 - field4133[63] = '-'; // L: 23 - field4134 = new char[64]; // L: 29 - - for (var0 = 0; var0 < 26; ++var0) { // L: 30 - field4134[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { // L: 31 - field4134[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { // L: 32 - field4134[var0] = (char)(var0 + 48 - 52); - } - - field4134[62] = '-'; // L: 33 - field4134[63] = '_'; // L: 34 - field4135 = new int[128]; // L: 40 - - for (var0 = 0; var0 < field4135.length; ++var0) { // L: 41 - field4135[var0] = -1; - } - - for (var0 = 65; var0 <= 90; ++var0) { // L: 42 - field4135[var0] = var0 - 65; - } - - for (var0 = 97; var0 <= 122; ++var0) { // L: 43 - field4135[var0] = var0 - 97 + 26; - } - - for (var0 = 48; var0 <= 57; ++var0) { // L: 44 - field4135[var0] = var0 - 48 + 52; - } - - int[] var2 = field4135; // L: 45 - field4135[43] = 62; // L: 46 - var2[42] = 62; // L: 47 - int[] var1 = field4135; // L: 48 - field4135[47] = 63; // L: 49 - var1[45] = 63; // L: 50 - } // L: 51 - - @ObfuscatedName("kj") - @ObfuscatedSignature( - descriptor = "(Lky;I)V", - garbageValue = "-60390428" +@ObfuscatedName("mf") +public final class class346 { + @ObfuscatedName("o") + final Object field4171; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -2109207935 ) - @Export("invalidateWidget") - static void invalidateWidget(Widget var0) { - if (var0 != null && var0.cycle == Client.field540) { // L: 11875 - Client.field715[var0.rootIndex] = true; // L: 11876 - } + int field4170; - } // L: 11878 + class346(Object var1, int var2) { + this.field4171 = var1; // L: 170 + this.field4170 = var2; // L: 171 + } // L: 172 } diff --git a/runescape-client/src/main/java/class347.java b/runescape-client/src/main/java/class347.java index a60b8bcc39..e8319800fb 100644 --- a/runescape-client/src/main/java/class347.java +++ b/runescape-client/src/main/java/class347.java @@ -1,10 +1,54 @@ -import java.security.SecureRandom; -import net.runelite.mapping.Export; +import java.util.ConcurrentModificationException; +import java.util.Iterator; +import java.util.NoSuchElementException; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mt") -public final class class347 { - @ObfuscatedName("fh") - @Export("secureRandom") - static SecureRandom secureRandom; +@ObfuscatedName("md") +public class class347 implements Iterator { + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lmr;" + ) + class348 field4175; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -1785277143 + ) + int field4174; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -114429441 + ) + int field4173; + + @ObfuscatedSignature( + descriptor = "(Lmr;)V" + ) + class347(class348 var1) { + this.field4174 = 0; // L: 177 + this.field4173 = this.field4175.field4182; // L: 178 + this.field4175 = var1; // L: 181 + } // L: 182 + + public boolean hasNext() { + return this.field4174 < this.field4175.field4181; // L: 186 + } + + public Object next() { + if (this.field4175.field4182 != this.field4173) { // L: 192 + throw new ConcurrentModificationException(); + } else if (this.field4174 < this.field4175.field4181) { // L: 193 + Object var1 = this.field4175.field4179[this.field4174].field4171; // L: 194 + ++this.field4174; // L: 195 + return var1; // L: 196 + } else { + throw new NoSuchElementException(); // L: 198 + } + } + + public void remove() { + throw new UnsupportedOperationException(); // L: 203 + } } diff --git a/runescape-client/src/main/java/class348.java b/runescape-client/src/main/java/class348.java index fd6421927f..454ab9edf7 100644 --- a/runescape-client/src/main/java/class348.java +++ b/runescape-client/src/main/java/class348.java @@ -1,30 +1,219 @@ +import java.util.AbstractQueue; +import java.util.Arrays; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mo") -public class class348 { +@ObfuscatedName("mr") +public class class348 extends AbstractQueue { @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ZS)V", - garbageValue = "255" + descriptor = "[Lmf;" ) - static void method6505(boolean var0) { - byte var1 = 0; // L: 1133 - if (!BufferedSource.method6889()) { // L: 1134 - var1 = 12; // L: 1135 - } else if (class127.client.method1532() || class127.client.method1476()) { // L: 1137 - var1 = 10; // L: 1138 + class346[] field4179; + @ObfuscatedName("q") + Map field4180; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1908884105 + ) + int field4181; + @ObfuscatedName("k") + final Comparator field4178; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -633680661 + ) + int field4182; + + public class348(int var1, Comparator var2) { + this.field4182 = 0; // L: 10 + this.field4179 = new class346[var1]; // L: 17 + this.field4180 = new HashMap(); // L: 18 + this.field4178 = var2; // L: 19 + } // L: 20 + + public class348(int var1) { + this(var1, (Comparator)null); // L: 13 + } // L: 14 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2064028908" + ) + void method6192() { + int var1 = (this.field4179.length << 1) + 1; // L: 23 + this.field4179 = (class346[])((class346[])Arrays.copyOf(this.field4179, var1)); // L: 24 + } // L: 25 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-79126724" + ) + void method6173(int var1) { + class346 var2; + int var3; + for (var2 = this.field4179[var1]; var1 > 0; var1 = var3) { // L: 96 97 108 + var3 = var1 - 1 >>> 1; // L: 98 + class346 var4 = this.field4179[var3]; // L: 99 + if (this.field4178 != null) { // L: 100 + if (this.field4178.compare(var2.field4171, var4.field4171) >= 0) { // L: 101 + break; + } + } else if (((Comparable)var2.field4171).compareTo(var4.field4171) >= 0) { // L: 104 + break; + } + + this.field4179[var1] = var4; // L: 106 + this.field4179[var1].field4170 = var1; // L: 107 } - Ignored.method6828(var1); // L: 1140 - if (var0) { // L: 1141 - Login.Login_username = ""; // L: 1142 - Login.Login_password = ""; // L: 1143 - WorldMapID.field2386 = 0; // L: 1144 - HealthBar.otp = ""; // L: 1145 + this.field4179[var1] = var2; // L: 110 + this.field4179[var1].field4170 = var1; // L: 111 + } // L: 112 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1826932902" + ) + void method6181(int var1) { + class346 var2 = this.field4179[var1]; // L: 116 + + int var8; + for (int var3 = this.field4181 >>> 1; var1 < var3; var1 = var8) { // L: 117 118 140 + int var4 = (var1 << 1) + 1; // L: 119 + class346 var5 = this.field4179[var4]; // L: 120 + int var6 = (var1 << 1) + 2; // L: 121 + class346 var7 = this.field4179[var6]; // L: 122 + if (this.field4178 != null) { // L: 124 + if (var6 < this.field4181 && this.field4178.compare(var5.field4171, var7.field4171) > 0) { // L: 125 + var8 = var6; + } else { + var8 = var4; // L: 126 + } + } else if (var6 < this.field4181 && ((Comparable)var5.field4171).compareTo(var7.field4171) > 0) { // L: 129 + var8 = var6; + } else { + var8 = var4; // L: 130 + } + + if (this.field4178 != null) { // L: 132 + if (this.field4178.compare(var2.field4171, this.field4179[var8].field4171) <= 0) { // L: 133 + break; + } + } else if (((Comparable)var2.field4171).compareTo(this.field4179[var8].field4171) <= 0) { // L: 136 + break; + } + + this.field4179[var1] = this.field4179[var8]; // L: 138 + this.field4179[var1].field4170 = var1; // L: 139 } - Players.method2421(); // L: 1147 - class12.method157(); // L: 1148 - } // L: 1149 + this.field4179[var1] = var2; // L: 142 + this.field4179[var1].field4170 = var1; // L: 143 + } // L: 144 + + public boolean remove(Object var1) { + class346 var2 = (class346)this.field4180.remove(var1); // L: 77 + if (var2 == null) { // L: 78 + return false; + } else { + ++this.field4182; // L: 79 + --this.field4181; // L: 80 + if (var2.field4170 == this.field4181) { // L: 81 + this.field4179[this.field4181] = null; // L: 82 + return true; // L: 83 + } else { + class346 var3 = this.field4179[this.field4181]; // L: 85 + this.field4179[this.field4181] = null; // L: 86 + this.field4179[var2.field4170] = var3; // L: 87 + this.field4179[var2.field4170].field4170 = var2.field4170; // L: 88 + this.method6181(var2.field4170); // L: 89 + if (var3 == this.field4179[var2.field4170]) { // L: 90 + this.method6173(var2.field4170); + } + + return true; // L: 91 + } + } + } + + public Object peek() { + return this.field4181 == 0 ? null : this.field4179[0].field4171; // L: 54 55 + } + + public Iterator iterator() { + return new class347(this); // L: 162 + } + + public boolean offer(Object var1) { + if (this.field4180.containsKey(var1)) { // L: 34 + throw new IllegalArgumentException(""); + } else { + ++this.field4182; // L: 35 + int var2 = this.field4181; // L: 36 + if (var2 >= this.field4179.length) { // L: 37 + this.method6192(); + } + + ++this.field4181; // L: 38 + if (var2 == 0) { // L: 39 + this.field4179[0] = new class346(var1, 0); // L: 40 + this.field4180.put(var1, this.field4179[0]); // L: 41 + } else { + this.field4179[var2] = new class346(var1, var2); // L: 44 + this.field4180.put(var1, this.field4179[var2]); // L: 45 + this.method6173(var2); // L: 46 + } + + return true; // L: 48 + } + } + + public boolean contains(Object var1) { + return this.field4180.containsKey(var1); // L: 148 + } + + public Object[] toArray() { + Object[] var1 = super.toArray(); // L: 154 + if (this.field4178 != null) { + Arrays.sort(var1, this.field4178); // L: 155 + } else { + Arrays.sort(var1); // L: 156 + } + + return var1; // L: 157 + } + + public Object poll() { + if (this.field4181 == 0) { // L: 61 + return null; + } else { + ++this.field4182; // L: 62 + Object var1 = this.field4179[0].field4171; // L: 63 + this.field4180.remove(var1); // L: 64 + --this.field4181; // L: 65 + if (this.field4181 == 0) { + this.field4179[this.field4181] = null; // L: 66 + } else { + this.field4179[0] = this.field4179[this.field4181]; // L: 68 + this.field4179[0].field4170 = 0; // L: 69 + this.field4179[this.field4181] = null; // L: 70 + this.method6181(0); // L: 71 + } + + return var1; // L: 73 + } + } + + public int size() { + return this.field4181; // L: 29 + } } diff --git a/runescape-client/src/main/java/class349.java b/runescape-client/src/main/java/class349.java deleted file mode 100644 index a41c5a7e5e..0000000000 --- a/runescape-client/src/main/java/class349.java +++ /dev/null @@ -1,76 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("mh") -public final class class349 { - @ObfuscatedName("v") - @Export("base37Table") - public static final char[] base37Table; - @ObfuscatedName("c") - static long[] field4142; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - @Export("HitSplatDefinition_fontsArchive") - static AbstractArchive HitSplatDefinition_fontsArchive; - - 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 - field4142 = new long[12]; // L: 5 - - for (int var0 = 0; var0 < field4142.length; ++var0) { // L: 8 - field4142[var0] = (long)Math.pow(37.0D, (double)var0); - } - - } // L: 9 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(ILpi;I)Lfj;", - garbageValue = "-307481051" - ) - public static class168 method6509(int var0, Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 24 - boolean var3 = (var2 & 1) != 0; // L: 25 - boolean var4 = (var2 & 2) != 0; // L: 26 - class168 var5 = new class168(var0); // L: 27 - int var6; - int[] var7; - boolean var8; - int var9; - short var10; - if (var3) { // L: 28 - var6 = var1.readUnsignedByte(); // L: 29 - var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 30 31 32 - var8 = var5.field1791 != null && var7.length == var5.field1791.length; // L: 33 - - for (var9 = 0; var9 < 2; ++var9) { // L: 34 - if (var7[var9] != 15) { // L: 35 - var10 = (short)var1.readUnsignedShort(); // L: 36 - if (var8) { // L: 37 - var5.field1791[var7[var9]] = var10; // L: 38 - } - } - } - } - - if (var4) { // L: 43 - var6 = var1.readUnsignedByte(); // L: 44 - var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 45 46 47 - var8 = var5.field1790 != null && var7.length == var5.field1790.length; // L: 48 - - for (var9 = 0; var9 < 2; ++var9) { // L: 49 - if (var7[var9] != 15) { // L: 50 - var10 = (short)var1.readUnsignedShort(); // L: 51 - if (var8) { // L: 52 - var5.field1790[var7[var9]] = var10; // L: 53 - } - } - } - } - - return var5; // L: 58 - } -} diff --git a/runescape-client/src/main/java/class350.java b/runescape-client/src/main/java/class350.java deleted file mode 100644 index 07848a8d7c..0000000000 --- a/runescape-client/src/main/java/class350.java +++ /dev/null @@ -1,71 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("mb") -public class class350 { - @ObfuscatedName("v") - @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 - return; - } - - if (var3 > var1 && var3 < var4 + var1) { // L: 14 - --var4; // L: 15 - var1 += var4; // L: 16 - var3 += var4; // L: 17 - var4 = var1 - var4; // L: 18 - - for (var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 19 20 28 - var2[var3--] = var0[var1--]; // L: 21 - var2[var3--] = var0[var1--]; // L: 22 - var2[var3--] = var0[var1--]; // L: 23 - var2[var3--] = var0[var1--]; // L: 24 - var2[var3--] = var0[var1--]; // L: 25 - var2[var3--] = var0[var1--]; // L: 26 - var2[var3--] = var0[var1--]; // L: 27 - } - - for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 30 31 - } - - return; // L: 32 - } - } - - var4 += var1; // L: 35 - - for (var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 36 37 45 - var2[var3++] = var0[var1++]; // L: 38 - var2[var3++] = var0[var1++]; // L: 39 - var2[var3++] = var0[var1++]; // L: 40 - var2[var3++] = var0[var1++]; // L: 41 - var2[var3++] = var0[var1++]; // L: 42 - var2[var3++] = var0[var1++]; // L: 43 - var2[var3++] = var0[var1++]; // L: 44 - } - - for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 47 48 - } - - } // L: 49 - - @ObfuscatedName("o") - @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 - var0[var1++] = 0; // L: 367 - var0[var1++] = 0; // L: 368 - var0[var1++] = 0; // L: 369 - var0[var1++] = 0; // L: 370 - var0[var1++] = 0; // L: 371 - var0[var1++] = 0; // L: 372 - } - - for (var2 += 7; var1 < var2; var0[var1++] = 0) { // L: 375 376 - } - - } // L: 377 -} diff --git a/runescape-client/src/main/java/class351.java b/runescape-client/src/main/java/class351.java index b8be834e36..aff5244714 100644 --- a/runescape-client/src/main/java/class351.java +++ b/runescape-client/src/main/java/class351.java @@ -1,36 +1,71 @@ -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mp") +@ObfuscatedName("mu") public class class351 { - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1823563099 - ) - int field4151; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 724631607 - ) - int field4146; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 159823091 - ) - int field4148; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1148185313 - ) - int field4149; + @ObfuscatedName("o") + @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 + return; + } - public String toString() { - int var2 = 10 - Integer.toString(this.field4151).length(); // L: 15 - int var3 = 10 - Integer.toString(this.field4148).length(); // L: 16 - int var4 = 10 - Integer.toString(this.field4146).length(); // L: 17 - String var5 = " ".substring(10 - var2); // L: 18 - String var6 = " ".substring(10 - var3); // L: 19 - String var7 = " ".substring(10 - var4); // L: 20 - return " Size: " + this.field4151 + var5 + "Created: " + this.field4146 + var7 + "Total used: " + this.field4148 + var6 + "Max-In-Use: " + this.field4149; // L: 21 - } + if (var3 > var1 && var3 < var4 + var1) { // L: 14 + --var4; // L: 15 + var1 += var4; // L: 16 + var3 += var4; // L: 17 + var4 = var1 - var4; // L: 18 + + for (var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 19 20 28 + var2[var3--] = var0[var1--]; // L: 21 + var2[var3--] = var0[var1--]; // L: 22 + var2[var3--] = var0[var1--]; // L: 23 + var2[var3--] = var0[var1--]; // L: 24 + var2[var3--] = var0[var1--]; // L: 25 + var2[var3--] = var0[var1--]; // L: 26 + var2[var3--] = var0[var1--]; // L: 27 + } + + for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 30 31 + } + + return; // L: 32 + } + } + + var4 += var1; // L: 35 + + for (var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 36 37 45 + var2[var3++] = var0[var1++]; // L: 38 + var2[var3++] = var0[var1++]; // L: 39 + var2[var3++] = var0[var1++]; // L: 40 + var2[var3++] = var0[var1++]; // L: 41 + var2[var3++] = var0[var1++]; // L: 42 + var2[var3++] = var0[var1++]; // L: 43 + var2[var3++] = var0[var1++]; // L: 44 + } + + for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 47 48 + } + + } // L: 49 + + @ObfuscatedName("v") + @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 + var0[var1++] = 0; // L: 367 + var0[var1++] = 0; // L: 368 + var0[var1++] = 0; // L: 369 + var0[var1++] = 0; // L: 370 + var0[var1++] = 0; // L: 371 + var0[var1++] = 0; // L: 372 + } + + for (var2 += 7; var1 < var2; var0[var1++] = 0) { // L: 375 376 + } + + } // L: 377 } diff --git a/runescape-client/src/main/java/class352.java b/runescape-client/src/main/java/class352.java new file mode 100644 index 0000000000..fd0c766bc5 --- /dev/null +++ b/runescape-client/src/main/java/class352.java @@ -0,0 +1,37 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("mp") +public class class352 { + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1906795163 + ) + int field4205; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -154815115 + ) + int field4206; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 250970163 + ) + int field4208; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -457383541 + ) + int field4207; + + public String toString() { + boolean var1 = true; // L: 15 + int var2 = 10 - Integer.toString(this.field4205).length(); // L: 16 + int var3 = 10 - Integer.toString(this.field4208).length(); // L: 17 + int var4 = 10 - Integer.toString(this.field4206).length(); // L: 18 + String var5 = " ".substring(10 - var2); // L: 19 + String var6 = " ".substring(10 - var3); // L: 20 + String var7 = " ".substring(10 - var4); // L: 21 + return " Size: " + this.field4205 + var5 + "Created: " + this.field4206 + var7 + "Total used: " + this.field4208 + var6 + "Max-In-Use: " + this.field4207; // L: 22 + } +} diff --git a/runescape-client/src/main/java/class356.java b/runescape-client/src/main/java/class356.java index 043d6a7970..5355d96f10 100644 --- a/runescape-client/src/main/java/class356.java +++ b/runescape-client/src/main/java/class356.java @@ -1,36 +1,13 @@ -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mi") +@ObfuscatedName("mg") public class class356 { - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -29527757 - ) - static int field4185; - - @ObfuscatedName("aq") + @ObfuscatedName("ea") @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "1300878569" + descriptor = "Lle;" ) - static int method6582(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 3500) { // L: 2322 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2323 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.method5187(var3) ? 1 : 0; // L: 2324 - return 1; // L: 2325 - } else if (var0 == 3501) { // L: 2327 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2328 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.method1130(var3) ? 1 : 0; // L: 2329 - return 1; // L: 2330 - } else if (var0 == 3502) { // L: 2332 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2333 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.method1138(var3) ? 1 : 0; // L: 2334 - return 1; // L: 2335 - } else { - return 2; // L: 2337 - } - } + @Export("archive2") + static Archive archive2; } diff --git a/runescape-client/src/main/java/class357.java b/runescape-client/src/main/java/class357.java index 772e1b2a0a..e78c1e27e6 100644 --- a/runescape-client/src/main/java/class357.java +++ b/runescape-client/src/main/java/class357.java @@ -1,9 +1,18 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mm") +@ObfuscatedName("mb") public class class357 { - @ObfuscatedName("w") - @Export("Tiles_hueMultiplier") - static int[] Tiles_hueMultiplier; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lpx;" + ) + @Export("NetCache_responseArchiveBuffer") + public static Buffer NetCache_responseArchiveBuffer; + + @ObfuscatedName("r") + static int method6392(long var0) { + return (int)(var0 >>> 14 & 3L); // L: 76 + } } diff --git a/runescape-client/src/main/java/class358.java b/runescape-client/src/main/java/class358.java index cf6287b562..7d7ac4b8b7 100644 --- a/runescape-client/src/main/java/class358.java +++ b/runescape-client/src/main/java/class358.java @@ -1,20 +1,19 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mc") +@ObfuscatedName("mq") public class class358 { - @ObfuscatedName("lf") + @ObfuscatedName("ra") @ObfuscatedSignature( - descriptor = "(Lky;II)Ljava/lang/String;", - garbageValue = "-707928815" + descriptor = "Lek;" ) - static String method6583(Widget var0, int var1) { - int var3 = class326.getWidgetFlags(var0); // L: 12468 - boolean var2 = (var3 >> var1 + 1 & 1) != 0; // L: 12470 - if (!var2 && var0.onOp == null) { // L: 12472 - 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: 12473 12474 12476 - } - } + @Export("guestClanSettings") + static ClanSettings guestClanSettings; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "[Lqd;" + ) + @Export("title_muteSprite") + static IndexedSprite[] title_muteSprite; } diff --git a/runescape-client/src/main/java/class359.java b/runescape-client/src/main/java/class359.java deleted file mode 100644 index 69617c9554..0000000000 --- a/runescape-client/src/main/java/class359.java +++ /dev/null @@ -1,31 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("mx") -public class class359 { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lmx;" - ) - public static final class359 field4204; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lmx;" - ) - static final class359 field4205; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -916709349 - ) - final int field4206; - - static { - field4204 = new class359(1); // L: 5 - field4205 = new class359(0); // L: 6 - } - - class359(int var1) { - this.field4206 = var1; // L: 10 - } // L: 11 -} diff --git a/runescape-client/src/main/java/class360.java b/runescape-client/src/main/java/class360.java index 46bbe5b419..2c2eb544e0 100644 --- a/runescape-client/src/main/java/class360.java +++ b/runescape-client/src/main/java/class360.java @@ -1,960 +1,54 @@ -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.text.ParseException; -import java.util.Comparator; -import java.util.Date; -import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ml") -class class360 implements Comparator { - @ObfuscatedName("fj") - static String field4209; - // $FF: synthetic field +@ObfuscatedName("mc") +public class class360 { + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Lmc;" ) - final class361 this$0; + public static final class360 field4274; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lmc;" + ) + static final class360 field4272; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1759688503 + ) + final int field4273; - @ObfuscatedSignature( - descriptor = "(Lmg;)V" - ) - class360(class361 var1) { - this.this$0 = var1; // L: 7 + static { + field4274 = new class360(0); // L: 5 + field4272 = new class360(1); // L: 6 } - @ObfuscatedName("v") + class360(int var1) { + this.field4273 = var1; // L: 10 + } // L: 11 + + @ObfuscatedName("hv") @ObfuscatedSignature( - descriptor = "(Lmv;Lmv;I)I", - garbageValue = "1269106031" + descriptor = "(I)V", + garbageValue = "732758346" ) - int method6585(class362 var1, class362 var2) { - if (var1.field4222 > var2.field4222) { // L: 9 - return 1; - } else { - return var1.field4222 < var2.field4222 ? -1 : 0; // L: 10 11 - } - } - - public int compare(Object var1, Object var2) { - return this.method6585((class362)var1, (class362)var2); // L: 15 - } - - public boolean equals(Object var1) { - return super.equals(var1); // L: 19 - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(IIILgj;II)V", - garbageValue = "-1591189890" - ) - static void method6589(int var0, int var1, int var2, ObjectComposition 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 + static final void method6393() { + Client.field606 = 0; // L: 5447 + int var0 = (ModelData0.localPlayer.x >> 7) + SecureRandomCallable.baseX; // L: 5448 + int var1 = (ModelData0.localPlayer.y >> 7) + GrandExchangeOfferOwnWorldComparator.baseY; // L: 5449 + if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { // L: 5450 + Client.field606 = 1; } - var5.maxX = (var6 + var1) * 128; // L: 77 - var5.maxY = (var7 + var2) * 128; // L: 78 - var5.soundEffectId = var3.ambientSoundId; // L: 79 - var5.field814 = var3.int7 * 128; // L: 80 - var5.field818 = var3.int5; // L: 81 - var5.field810 = 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 + if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { // L: 5451 + Client.field606 = 1; } - ObjectSound.objectSounds.addFirst(var5); // L: 88 - if (var5.soundEffectIds != null) { // L: 89 - var5.field821 = var5.field818 + (int)(Math.random() * (double)(var5.field810 - var5.field818)); + if (Client.field606 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { // L: 5452 + Client.field606 = 0; } - } // L: 90 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lao;Lmd;B)V", - garbageValue = "3" - ) - @Export("loginScreen") - static void loginScreen(GameEngine var0, Font var1) { - int var4; - int var38; - if (Login.worldSelectOpen) { // L: 309 - while (true) { - if (!SecureRandomCallable.isKeyDown()) { // L: 311 - if (MouseHandler.MouseHandler_lastButton != 1 && (GameBuild.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { // L: 332 - break; - } - - int var2 = Login.xPadding + 280; // L: 333 - if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 334 - Players.changeWorldSelectSorting(0, 0); // L: 335 - break; // L: 336 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 338 - Players.changeWorldSelectSorting(0, 1); // L: 339 - break; // L: 340 - } - - int var3 = Login.xPadding + 390; // L: 342 - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 343 - Players.changeWorldSelectSorting(1, 0); // L: 344 - break; // L: 345 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 347 - Players.changeWorldSelectSorting(1, 1); // L: 348 - break; // L: 349 - } - - var4 = Login.xPadding + 500; // L: 351 - if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 352 - Players.changeWorldSelectSorting(2, 0); // L: 353 - break; // L: 354 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 356 - Players.changeWorldSelectSorting(2, 1); // L: 357 - break; // L: 358 - } - - var38 = Login.xPadding + 610; // L: 360 - if (MouseHandler.MouseHandler_lastPressedX >= var38 && MouseHandler.MouseHandler_lastPressedX <= var38 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 361 - Players.changeWorldSelectSorting(3, 0); // L: 362 - break; // L: 363 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var38 + 15 && MouseHandler.MouseHandler_lastPressedX <= var38 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 365 - Players.changeWorldSelectSorting(3, 1); // L: 366 - break; // L: 367 - } - - if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 369 - Login.worldSelectOpen = false; // L: 371 - class17.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 372 - ViewportMouse.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 373 - Decimator.logoSprite.drawAt(Login.xPadding + 382 - Decimator.logoSprite.subWidth / 2, 18); // L: 374 - break; // L: 376 - } - - if (Login.hoveredWorldIndex != -1) { // L: 378 - World var6 = DevicePcmPlayerProvider.World_worlds[Login.hoveredWorldIndex]; // L: 379 - PlatformInfo.changeWorld(var6); // L: 380 - Login.worldSelectOpen = false; // L: 382 - class17.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 383 - ViewportMouse.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 384 - Decimator.logoSprite.drawAt(Login.xPadding + 382 - Decimator.logoSprite.subWidth / 2, 18); // L: 385 - } else { - if (Login.worldSelectPage > 0 && class54.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class54.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= class321.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class321.canvasHeight / 2 + 50) { // L: 389 - --Login.worldSelectPage; // L: 390 - } - - if (Login.worldSelectPage < Login.worldSelectPagesCount && AttackOption.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= InvDefinition.canvasWidth - AttackOption.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= InvDefinition.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= class321.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class321.canvasHeight / 2 + 50) { // L: 392 - ++Login.worldSelectPage; // L: 393 - } - } - break; - } - - if (GameEngine.field218 == 13) { // L: 312 - Login.worldSelectOpen = false; // L: 314 - class17.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 315 - ViewportMouse.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 316 - Decimator.logoSprite.drawAt(Login.xPadding + 382 - Decimator.logoSprite.subWidth / 2, 18); // L: 317 - break; // L: 319 - } - - if (GameEngine.field218 == 96) { // L: 321 - if (Login.worldSelectPage > 0 && class54.worldSelectLeftSprite != null) { // L: 322 - --Login.worldSelectPage; // L: 323 - } - } else if (GameEngine.field218 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && AttackOption.worldSelectRightSprite != null) { // L: 326 327 - ++Login.worldSelectPage; // L: 328 - } - } - - } else { - if ((MouseHandler.MouseHandler_lastButton == 1 || !GameBuild.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 399 - class131.clientPreferences.method2237(!class131.clientPreferences.method2279()); // L: 400 - if (!class131.clientPreferences.method2279()) { // L: 401 - MidiPcmStream.method5368(class16.archive6, "scape main", "", 255, false); - } else { - class273.midiPcmStream.clear(); // L: 403 - class273.musicPlayerStatus = 1; // L: 404 - class273.musicTrackArchive = null; // L: 405 - } - } - - if (Client.gameState != 5) { // L: 408 - if (-1L == Login.field915) { // L: 409 - Login.field915 = class136.method2931() + 1000L; // L: 410 - } - - long var20 = class136.method2931(); // L: 412 - if (PendingSpawn.method2166() && -1L == Login.field916) { // L: 413 414 - Login.field916 = var20; // L: 415 - if (Login.field916 > Login.field915) { // L: 416 - Login.field915 = Login.field916; // L: 417 - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { // L: 421 - if (Language.Language_EN == Skills.clientLanguage) { // L: 422 - if (MouseHandler.MouseHandler_lastButton == 1 || !GameBuild.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 423 - var4 = Login.xPadding + 5; // L: 424 - short var5 = 463; // L: 425 - byte var22 = 100; // L: 426 - byte var7 = 35; // L: 427 - if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + var22 && MouseHandler.MouseHandler_lastPressedY >= var5 && MouseHandler.MouseHandler_lastPressedY <= var7 + var5) { // L: 428 - SoundCache.method768(); // L: 429 - return; // L: 430 - } - } - - if (class293.World_request != null) { // L: 433 - SoundCache.method768(); - } - } - - var4 = MouseHandler.MouseHandler_lastButton; // L: 435 - var38 = MouseHandler.MouseHandler_lastPressedX; // L: 436 - int var52 = MouseHandler.MouseHandler_lastPressedY; // L: 437 - if (var4 == 0) { // L: 438 - var38 = MouseHandler.MouseHandler_x; // L: 439 - var52 = MouseHandler.MouseHandler_y; // L: 440 - } - - if (!GameBuild.mouseCam && var4 == 4) { // L: 442 - var4 = 1; - } - - int var41; - short var42; - if (Login.loginIndex == 0) { // L: 443 - boolean var50 = false; // L: 444 - - while (SecureRandomCallable.isKeyDown()) { // L: 445 - if (GameEngine.field218 == 84) { // L: 446 - var50 = true; // L: 447 - } - } - - var41 = HealthBarDefinition.loginBoxCenter - 80; // L: 450 - var42 = 291; // L: 451 - if (var4 == 1 && var38 >= var41 - 75 && var38 <= var41 + 75 && var52 >= var42 - 20 && var52 <= var42 + 20) { // L: 452 - class391.openURL(ArchiveLoader.method2063("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 453 - } - - var41 = HealthBarDefinition.loginBoxCenter + 80; // L: 455 - if (var4 == 1 && var38 >= var41 - 75 && var38 <= var41 + 75 && var52 >= var42 - 20 && var52 <= var42 + 20 || var50) { // L: 456 - if ((Client.worldProperties & 33554432) != 0) { // L: 457 - Login.Login_response0 = ""; // L: 458 - Login.Login_response1 = "This is a Beta world."; // L: 459 - Login.Login_response2 = "Your normal account will not be affected."; // L: 460 - Login.Login_response3 = ""; // L: 461 - Ignored.method6828(1); // L: 462 - class12.method157(); // L: 463 - } else if ((Client.worldProperties & 4) != 0) { // L: 465 - if ((Client.worldProperties & 1024) != 0) { // L: 466 - Login.Login_response1 = "This is a High Risk PvP world."; // L: 467 - Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 468 - Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 469 - } else { - Login.Login_response1 = "This is a PvP world."; // L: 472 - Login.Login_response2 = "Players can attack each other"; // L: 473 - Login.Login_response3 = "almost everywhere."; // L: 474 - } - - Login.Login_response0 = "Warning!"; // L: 476 - Ignored.method6828(1); // L: 477 - class12.method157(); // L: 478 - } else if ((Client.worldProperties & 1024) != 0) { // L: 480 - Login.Login_response1 = "This is a High Risk world."; // L: 481 - Login.Login_response2 = "The Protect Item prayer will"; // L: 482 - Login.Login_response3 = "not work on this world."; // L: 483 - Login.Login_response0 = "Warning!"; // L: 484 - Ignored.method6828(1); // L: 485 - class12.method157(); // L: 486 - } else { - Messages.Login_promptCredentials(false); // L: 489 - } - } - } else { - short var8; - int var39; - if (Login.loginIndex == 1) { // L: 493 - while (true) { - if (!SecureRandomCallable.isKeyDown()) { // L: 494 - var39 = HealthBarDefinition.loginBoxCenter - 80; // L: 502 - var8 = 321; // L: 503 - if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 504 - Messages.Login_promptCredentials(false); // L: 505 - } - - var39 = HealthBarDefinition.loginBoxCenter + 80; // L: 507 - if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 508 - Ignored.method6828(0); // L: 509 - } - break; - } - - if (GameEngine.field218 == 84) { // L: 495 - Messages.Login_promptCredentials(false); // L: 496 - } else if (GameEngine.field218 == 13) { // L: 498 - Ignored.method6828(0); // L: 499 - } - } - } else { - int var11; - int var12; - short var40; - boolean var43; - if (Login.loginIndex == 2) { // L: 512 - var40 = 201; // L: 513 - var39 = var40 + 52; // L: 514 - if (var4 == 1 && var52 >= var39 - 12 && var52 < var39 + 2) { // L: 515 - Login.currentLoginField = 0; - } - - var39 += 15; // L: 516 - if (var4 == 1 && var52 >= var39 - 12 && var52 < var39 + 2) { // L: 517 - Login.currentLoginField = 1; - } - - var39 += 15; // L: 518 - var40 = 361; // L: 519 - if (class113.field1378 != null) { // L: 520 - var41 = class113.field1378.highX / 2; // L: 521 - if (var4 == 1 && var38 >= class113.field1378.lowX - var41 && var38 <= var41 + class113.field1378.lowX && var52 >= var40 - 15 && var52 < var40) { // L: 522 - switch(Login.field895) { // L: 523 - case 1: - class4.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 531 - Ignored.method6828(5); // L: 532 - return; // L: 533 - case 2: - class391.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 526 - } - } - } - - var41 = HealthBarDefinition.loginBoxCenter - 80; // L: 538 - var42 = 321; // L: 539 - if (var4 == 1 && var38 >= var41 - 75 && var38 <= var41 + 75 && var52 >= var42 - 20 && var52 <= var42 + 20) { // L: 540 - Login.Login_username = Login.Login_username.trim(); // L: 541 - if (Login.Login_username.length() == 0) { // L: 542 - class4.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 543 - return; // L: 544 - } - - if (Login.Login_password.length() == 0) { // L: 546 - class4.setLoginResponseString("", "Please enter your password.", ""); // L: 547 - return; // L: 548 - } - - class4.setLoginResponseString("", "Connecting to server...", ""); // L: 550 - class302.method5766(false); // L: 551 - Decimator.updateGameState(20); // L: 552 - return; // L: 553 - } - - var41 = Login.loginBoxX + 180 + 80; // L: 555 - if (var4 == 1 && var38 >= var41 - 75 && var38 <= var41 + 75 && var52 >= var42 - 20 && var52 <= var42 + 20) { // L: 556 - Ignored.method6828(0); // L: 557 - Login.Login_username = ""; // L: 558 - Login.Login_password = ""; // L: 559 - WorldMapID.field2386 = 0; // L: 560 - HealthBar.otp = ""; // L: 561 - Login.field907 = true; // L: 562 - } - - var41 = HealthBarDefinition.loginBoxCenter + -117; // L: 564 - var42 = 277; // L: 565 - Login.field909 = var38 >= var41 && var38 < var41 + AbstractSocket.field4275 && var52 >= var42 && var52 < var42 + Occluder.field2687; // L: 566 - if (var4 == 1 && Login.field909) { // L: 567 - Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 568 - if (!Client.Login_isUsernameRemembered && class131.clientPreferences.method2247() != null) { // L: 569 - class131.clientPreferences.method2286((String)null); // L: 570 - } - } - - var41 = HealthBarDefinition.loginBoxCenter + 24; // L: 573 - var42 = 277; // L: 574 - Login.field906 = var38 >= var41 && var38 < var41 + AbstractSocket.field4275 && var52 >= var42 && var52 < var42 + Occluder.field2687; // L: 575 - if (var4 == 1 && Login.field906) { // L: 576 - class131.clientPreferences.method2230(!class131.clientPreferences.method2317()); // L: 577 - if (!class131.clientPreferences.method2317()) { // L: 578 - Login.Login_username = ""; // L: 579 - class131.clientPreferences.method2286((String)null); // L: 580 - class12.method157(); // L: 581 - } - } - - label1472: - while (true) { - Transferable var54; - do { - while (true) { - label1436: - do { - while (true) { - while (SecureRandomCallable.isKeyDown()) { // L: 584 - if (GameEngine.field218 != 13) { // L: 585 - if (Login.currentLoginField != 0) { // L: 594 - continue label1436; - } - - char var44 = ItemComposition.field2121; // L: 595 - - for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var44 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11); ++var11) { // L: 597 598 - } - - if (GameEngine.field218 == 85 && Login.Login_username.length() > 0) { // L: 601 - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (GameEngine.field218 == 84 || GameEngine.field218 == 80) { // L: 602 - Login.currentLoginField = 1; - } - - char var46 = ItemComposition.field2121; // L: 604 - boolean var47 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var46) != -1; // L: 606 - if (var47 && Login.Login_username.length() < 320) { // L: 608 - Login.Login_username = Login.Login_username + ItemComposition.field2121; - } - } else { - Ignored.method6828(0); // L: 586 - Login.Login_username = ""; // L: 587 - Login.Login_password = ""; // L: 588 - WorldMapID.field2386 = 0; // L: 589 - HealthBar.otp = ""; // L: 590 - Login.field907 = true; // L: 591 - } - } - - return; // L: 1096 - } - } while(Login.currentLoginField != 1); // L: 610 - - if (GameEngine.field218 == 85 && Login.Login_password.length() > 0) { // L: 611 - Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 612 - } else if (GameEngine.field218 == 84 || GameEngine.field218 == 80) { // L: 614 - Login.currentLoginField = 0; // L: 615 - if (GameEngine.field218 == 84) { // L: 616 - Login.Login_username = Login.Login_username.trim(); // L: 617 - if (Login.Login_username.length() == 0) { // L: 618 - class4.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 619 - return; // L: 620 - } - - if (Login.Login_password.length() == 0) { // L: 622 - class4.setLoginResponseString("", "Please enter your password.", ""); // L: 623 - return; // L: 624 - } - - class4.setLoginResponseString("", "Connecting to server...", ""); // L: 626 - class302.method5766(false); // L: 627 - Decimator.updateGameState(20); // L: 628 - return; // L: 629 - } - } - - if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && GameEngine.field218 == 67) { // L: 632 - Clipboard var53 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 633 - var54 = var53.getContents(class127.client); // L: 634 - var12 = 20 - Login.Login_password.length(); // L: 635 - break; - } - - if (WorldMapSection0.method4303(ItemComposition.field2121)) { // L: 660 - char var48 = ItemComposition.field2121; // L: 662 - var43 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var48) != -1; // L: 664 - if (var43 && Login.Login_password.length() < 20) { // L: 666 667 - Login.Login_password = Login.Login_password + ItemComposition.field2121; // L: 668 - } - } - } - } while(var12 <= 0); // L: 636 - - try { - String var13 = (String)var54.getTransferData(DataFlavor.stringFlavor); // L: 638 - int var14 = Math.min(var12, var13.length()); // L: 639 - int var49 = 0; - - while (true) { - if (var49 >= var14) { - Login.Login_password = Login.Login_password + var13.substring(0, var14); // L: 654 - continue label1472; - } - - if (!WorldMapSection0.method4303(var13.charAt(var49))) { // L: 642 - break; - } - - char var51 = var13.charAt(var49); // L: 644 - boolean var16 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var51) != -1; // L: 646 - if (!var16) { // L: 648 - break; - } - - ++var49; // L: 640 - } - - Ignored.method6828(3); // L: 650 - return; // L: 651 - } catch (UnsupportedFlavorException var36) { // L: 656 - } catch (IOException var37) { // L: 657 - } - } - } else if (Login.loginIndex == 3) { // L: 676 - var39 = Login.loginBoxX + 180; // L: 677 - var8 = 276; // L: 678 - if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 679 - class348.method6505(false); // L: 680 - } - - var39 = Login.loginBoxX + 180; // L: 682 - var8 = 326; // L: 683 - if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 684 - class4.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 685 - Ignored.method6828(5); // L: 686 - return; // L: 687 - } - } else { - int var10; - if (Login.loginIndex == 4) { // L: 690 - var39 = Login.loginBoxX + 180 - 80; // L: 691 - var8 = 321; // L: 692 - if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 693 - HealthBar.otp.trim(); // L: 694 - if (HealthBar.otp.length() != 6) { // L: 695 - class4.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 696 - return; // L: 697 - } - - WorldMapID.field2386 = Integer.parseInt(HealthBar.otp); // L: 699 - HealthBar.otp = ""; // L: 700 - class302.method5766(true); // L: 701 - class4.setLoginResponseString("", "Connecting to server...", ""); // L: 702 - Decimator.updateGameState(20); // L: 703 - return; // L: 704 - } - - if (var4 == 1 && var38 >= Login.loginBoxX + 180 - 9 && var38 <= Login.loginBoxX + 180 + 130 && var52 >= 263 && var52 <= 296) { // L: 706 - Login.field907 = !Login.field907; // L: 707 - } - - if (var4 == 1 && var38 >= Login.loginBoxX + 180 - 34 && var38 <= Login.loginBoxX + 34 + 180 && var52 >= 351 && var52 <= 363) { // L: 709 - class391.openURL(ArchiveLoader.method2063("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 710 - } - - var39 = Login.loginBoxX + 180 + 80; // L: 712 - if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 713 - Ignored.method6828(0); // L: 714 - Login.Login_username = ""; // L: 715 - Login.Login_password = ""; // L: 716 - WorldMapID.field2386 = 0; // L: 717 - HealthBar.otp = ""; // L: 718 - } - - while (SecureRandomCallable.isKeyDown()) { // L: 720 - boolean var9 = false; // L: 721 - - for (var10 = 0; var10 < "1234567890".length(); ++var10) { // L: 722 - if (ItemComposition.field2121 == "1234567890".charAt(var10)) { // L: 723 - var9 = true; // L: 724 - break; // L: 725 - } - } - - if (GameEngine.field218 == 13) { // L: 728 - Ignored.method6828(0); // L: 729 - Login.Login_username = ""; // L: 730 - Login.Login_password = ""; // L: 731 - WorldMapID.field2386 = 0; // L: 732 - HealthBar.otp = ""; // L: 733 - } else { - if (GameEngine.field218 == 85 && HealthBar.otp.length() > 0) { // L: 736 - HealthBar.otp = HealthBar.otp.substring(0, HealthBar.otp.length() - 1); - } - - if (GameEngine.field218 == 84) { // L: 737 - HealthBar.otp.trim(); // L: 738 - if (HealthBar.otp.length() != 6) { // L: 739 - class4.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 740 - return; // L: 741 - } - - WorldMapID.field2386 = Integer.parseInt(HealthBar.otp); // L: 743 - HealthBar.otp = ""; // L: 744 - class302.method5766(true); // L: 745 - class4.setLoginResponseString("", "Connecting to server...", ""); // L: 746 - Decimator.updateGameState(20); // L: 747 - return; // L: 748 - } - - if (var9 && HealthBar.otp.length() < 6) { // L: 750 - HealthBar.otp = HealthBar.otp + ItemComposition.field2121; - } - } - } - } else if (Login.loginIndex == 5) { // L: 754 - var39 = Login.loginBoxX + 180 - 80; // L: 755 - var8 = 321; // L: 756 - if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 757 - DynamicObject.method2003(); // L: 758 - return; // L: 759 - } - - var39 = Login.loginBoxX + 180 + 80; // L: 761 - if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 762 - Messages.Login_promptCredentials(true); // L: 763 - } - - var42 = 361; // L: 765 - if (class260.field2892 != null) { // L: 766 - var10 = class260.field2892.highX / 2; // L: 767 - if (var4 == 1 && var38 >= class260.field2892.lowX - var10 && var38 <= var10 + class260.field2892.lowX && var52 >= var42 - 15 && var52 < var42) { // L: 768 - class391.openURL(ArchiveLoader.method2063("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 769 - } - } - - while (SecureRandomCallable.isKeyDown()) { // L: 772 - var43 = false; // L: 773 - - for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { // L: 774 - if (ItemComposition.field2121 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { // L: 775 - var43 = true; // L: 776 - break; // L: 777 - } - } - - if (GameEngine.field218 == 13) { // L: 780 - Messages.Login_promptCredentials(true); // L: 781 - } else { - if (GameEngine.field218 == 85 && Login.Login_username.length() > 0) { // L: 784 - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (GameEngine.field218 == 84) { // L: 785 - DynamicObject.method2003(); // L: 786 - return; // L: 787 - } - - if (var43 && Login.Login_username.length() < 320) { // L: 789 - Login.Login_username = Login.Login_username + ItemComposition.field2121; - } - } - } - } else if (Login.loginIndex != 6) { // L: 793 - if (Login.loginIndex == 7) { // L: 804 - if (Client.field504 && !Client.onMobile) { // L: 805 - var39 = HealthBarDefinition.loginBoxCenter - 150; // L: 806 - var41 = var39 + 40 + 240 + 25; // L: 807 - var42 = 231; // L: 808 - var10 = var42 + 40; // L: 809 - if (var4 == 1 && var38 >= var39 && var38 <= var41 && var52 >= var42 && var52 <= var10) { // L: 810 - var12 = var39; // L: 812 - int var25 = 0; - - while (true) { - if (var25 >= 8) { - var11 = 0; // L: 822 - break; - } - - if (var38 <= var12 + 30) { // L: 815 - var11 = var25; // L: 816 - break; // L: 817 - } - - var12 += 30; // L: 819 - var12 += var25 != 1 && var25 != 3 ? 5 : 20; // L: 820 - ++var25; // L: 814 - } - - Login.field903 = var11; // L: 824 - } - - var11 = Login.loginBoxX + 180 - 80; // L: 826 - short var45 = 321; // L: 827 - boolean var15; - boolean var17; - Date var18; - java.util.Calendar var19; - Date var26; - java.util.Calendar var28; - Date var29; - boolean var55; - if (var4 == 1 && var38 >= var11 - 75 && var38 <= var11 + 75 && var52 >= var45 - 20 && var52 <= var45 + 20) { // L: 828 - label1307: { - try { - var26 = class345.method6441(); // L: 833 - } catch (ParseException var35) { // L: 835 - Ignored.method6828(7); // L: 837 - class4.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 838 - var55 = false; // L: 840 - break label1307; // L: 841 - } - - if (var26 == null) { // L: 843 - var55 = false; // L: 844 - } else { - var28 = java.util.Calendar.getInstance(); // L: 849 - var28.set(1, var28.get(1) - 13); // L: 850 - var29 = var28.getTime(); // L: 851 - var15 = var26.before(var29); // L: 852 - var19 = java.util.Calendar.getInstance(); // L: 859 - var19.set(2, 0); // L: 860 - var19.set(5, 1); // L: 861 - var19.set(1, 1900); // L: 862 - var18 = var19.getTime(); // L: 863 - var17 = var26.after(var18); // L: 866 - if (!var17) { // L: 869 - Ignored.method6828(7); // L: 871 - class4.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 872 - var55 = false; // L: 874 - } else { - if (!var15) { // L: 877 - WorldMapSectionType.field2321 = 8388607; // L: 878 - } else { - WorldMapSectionType.field2321 = (int)(var26.getTime() / 86400000L - 11745L); // L: 881 - } - - var55 = true; // L: 883 - } - } - } - - if (var55) { // L: 886 - Decimator.updateGameState(50); // L: 887 - return; // L: 888 - } - } - - var11 = Login.loginBoxX + 180 + 80; // L: 891 - if (var4 == 1 && var38 >= var11 - 75 && var38 <= var11 + 75 && var52 >= var45 - 20 && var52 <= var45 + 20) { // L: 892 - Login.field904 = new String[8]; // L: 893 - Messages.Login_promptCredentials(true); // L: 894 - } - - while (SecureRandomCallable.isKeyDown()) { // L: 896 - if (GameEngine.field218 == 101) { // L: 897 - Login.field904[Login.field903] = null; // L: 898 - } - - if (GameEngine.field218 == 85) { // L: 900 - if (Login.field904[Login.field903] == null && Login.field903 > 0) { // L: 901 - --Login.field903; // L: 902 - } - - Login.field904[Login.field903] = null; // L: 904 - } - - if (ItemComposition.field2121 >= '0' && ItemComposition.field2121 <= '9') { // L: 906 - Login.field904[Login.field903] = "" + ItemComposition.field2121; // L: 907 - if (Login.field903 < 7) { // L: 908 - ++Login.field903; // L: 909 - } - } - - if (GameEngine.field218 == 84) { // L: 912 - label1243: { - try { - var26 = class345.method6441(); // L: 917 - } catch (ParseException var34) { // L: 919 - Ignored.method6828(7); // L: 921 - class4.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 922 - var55 = false; // L: 924 - break label1243; // L: 925 - } - - if (var26 == null) { // L: 927 - var55 = false; // L: 928 - } else { - var28 = java.util.Calendar.getInstance(); // L: 933 - var28.set(1, var28.get(1) - 13); // L: 934 - var29 = var28.getTime(); // L: 935 - var15 = var26.before(var29); // L: 936 - var19 = java.util.Calendar.getInstance(); // L: 943 - var19.set(2, 0); // L: 944 - var19.set(5, 1); // L: 945 - var19.set(1, 1900); // L: 946 - var18 = var19.getTime(); // L: 947 - var17 = var26.after(var18); // L: 950 - if (!var17) { // L: 953 - Ignored.method6828(7); // L: 955 - class4.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 956 - var55 = false; // L: 958 - } else { - if (!var15) { // L: 961 - WorldMapSectionType.field2321 = 8388607; // L: 962 - } else { - WorldMapSectionType.field2321 = (int)(var26.getTime() / 86400000L - 11745L); // L: 965 - } - - var55 = true; // L: 967 - } - } - } - - if (var55) { // L: 970 - Decimator.updateGameState(50); // L: 971 - } - - return; // L: 973 - } - } - } else { - var39 = Login.loginBoxX + 180 - 80; // L: 978 - var8 = 321; // L: 979 - if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 980 - class391.openURL(ArchiveLoader.method2063("secure", true) + "m=dob/set_dob.ws", true, false); // L: 981 - class4.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 982 - Ignored.method6828(6); // L: 983 - return; // L: 984 - } - - var39 = Login.loginBoxX + 180 + 80; // L: 986 - if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 987 - Messages.Login_promptCredentials(true); // L: 988 - } - } - } else if (Login.loginIndex == 8) { // L: 992 - var39 = Login.loginBoxX + 180 - 80; // L: 993 - var8 = 321; // L: 994 - if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 995 - class391.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 996 - class4.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 997 - Ignored.method6828(6); // L: 998 - return; // L: 999 - } - - var39 = Login.loginBoxX + 180 + 80; // L: 1001 - if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1002 - Messages.Login_promptCredentials(true); // L: 1003 - } - } else if (Login.loginIndex == 9) { // L: 1006 - var39 = Login.loginBoxX + 180; // L: 1007 - var8 = 311; // L: 1008 - if (GameEngine.field218 == 84 || GameEngine.field218 == 13 || var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1009 - class348.method6505(false); // L: 1010 - } - } else if (Login.loginIndex == 10) { // L: 1013 - var39 = Login.loginBoxX + 180; // L: 1014 - var8 = 209; // L: 1015 - if (GameEngine.field218 == 84 || var4 == 1 && var38 >= var39 - 109 && var38 <= var39 + 109 && var52 >= var8 && var52 <= var8 + 68) { // L: 1016 - class4.setLoginResponseString("", "Connecting to server...", ""); // L: 1017 - Client.field532 = class441.field4671; // L: 1018 - class302.method5766(false); // L: 1019 - Decimator.updateGameState(20); // L: 1020 - } - } else if (Login.loginIndex == 12) { // L: 1023 - var39 = HealthBarDefinition.loginBoxCenter; // L: 1024 - var8 = 233; // L: 1025 - Bounds var31 = var1.method6333(0, 30, "terms of use, privacy policy, and end user licence", var39, var8); // L: 1026 - Bounds var23 = var1.method6333(32, 32, "terms of use, privacy policy, and end user licence", var39, var8); // L: 1027 - Bounds var24 = var1.method6333(70, 34, "terms of use, privacy policy, and end user licence", var39, var8); // L: 1028 - var41 = var8 + 17; // L: 1029 - Bounds var32 = var1.method6333(0, 34, "agreement (EULA).", var39, var41); // L: 1030 - if (var4 == 1) { // L: 1031 - if (var31.method6944(var38, var52)) { // L: 1032 - class391.openURL("https://www.jagex.com/terms", true, false); // L: 1033 - } else if (var23.method6944(var38, var52)) { // L: 1035 - class391.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 1036 - } else if (var24.method6944(var38, var52) || var32.method6944(var38, var52)) { // L: 1038 - class391.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); // L: 1039 - } - } - - var39 = HealthBarDefinition.loginBoxCenter - 80; // L: 1042 - var8 = 311; // L: 1043 - if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1044 - class131.clientPreferences.method2248(Client.field617); // L: 1046 - class348.method6505(true); // L: 1048 - } - - var39 = HealthBarDefinition.loginBoxCenter + 80; // L: 1050 - if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1051 - Login.loginIndex = 13; // L: 1052 - } - } else if (Login.loginIndex == 13) { // L: 1055 - var39 = HealthBarDefinition.loginBoxCenter; // L: 1056 - var8 = 321; // L: 1057 - if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1058 - class348.method6505(true); // L: 1059 - } - } else if (Login.loginIndex == 14) { // L: 1062 - String var33 = ""; // L: 1063 - switch(Login.field901) { // L: 1064 - case 0: - var33 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 1066 - break; // L: 1067 - case 1: - var33 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 1069 - break; // L: 1070 - default: - Messages.Login_promptCredentials(false); // L: 1072 - } - - var41 = Login.loginBoxX + 180; // L: 1075 - var42 = 276; // L: 1076 - if (var4 == 1 && var38 >= var41 - 75 && var38 <= var41 + 75 && var52 >= var42 - 20 && var52 <= var42 + 20) { // L: 1077 - class391.openURL(var33, true, false); // L: 1078 - class4.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 1079 - Ignored.method6828(6); // L: 1080 - return; // L: 1081 - } - - var41 = Login.loginBoxX + 180; // L: 1083 - var42 = 326; // L: 1084 - if (var4 == 1 && var38 >= var41 - 75 && var38 <= var41 + 75 && var52 >= var42 - 20 && var52 <= var42 + 20) { // L: 1085 - Messages.Login_promptCredentials(false); // L: 1086 - } - } else if (Login.loginIndex == 24) { // L: 1089 - var39 = Login.loginBoxX + 180; // L: 1090 - var8 = 301; // L: 1091 - if (var4 == 1 && var38 >= var39 - 75 && var38 <= var39 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1092 - class348.method6505(false); // L: 1093 - } - } - } else { - while (true) { - do { - if (!SecureRandomCallable.isKeyDown()) { // L: 794 - var40 = 321; // L: 799 - if (var4 == 1 && var52 >= var40 - 20 && var52 <= var40 + 20) { // L: 800 - Messages.Login_promptCredentials(true); // L: 801 - } - - return; - } - } while(GameEngine.field218 != 84 && GameEngine.field218 != 13); // L: 795 - - Messages.Login_promptCredentials(true); // L: 796 - } - } - } - } - } - - } - } - } - } // L: 397 + } // L: 5453 } diff --git a/runescape-client/src/main/java/class361.java b/runescape-client/src/main/java/class361.java index 1167ef11ef..8e096ec650 100644 --- a/runescape-client/src/main/java/class361.java +++ b/runescape-client/src/main/java/class361.java @@ -1,191 +1,47 @@ import java.util.Comparator; -import java.util.HashMap; -import java.util.Map; -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mg") -public final class class361 { - @ObfuscatedName("k") - static int[] field4213; - @ObfuscatedName("v") - final Comparator field4217; - @ObfuscatedName("c") - final Map field4218; - @ObfuscatedName("i") +@ObfuscatedName("mz") +class class361 implements Comparator { + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lmn;" + descriptor = "Llp;" ) - final class342 field4214; - @ObfuscatedName("f") + @Export("KitDefinition_modelsArchive") + static AbstractArchive KitDefinition_modelsArchive; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lmn;" + descriptor = "Lmh;" ) - final class342 field4215; - @ObfuscatedName("b") - @ObfuscatedGetter( - longValue = -1677392653166540809L - ) - final long field4219; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lmx;" - ) - final class359 field4216; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1491932339 - ) - final int field4212; + final class362 this$0; @ObfuscatedSignature( - descriptor = "(JILmx;)V" + descriptor = "(Lmh;)V" ) - class361(long var1, int var3, class359 var4) { - this.field4217 = new class360(this); // L: 7 - this.field4219 = var1; // L: 34 - this.field4212 = var3; // L: 35 - this.field4216 = var4; // L: 36 - if (this.field4212 == -1) { // L: 37 - this.field4218 = new HashMap(64); // L: 38 - this.field4214 = new class342(64, this.field4217); // L: 39 - this.field4215 = null; // L: 40 + class361(class362 var1) { + this.this$0 = var1; // L: 7 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lmw;Lmw;I)I", + garbageValue = "-1192417518" + ) + int method6395(class363 var1, class363 var2) { + if (var1.field4290 > var2.field4290) { // L: 9 + return 1; } else { - if (this.field4216 == null) { // L: 43 - throw new IllegalArgumentException(""); - } - - this.field4218 = new HashMap(this.field4212); // L: 44 - this.field4214 = new class342(this.field4212, this.field4217); // L: 45 - this.field4215 = new class342(this.field4212); // L: 46 - } - - } // L: 48 - - @ObfuscatedSignature( - descriptor = "(ILmx;)V" - ) - public class361(int var1, class359 var2) { - this(-1L, var1, var2); // L: 30 - } // L: 31 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-157414931" - ) - boolean method6594() { - return this.field4212 != -1; // L: 51 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;I)Ljava/lang/Object;", - garbageValue = "-2019489642" - ) - public Object method6601(Object var1) { - synchronized(this) { // L: 55 - if (-1L != this.field4219) { // L: 56 - this.method6598(); - } - - class362 var3 = (class362)this.field4218.get(var1); // L: 57 - if (var3 == null) { // L: 58 - return null; - } else { - this.method6600(var3, false); // L: 59 - return var3.field4221; // L: 60 - } + return var1.field4290 < var2.field4290 ? -1 : 0; // L: 10 11 } } - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Ljava/lang/Object;I)Ljava/lang/Object;", - garbageValue = "-1186698319" - ) - public Object method6596(Object var1, Object var2) { - synchronized(this) { // L: 65 - if (-1L != this.field4219) { // L: 66 - this.method6598(); - } - - class362 var4 = (class362)this.field4218.get(var1); // L: 67 - if (var4 != null) { // L: 68 - Object var8 = var4.field4221; // L: 69 - var4.field4221 = var2; // L: 70 - this.method6600(var4, false); // L: 71 - return var8; // L: 72 - } else { - class362 var5; - if (this.method6594() && this.field4218.size() == this.field4212) { // L: 74 - var5 = (class362)this.field4215.remove(); // L: 75 - this.field4218.remove(var5.field4224); // L: 76 - this.field4214.remove(var5); // L: 77 - } - - var5 = new class362(var2, var1); // L: 79 - this.field4218.put(var1, var5); // L: 80 - this.method6600(var5, true); // L: 81 - return null; // L: 82 - } - } + public boolean equals(Object var1) { + return super.equals(var1); // L: 19 } - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lmv;ZI)V", - garbageValue = "1250273542" - ) - void method6600(class362 var1, boolean var2) { - if (!var2) { // L: 88 - this.field4214.remove(var1); // L: 89 - if (this.method6594() && !this.field4215.remove(var1)) { // L: 90 91 - throw new IllegalStateException(""); - } - } - - var1.field4222 = System.currentTimeMillis(); // L: 94 - if (this.method6594()) { // L: 95 - switch(this.field4216.field4206) { // L: 96 - case 0: - ++var1.field4223; // L: 101 - break; - case 1: - var1.field4223 = var1.field4222; // L: 98 - } - - this.field4215.add(var1); // L: 104 - } - - this.field4214.add(var1); // L: 106 - } // L: 107 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1192700638" - ) - void method6598() { - if (-1L == this.field4219) { // L: 111 - throw new IllegalStateException(""); - } else { - long var1 = System.currentTimeMillis() - this.field4219; // L: 112 - - while (!this.field4214.isEmpty()) { // L: 113 - class362 var3 = (class362)this.field4214.peek(); // L: 114 - if (var3.field4222 >= var1) { // L: 115 - return; // L: 120 - } - - this.field4218.remove(var3.field4224); // L: 116 - this.field4214.remove(var3); // L: 117 - if (this.method6594()) { // L: 118 - this.field4215.remove(var3); - } - } - - } - } // L: 122 + public int compare(Object var1, Object var2) { + return this.method6395((class363)var1, (class363)var2); // L: 15 + } } diff --git a/runescape-client/src/main/java/class362.java b/runescape-client/src/main/java/class362.java index b0f5832dc2..e25c99c227 100644 --- a/runescape-client/src/main/java/class362.java +++ b/runescape-client/src/main/java/class362.java @@ -1,55 +1,189 @@ +import java.util.Comparator; +import java.util.HashMap; +import java.util.Map; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mv") -public final class class362 implements Comparable { - @ObfuscatedName("v") - Object field4221; - @ObfuscatedName("c") - Object field4224; - @ObfuscatedName("i") - @ObfuscatedGetter( - longValue = -5736347963697719881L - ) - long field4222; - @ObfuscatedName("f") - @ObfuscatedGetter( - longValue = -1907411133840236385L - ) - long field4223; - - class362(Object var1, Object var2) { - this.field4221 = var1; // L: 10 - this.field4224 = var2; // L: 11 - } // L: 12 - - @ObfuscatedName("v") +@ObfuscatedName("mh") +public final class class362 { + @ObfuscatedName("o") + final Comparator field4283; + @ObfuscatedName("q") + final Map field4287; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lmv;I)I", - garbageValue = "-368071179" + descriptor = "Lmr;" ) - int method6615(class362 var1) { - if (this.field4223 < var1.field4223) { - return -1; // L: 15 + final class348 field4282; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lmr;" + ) + final class348 field4281; + @ObfuscatedName("a") + @ObfuscatedGetter( + longValue = -5862348301303990459L + ) + final long field4280; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lmc;" + ) + final class360 field4285; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 410246549 + ) + final int field4286; + + @ObfuscatedSignature( + descriptor = "(JILmc;)V" + ) + class362(long var1, int var3, class360 var4) { + this.field4283 = new class361(this); // L: 7 + this.field4280 = var1; // L: 34 + this.field4286 = var3; // L: 35 + this.field4285 = var4; // L: 36 + if (this.field4286 == -1) { // L: 37 + this.field4287 = new HashMap(64); // L: 38 + this.field4282 = new class348(64, this.field4283); // L: 39 + this.field4281 = null; // L: 40 } else { - return this.field4223 > var1.field4223 ? 1 : 0; // L: 16 17 + if (this.field4285 == null) { // L: 43 + throw new IllegalArgumentException(""); + } + + this.field4287 = new HashMap(this.field4286); // L: 44 + this.field4282 = new class348(this.field4286, this.field4283); // L: 45 + this.field4281 = new class348(this.field4286); // L: 46 + } + + } // L: 48 + + @ObfuscatedSignature( + descriptor = "(ILmc;)V" + ) + public class362(int var1, class360 var2) { + this(-1L, var1, var2); // L: 30 + } // L: 31 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1327719952" + ) + boolean method6401() { + return this.field4286 != -1; // L: 51 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;B)Ljava/lang/Object;", + garbageValue = "23" + ) + public Object method6413(Object var1) { + synchronized(this) { // L: 55 + if (this.field4280 != -1L) { // L: 56 + this.method6404(); + } + + class363 var3 = (class363)this.field4287.get(var1); // L: 57 + if (var3 == null) { // L: 58 + return null; + } else { + this.method6403(var3, false); // L: 59 + return var3.field4289; // L: 60 + } } } - public boolean equals(Object var1) { - if (var1 instanceof class362) { // L: 21 - return this.field4224.equals(((class362)var1).field4224); - } else { - throw new IllegalArgumentException(); // L: 22 + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Ljava/lang/Object;I)Ljava/lang/Object;", + garbageValue = "735656301" + ) + public Object method6402(Object var1, Object var2) { + synchronized(this) { // L: 65 + if (this.field4280 != -1L) { // L: 66 + this.method6404(); + } + + class363 var4 = (class363)this.field4287.get(var1); // L: 67 + if (var4 != null) { // L: 68 + Object var8 = var4.field4289; // L: 69 + var4.field4289 = var2; // L: 70 + this.method6403(var4, false); // L: 71 + return var8; // L: 72 + } else { + class363 var5; + if (this.method6401() && this.field4287.size() == this.field4286) { // L: 74 + var5 = (class363)this.field4281.remove(); // L: 75 + this.field4287.remove(var5.field4288); // L: 76 + this.field4282.remove(var5); // L: 77 + } + + var5 = new class363(var2, var1); // L: 79 + this.field4287.put(var1, var5); // L: 80 + this.method6403(var5, true); // L: 81 + return null; // L: 82 + } } } - public int hashCode() { - return this.field4224.hashCode(); // L: 26 - } + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lmw;ZI)V", + garbageValue = "1467205859" + ) + void method6403(class363 var1, boolean var2) { + if (!var2) { // L: 88 + this.field4282.remove(var1); // L: 89 + if (this.method6401() && !this.field4281.remove(var1)) { // L: 90 91 + throw new IllegalStateException(""); + } + } - public int compareTo(Object var1) { - return this.method6615((class362)var1); // L: 30 - } + var1.field4290 = System.currentTimeMillis(); // L: 94 + if (this.method6401()) { // L: 95 + switch(this.field4285.field4273) { // L: 96 + case 0: + var1.field4291 = var1.field4290; // L: 98 + break; + case 1: + ++var1.field4291; // L: 101 + } + + this.field4281.add(var1); // L: 104 + } + + this.field4282.add(var1); // L: 106 + } // L: 107 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "23" + ) + void method6404() { + if (-1L == this.field4280) { // L: 111 + throw new IllegalStateException(""); + } else { + long var1 = System.currentTimeMillis() - this.field4280; // L: 112 + + while (!this.field4282.isEmpty()) { // L: 113 + class363 var3 = (class363)this.field4282.peek(); // L: 114 + if (var3.field4290 >= var1) { // L: 115 + return; // L: 120 + } + + this.field4287.remove(var3.field4288); // L: 116 + this.field4282.remove(var3); // L: 117 + if (this.method6401()) { // L: 118 + this.field4281.remove(var3); + } + } + + } + } // L: 122 } diff --git a/runescape-client/src/main/java/class363.java b/runescape-client/src/main/java/class363.java new file mode 100644 index 0000000000..a377e1a138 --- /dev/null +++ b/runescape-client/src/main/java/class363.java @@ -0,0 +1,91 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mw") +public final class class363 implements Comparable { + @ObfuscatedName("o") + Object field4289; + @ObfuscatedName("q") + Object field4288; + @ObfuscatedName("l") + @ObfuscatedGetter( + longValue = 8122509668442582777L + ) + long field4290; + @ObfuscatedName("k") + @ObfuscatedGetter( + longValue = -2881932506811436755L + ) + long field4291; + + class363(Object var1, Object var2) { + this.field4289 = var1; // L: 10 + this.field4288 = var2; // L: 11 + } // L: 12 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lmw;I)I", + garbageValue = "-1341616281" + ) + int method6415(class363 var1) { + if (this.field4291 < var1.field4291) { + return -1; // L: 15 + } else { + return this.field4291 > var1.field4291 ? 1 : 0; // L: 16 17 + } + } + + public boolean equals(Object var1) { + if (var1 instanceof class363) { // L: 22 + return this.field4288.equals(((class363)var1).field4288); + } else { + throw new IllegalArgumentException(); // L: 23 + } + } + + public int compareTo(Object var1) { + return this.method6415((class363)var1); // L: 32 + } + + public int hashCode() { + return this.field4288.hashCode(); // L: 28 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Lki;I[B[BI)V", + garbageValue = "-1210183331" + ) + @Export("Widget_setKey") + static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { + if (var0.field3474 == null) { // L: 988 + if (var2 == null) { // L: 989 + return; // L: 995 + } + + var0.field3474 = new byte[11][]; // L: 990 + var0.field3419 = new byte[11][]; // L: 991 + var0.field3476 = new int[11]; // L: 992 + var0.field3481 = new int[11]; // L: 993 + } + + var0.field3474[var1] = var2; // L: 997 + if (var2 != null) { + var0.field3473 = true; // L: 998 + } else { + var0.field3473 = false; // L: 1000 + + for (int var4 = 0; var4 < var0.field3474.length; ++var4) { // L: 1001 + if (var0.field3474[var4] != null) { // L: 1002 + var0.field3473 = true; // L: 1003 + break; + } + } + } + + var0.field3419[var1] = var3; // L: 1008 + } // L: 1009 +} diff --git a/runescape-client/src/main/java/class384.java b/runescape-client/src/main/java/class384.java deleted file mode 100644 index 630775c192..0000000000 --- a/runescape-client/src/main/java/class384.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nl") -public class class384 { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - @Export("VarcInt_archive") - public static AbstractArchive VarcInt_archive; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lai;" - ) - @Export("pcmPlayerProvider") - public static class45 pcmPlayerProvider; -} diff --git a/runescape-client/src/main/java/class385.java b/runescape-client/src/main/java/class385.java index cb3d0f75b9..26c5c4ab3b 100644 --- a/runescape-client/src/main/java/class385.java +++ b/runescape-client/src/main/java/class385.java @@ -1,64 +1,13 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("na") +@ObfuscatedName("nk") public class class385 { - @ObfuscatedName("v") - float field4336; - @ObfuscatedName("c") - float field4334; - @ObfuscatedName("i") - float field4333; - - static { - new class385(0.0F, 0.0F, 0.0F); // L: 5 - new class385(1.0F, 1.0F, 1.0F); // L: 9 - new class385(1.0F, 0.0F, 0.0F); // L: 13 - new class385(0.0F, 1.0F, 0.0F); // L: 17 - new class385(0.0F, 0.0F, 1.0F); - } // L: 26 - - class385(float var1, float var2, float var3) { - this.field4336 = var1; // L: 33 - this.field4334 = var2; // L: 34 - this.field4333 = var3; // L: 35 - } // L: 36 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)F", - garbageValue = "-565998647" + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1054152823 ) - final float method6973() { - return (float)Math.sqrt((double)(this.field4333 * this.field4333 + this.field4336 * this.field4336 + this.field4334 * this.field4334)); // L: 39 - } - - public String toString() { - return this.field4336 + ", " + this.field4334 + ", " + this.field4333; // L: 44 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1727518153" - ) - @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 { - return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; // L: 23 24 - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)[Ldw;", - garbageValue = "-2020186976" - ) - static class123[] method6974() { - return new class123[]{class123.field1483, class123.field1492, class123.field1486, class123.field1482, class123.field1481, class123.field1484, class123.field1487, class123.field1488, class123.field1489}; // L: 106 - } + @Export("RunException_revision") + public static int RunException_revision; } diff --git a/runescape-client/src/main/java/class386.java b/runescape-client/src/main/java/class386.java index 47350009b4..fbdf1821e5 100644 --- a/runescape-client/src/main/java/class386.java +++ b/runescape-client/src/main/java/class386.java @@ -1,130 +1,40 @@ -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nq") -public final class class386 { - @ObfuscatedName("su") - @ObfuscatedGetter( - intValue = 513737707 - ) - static int field4337; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "[Lnq;" - ) - static class386[] field4344; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 829267689 - ) - static int field4338; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 6322965 - ) - static int field4339; - @ObfuscatedName("f") - float field4340; - @ObfuscatedName("b") - float field4341; - @ObfuscatedName("n") - float field4342; - @ObfuscatedName("s") - float field4343; +@ObfuscatedName("nv") +public class class386 { + @ObfuscatedName("o") + float field4392; + @ObfuscatedName("q") + float field4390; + @ObfuscatedName("l") + float field4391; static { - field4344 = new class386[0]; // L: 4 - field4338 = 100; // L: 10 - field4344 = new class386[100]; // L: 11 - field4339 = 0; // L: 12 - new class386(); - } // L: 18 + new class386(0.0F, 0.0F, 0.0F); // L: 5 + new class386(1.0F, 1.0F, 1.0F); // L: 9 + new class386(1.0F, 0.0F, 0.0F); // L: 13 + new class386(0.0F, 1.0F, 0.0F); // L: 17 + new class386(0.0F, 0.0F, 1.0F); // L: 21 + FontName.method7230(100); // L: 25 + } // L: 26 - class386() { - this.method6985(); // L: 42 - } // L: 43 + class386(float var1, float var2, float var3) { + this.field4392 = var1; // L: 35 + this.field4390 = var2; // L: 36 + this.field4391 = var3; // L: 37 + } // L: 38 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "18" + descriptor = "(B)F", + garbageValue = "44" ) - public void method6988() { - synchronized(field4344) { // L: 36 - if (field4339 < field4338 - 1) { // L: 37 - field4344[++field4339 - 1] = this; - } - - } - } // L: 39 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(FFFFI)V", - garbageValue = "-1694420315" - ) - void method6983(float var1, float var2, float var3, float var4) { - this.field4340 = var1; // L: 46 - this.field4341 = var2; // L: 47 - this.field4342 = var3; // L: 48 - this.field4343 = var4; // L: 49 - } // L: 50 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(FFFFI)V", - garbageValue = "-1973173355" - ) - public void method6984(float var1, float var2, float var3, float var4) { - float var5 = (float)Math.sin((double)(0.5F * var4)); // L: 53 - float var6 = (float)Math.cos((double)(0.5F * var4)); // L: 54 - this.field4340 = var1 * var5; // L: 55 - this.field4341 = var5 * var2; // L: 56 - this.field4342 = var5 * var3; // L: 57 - this.field4343 = var6; // L: 58 - } // L: 59 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "480633161" - ) - final void method6985() { - this.field4342 = 0.0F; // L: 62 - this.field4341 = 0.0F; // L: 63 - this.field4340 = 0.0F; // L: 64 - this.field4343 = 1.0F; // L: 65 - } // L: 66 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lnq;I)V", - garbageValue = "1069726937" - ) - public final void method6986(class386 var1) { - this.method6983(var1.field4341 * this.field4342 + this.field4340 * var1.field4343 + this.field4343 * var1.field4340 - var1.field4342 * this.field4341, this.field4340 * var1.field4342 + var1.field4343 * this.field4341 - this.field4342 * var1.field4340 + var1.field4341 * this.field4343, this.field4343 * var1.field4342 + (this.field4341 * var1.field4340 + this.field4342 * var1.field4343 - var1.field4341 * this.field4340), var1.field4343 * this.field4343 - var1.field4340 * this.field4340 - var1.field4341 * this.field4341 - var1.field4342 * this.field4342); // L: 69 - } // L: 70 - - public boolean equals(Object var1) { - if (!(var1 instanceof class386)) { // L: 73 - return false; // L: 77 - } else { - class386 var2 = (class386)var1; // L: 74 - return var2.field4340 == this.field4340 && this.field4341 == var2.field4341 && var2.field4342 == this.field4342 && this.field4343 == var2.field4343; // L: 75 - } - } - - public int hashCode() { - float var2 = 1.0F; // L: 82 - var2 = this.field4340 + var2 * 31.0F; // L: 83 - var2 = this.field4341 + var2 * 31.0F; // L: 84 - var2 = this.field4342 + var2 * 31.0F; // L: 85 - var2 = this.field4343 + 31.0F * var2; // L: 86 - return (int)var2; // L: 87 + final float method6771() { + return (float)Math.sqrt((double)(this.field4392 * this.field4392 + this.field4390 * this.field4390 + this.field4391 * this.field4391)); // L: 41 } public String toString() { - return this.field4340 + "," + this.field4341 + "," + this.field4342 + "," + this.field4343; // L: 92 + return this.field4392 + ", " + this.field4390 + ", " + this.field4391; // L: 46 } } diff --git a/runescape-client/src/main/java/class387.java b/runescape-client/src/main/java/class387.java index 88583073c4..6ae3198666 100644 --- a/runescape-client/src/main/java/class387.java +++ b/runescape-client/src/main/java/class387.java @@ -1,444 +1,136 @@ -import java.util.Arrays; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nt") +@ObfuscatedName("nh") public final class class387 { - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Lnt;" + descriptor = "[Lnh;" ) - public static class387[] field4346; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lnt;" - ) - public static final class387 field4345; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 288254709 - ) - public static int field4347; - @ObfuscatedName("n") - public float[] field4348; + public static class387[] field4395; + @ObfuscatedName("k") + float field4393; + @ObfuscatedName("a") + float field4394; + @ObfuscatedName("m") + float field4396; + @ObfuscatedName("p") + float field4397; static { - field4346 = new class387[0]; // L: 9 - class250.method5112(100); // L: 14 - field4345 = new class387(); // L: 18 - } + field4395 = new class387[0]; // L: 4 + class10.method87(100); // L: 9 + new class387(); + } // L: 14 public class387() { - this.field4348 = new float[16]; - this.method7011(); // L: 33 - } // L: 34 - - @ObfuscatedSignature( - descriptor = "(Lnt;)V" - ) - public class387(class387 var1) { - this.field4348 = new float[16]; - this.method7032(var1); // L: 37 - } // L: 38 - - @ObfuscatedSignature( - descriptor = "(Lpi;Z)V" - ) - public class387(Buffer var1, boolean var2) { - this.field4348 = new float[16]; // L: 17 - this.method7014(var1, var2); // L: 41 - } // L: 42 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "37" - ) - public void method7029() { - synchronized(field4346) { // L: 27 - if (field4347 < class356.field4185 - 1) { // L: 28 - field4346[++field4347 - 1] = this; - } - - } - } // L: 30 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Lpi;ZB)V", - garbageValue = "-26" - ) - void method7014(Buffer var1, boolean var2) { - if (var2) { // L: 45 - class388 var13 = new class388(); // L: 46 - int var6 = var1.readShort(); // L: 49 - var6 &= 16383; // L: 51 - float var5 = (float)(6.283185307179586D * (double)((float)var6 / 16384.0F)); // L: 52 - var13.method7078(var5); // L: 54 - int var9 = var1.readShort(); // L: 57 - var9 &= 16383; // L: 59 - float var8 = (float)(6.283185307179586D * (double)((float)var9 / 16384.0F)); // L: 60 - var13.method7083(var8); // L: 62 - int var12 = var1.readShort(); // L: 65 - var12 &= 16383; // L: 67 - float var11 = (float)(6.283185307179586D * (double)((float)var12 / 16384.0F)); // L: 68 - var13.method7082(var11); // L: 70 - var13.method7091((float)var1.readShort(), (float)var1.readShort(), (float)var1.readShort()); // L: 71 - this.method7012(var13); // L: 72 - } else { - for (int var3 = 0; var3 < 16; ++var3) { // L: 75 - this.field4348[var3] = var1.method7681(); // L: 76 - } - } - - } // L: 79 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)[F", - garbageValue = "426109978" - ) - float[] method7009() { - float[] var1 = new float[3]; // L: 82 - if ((double)this.field4348[2] < 0.999D && (double)this.field4348[2] > -0.999D) { // L: 83 - var1[1] = (float)(-Math.asin((double)this.field4348[2])); // L: 84 - double var2 = Math.cos((double)var1[1]); // L: 85 - var1[0] = (float)Math.atan2((double)this.field4348[6] / var2, (double)this.field4348[10] / var2); // L: 86 - var1[2] = (float)Math.atan2((double)this.field4348[1] / var2, (double)this.field4348[0] / var2); // L: 87 - } else { - var1[0] = 0.0F; // L: 90 - var1[1] = (float)Math.atan2((double)this.field4348[2], 0.0D); // L: 91 - var1[2] = (float)Math.atan2((double)(-this.field4348[9]), (double)this.field4348[5]); // L: 92 - } - - return var1; // L: 94 - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)[F", - garbageValue = "1375072290" - ) - public float[] method7010() { - float[] var1 = new float[]{(float)(-Math.asin((double)this.field4348[6])), 0.0F, 0.0F}; // L: 98 99 - double var2 = Math.cos((double)var1[0]); // L: 100 - double var4; - double var6; - if (Math.abs(var2) > 0.005D) { // L: 101 - var4 = (double)this.field4348[2]; // L: 102 - var6 = (double)this.field4348[10]; // L: 103 - double var8 = (double)this.field4348[4]; // L: 104 - double var10 = (double)this.field4348[5]; // L: 105 - var1[1] = (float)Math.atan2(var4, var6); // L: 106 - var1[2] = (float)Math.atan2(var8, var10); // L: 107 - } else { - var4 = (double)this.field4348[1]; // L: 110 - var6 = (double)this.field4348[0]; // L: 111 - if (this.field4348[6] < 0.0F) { // L: 112 - var1[1] = (float)Math.atan2(var4, var6); // L: 113 - } else { - var1[1] = (float)(-Math.atan2(var4, var6)); // L: 116 - } - - var1[2] = 0.0F; // L: 118 - } - - return var1; // L: 120 - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1674890086" - ) - public void method7011() { - this.field4348[0] = 1.0F; // L: 124 - this.field4348[1] = 0.0F; // L: 125 - this.field4348[2] = 0.0F; // L: 126 - this.field4348[3] = 0.0F; // L: 127 - this.field4348[4] = 0.0F; // L: 128 - this.field4348[5] = 1.0F; // L: 129 - this.field4348[6] = 0.0F; // L: 130 - this.field4348[7] = 0.0F; // L: 131 - this.field4348[8] = 0.0F; // L: 132 - this.field4348[9] = 0.0F; // L: 133 - this.field4348[10] = 1.0F; // L: 134 - this.field4348[11] = 0.0F; // L: 135 - this.field4348[12] = 0.0F; // L: 136 - this.field4348[13] = 0.0F; // L: 137 - this.field4348[14] = 0.0F; // L: 138 - this.field4348[15] = 1.0F; // L: 139 - } // L: 140 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "39" - ) - public void method7064() { - this.field4348[0] = 0.0F; // L: 143 - this.field4348[1] = 0.0F; // L: 144 - this.field4348[2] = 0.0F; // L: 145 - this.field4348[3] = 0.0F; // L: 146 - this.field4348[4] = 0.0F; // L: 147 - this.field4348[5] = 0.0F; // L: 148 - this.field4348[6] = 0.0F; // L: 149 - this.field4348[7] = 0.0F; // L: 150 - this.field4348[8] = 0.0F; // L: 151 - this.field4348[9] = 0.0F; // L: 152 - this.field4348[10] = 0.0F; // L: 153 - this.field4348[11] = 0.0F; // L: 154 - this.field4348[12] = 0.0F; // L: 155 - this.field4348[13] = 0.0F; // L: 156 - this.field4348[14] = 0.0F; // L: 157 - this.field4348[15] = 0.0F; // L: 158 - } // L: 159 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "1612769001" - ) - public void method7032(class387 var1) { - System.arraycopy(var1.field4348, 0, this.field4348, 0, 16); // L: 162 - } // L: 163 + this.method6782(); // L: 34 + } // L: 35 @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(FI)V", - garbageValue = "1962810997" + descriptor = "(B)V", + garbageValue = "57" ) - public void method7043(float var1) { - this.method7049(var1, var1, var1); // L: 166 - } // L: 167 + public void method6779() { + synchronized(field4395) { // L: 28 + if (Frames.field2492 < GrandExchangeOfferAgeComparator.field4072 - 1) { // L: 29 + field4395[++Frames.field2492 - 1] = this; + } - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(FFFB)V", - garbageValue = "-93" - ) - public void method7049(float var1, float var2, float var3) { - this.method7011(); // L: 170 - this.field4348[0] = var1; // L: 171 - this.field4348[5] = var2; // L: 172 - this.field4348[10] = var3; // L: 173 - } // L: 174 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "-290385011" - ) - public void method7016(class387 var1) { - for (int var2 = 0; var2 < this.field4348.length; ++var2) { // L: 177 - float[] var10000 = this.field4348; // L: 178 - var10000[var2] += var1.field4348[var2]; } + } // L: 31 - } // L: 180 - - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lnt;I)V", - garbageValue = "-1551118407" + descriptor = "(FFFFI)V", + garbageValue = "-1983266145" ) - public void method7017(class387 var1) { - float var2 = var1.field4348[0] * this.field4348[0] + var1.field4348[4] * this.field4348[1] + this.field4348[2] * var1.field4348[8] + this.field4348[3] * var1.field4348[12]; // L: 183 - float var3 = var1.field4348[13] * this.field4348[3] + this.field4348[1] * var1.field4348[5] + this.field4348[0] * var1.field4348[1] + var1.field4348[9] * this.field4348[2]; // L: 184 - float var4 = var1.field4348[14] * this.field4348[3] + this.field4348[2] * var1.field4348[10] + this.field4348[0] * var1.field4348[2] + this.field4348[1] * var1.field4348[6]; // L: 185 - float var5 = var1.field4348[15] * this.field4348[3] + var1.field4348[7] * this.field4348[1] + this.field4348[0] * var1.field4348[3] + var1.field4348[11] * this.field4348[2]; // L: 186 - float var6 = this.field4348[6] * var1.field4348[8] + var1.field4348[0] * this.field4348[4] + var1.field4348[4] * this.field4348[5] + var1.field4348[12] * this.field4348[7]; // L: 187 - float var7 = this.field4348[6] * var1.field4348[9] + var1.field4348[5] * this.field4348[5] + var1.field4348[1] * this.field4348[4] + this.field4348[7] * var1.field4348[13]; // L: 188 - float var8 = this.field4348[7] * var1.field4348[14] + var1.field4348[2] * this.field4348[4] + var1.field4348[6] * this.field4348[5] + var1.field4348[10] * this.field4348[6]; // L: 189 - float var9 = var1.field4348[15] * this.field4348[7] + this.field4348[5] * var1.field4348[7] + this.field4348[4] * var1.field4348[3] + this.field4348[6] * var1.field4348[11]; // L: 190 - float var10 = var1.field4348[12] * this.field4348[11] + var1.field4348[8] * this.field4348[10] + var1.field4348[4] * this.field4348[9] + this.field4348[8] * var1.field4348[0]; // L: 191 - float var11 = this.field4348[11] * var1.field4348[13] + this.field4348[10] * var1.field4348[9] + this.field4348[8] * var1.field4348[1] + this.field4348[9] * var1.field4348[5]; // L: 192 - float var12 = this.field4348[10] * var1.field4348[10] + var1.field4348[6] * this.field4348[9] + this.field4348[8] * var1.field4348[2] + var1.field4348[14] * this.field4348[11]; // L: 193 - float var13 = this.field4348[10] * var1.field4348[11] + this.field4348[8] * var1.field4348[3] + var1.field4348[7] * this.field4348[9] + var1.field4348[15] * this.field4348[11]; // L: 194 - float var14 = var1.field4348[4] * this.field4348[13] + this.field4348[12] * var1.field4348[0] + this.field4348[14] * var1.field4348[8] + this.field4348[15] * var1.field4348[12]; // L: 195 - float var15 = var1.field4348[13] * this.field4348[15] + this.field4348[14] * var1.field4348[9] + var1.field4348[1] * this.field4348[12] + this.field4348[13] * var1.field4348[5]; // L: 196 - float var16 = var1.field4348[14] * this.field4348[15] + var1.field4348[10] * this.field4348[14] + var1.field4348[6] * this.field4348[13] + this.field4348[12] * var1.field4348[2]; // L: 197 - float var17 = var1.field4348[7] * this.field4348[13] + this.field4348[12] * var1.field4348[3] + var1.field4348[11] * this.field4348[14] + this.field4348[15] * var1.field4348[15]; // L: 198 - this.field4348[0] = var2; // L: 199 - this.field4348[1] = var3; // L: 200 - this.field4348[2] = var4; // L: 201 - this.field4348[3] = var5; // L: 202 - this.field4348[4] = var6; // L: 203 - this.field4348[5] = var7; // L: 204 - this.field4348[6] = var8; // L: 205 - this.field4348[7] = var9; // L: 206 - this.field4348[8] = var10; // L: 207 - this.field4348[9] = var11; // L: 208 - this.field4348[10] = var12; // L: 209 - this.field4348[11] = var13; // L: 210 - this.field4348[12] = var14; // L: 211 - this.field4348[13] = var15; // L: 212 - this.field4348[14] = var16; // L: 213 - this.field4348[15] = var17; // L: 214 - } // L: 215 - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(Lnq;I)V", - garbageValue = "1080708844" - ) - public void method7006(class386 var1) { - float var2 = var1.field4343 * var1.field4343; // L: 218 - float var3 = var1.field4340 * var1.field4343; // L: 219 - float var4 = var1.field4341 * var1.field4343; // L: 220 - float var5 = var1.field4343 * var1.field4342; // L: 221 - float var6 = var1.field4340 * var1.field4340; // L: 222 - float var7 = var1.field4341 * var1.field4340; // L: 223 - float var8 = var1.field4340 * var1.field4342; // L: 224 - float var9 = var1.field4341 * var1.field4341; // L: 225 - float var10 = var1.field4341 * var1.field4342; // L: 226 - float var11 = var1.field4342 * var1.field4342; // L: 227 - this.field4348[0] = var2 + var6 - var11 - var9; // L: 228 - this.field4348[1] = var5 + var7 + var7 + var5; // L: 229 - this.field4348[2] = var8 - var4 - var4 + var8; // L: 230 - this.field4348[4] = var7 + (var7 - var5 - var5); // L: 231 - this.field4348[5] = var2 + var9 - var6 - var11; // L: 232 - this.field4348[6] = var3 + var10 + var10 + var3; // L: 233 - this.field4348[8] = var4 + var8 + var8 + var4; // L: 234 - this.field4348[9] = var10 + (var10 - var3 - var3); // L: 235 - this.field4348[10] = var2 + var11 - var9 - var6; // L: 236 - } // L: 237 + void method6797(float var1, float var2, float var3, float var4) { + this.field4393 = var1; // L: 38 + this.field4394 = var2; // L: 39 + this.field4396 = var3; // L: 40 + this.field4397 = var4; // L: 41 + } // L: 42 @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lnb;B)V", - garbageValue = "-22" + descriptor = "(FFFFB)V", + garbageValue = "-1" ) - void method7012(class388 var1) { - this.field4348[0] = var1.field4355; // L: 240 - this.field4348[1] = var1.field4357; // L: 241 - this.field4348[2] = var1.field4353; // L: 242 - this.field4348[3] = 0.0F; // L: 243 - this.field4348[4] = var1.field4354; // L: 244 - this.field4348[5] = var1.field4352; // L: 245 - this.field4348[6] = var1.field4356; // L: 246 - this.field4348[7] = 0.0F; // L: 247 - this.field4348[8] = var1.field4351; // L: 248 - this.field4348[9] = var1.field4360; // L: 249 - this.field4348[10] = var1.field4359; // L: 250 - this.field4348[11] = 0.0F; // L: 251 - this.field4348[12] = var1.field4362; // L: 252 - this.field4348[13] = var1.field4361; // L: 253 - this.field4348[14] = var1.field4358; // L: 254 - this.field4348[15] = 1.0F; // L: 255 - } // L: 256 + public void method6784(float var1, float var2, float var3, float var4) { + float var5 = (float)Math.sin((double)(0.5F * var4)); // L: 45 + float var6 = (float)Math.cos((double)(var4 * 0.5F)); // L: 46 + this.field4393 = var1 * var5; // L: 47 + this.field4394 = var2 * var5; // L: 48 + this.field4396 = var5 * var3; // L: 49 + this.field4397 = var6; // L: 50 + } // L: 51 - @ObfuscatedName("d") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(B)F", - garbageValue = "110" + descriptor = "(B)V", + garbageValue = "4" ) - float method7075() { - return this.field4348[13] * this.field4348[8] * this.field4348[7] * this.field4348[2] + this.field4348[15] * this.field4348[9] * this.field4348[2] * this.field4348[4] + this.field4348[15] * this.field4348[8] * this.field4348[1] * this.field4348[6] + this.field4348[0] * this.field4348[7] * this.field4348[9] * this.field4348[14] + this.field4348[11] * this.field4348[0] * this.field4348[6] * this.field4348[13] + (this.field4348[15] * this.field4348[0] * this.field4348[5] * this.field4348[10] - this.field4348[5] * this.field4348[0] * this.field4348[11] * this.field4348[14] - this.field4348[15] * this.field4348[9] * this.field4348[6] * this.field4348[0]) - this.field4348[13] * this.field4348[10] * this.field4348[7] * this.field4348[0] - this.field4348[10] * this.field4348[1] * this.field4348[4] * this.field4348[15] + this.field4348[4] * this.field4348[1] * this.field4348[11] * this.field4348[14] - this.field4348[11] * this.field4348[6] * this.field4348[1] * this.field4348[12] - this.field4348[1] * this.field4348[7] * this.field4348[8] * this.field4348[14] + this.field4348[10] * this.field4348[7] * this.field4348[1] * this.field4348[12] - this.field4348[13] * this.field4348[11] * this.field4348[4] * this.field4348[2] - this.field4348[2] * this.field4348[5] * this.field4348[8] * this.field4348[15] + this.field4348[11] * this.field4348[5] * this.field4348[2] * this.field4348[12] - this.field4348[7] * this.field4348[2] * this.field4348[9] * this.field4348[12] - this.field4348[14] * this.field4348[4] * this.field4348[3] * this.field4348[9] + this.field4348[10] * this.field4348[4] * this.field4348[3] * this.field4348[13] + this.field4348[14] * this.field4348[8] * this.field4348[5] * this.field4348[3] - this.field4348[10] * this.field4348[5] * this.field4348[3] * this.field4348[12] - this.field4348[13] * this.field4348[6] * this.field4348[3] * this.field4348[8] + this.field4348[9] * this.field4348[6] * this.field4348[3] * this.field4348[12]; // L: 259 - } + public final void method6782() { + this.field4396 = 0.0F; // L: 54 + this.field4394 = 0.0F; // L: 55 + this.field4393 = 0.0F; // L: 56 + this.field4397 = 1.0F; // L: 57 + } // L: 58 @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1244640444" + descriptor = "(Lnh;B)V", + garbageValue = "94" ) - public void method7021() { - float var1 = 1.0F / this.method7075(); // L: 263 - float var2 = var1 * (this.field4348[10] * this.field4348[5] * this.field4348[15] - this.field4348[11] * this.field4348[5] * this.field4348[14] - this.field4348[15] * this.field4348[9] * this.field4348[6] + this.field4348[11] * this.field4348[6] * this.field4348[13] + this.field4348[14] * this.field4348[9] * this.field4348[7] - this.field4348[13] * this.field4348[7] * this.field4348[10]); // L: 264 - float var3 = (this.field4348[13] * this.field4348[10] * this.field4348[3] + (this.field4348[15] * -this.field4348[1] * this.field4348[10] + this.field4348[14] * this.field4348[11] * this.field4348[1] + this.field4348[2] * this.field4348[9] * this.field4348[15] - this.field4348[13] * this.field4348[11] * this.field4348[2] - this.field4348[3] * this.field4348[9] * this.field4348[14])) * var1; // L: 265 - float var4 = var1 * (this.field4348[5] * this.field4348[3] * this.field4348[14] + this.field4348[6] * this.field4348[1] * this.field4348[15] - this.field4348[14] * this.field4348[7] * this.field4348[1] - this.field4348[5] * this.field4348[2] * this.field4348[15] + this.field4348[13] * this.field4348[7] * this.field4348[2] - this.field4348[6] * this.field4348[3] * this.field4348[13]); // L: 266 - float var5 = (this.field4348[5] * this.field4348[2] * this.field4348[11] + -this.field4348[1] * this.field4348[6] * this.field4348[11] + this.field4348[10] * this.field4348[7] * this.field4348[1] - this.field4348[7] * this.field4348[2] * this.field4348[9] - this.field4348[10] * this.field4348[5] * this.field4348[3] + this.field4348[9] * this.field4348[3] * this.field4348[6]) * var1; // L: 267 - float var6 = (this.field4348[10] * this.field4348[7] * this.field4348[12] + (this.field4348[11] * this.field4348[4] * this.field4348[14] + -this.field4348[4] * this.field4348[10] * this.field4348[15] + this.field4348[15] * this.field4348[6] * this.field4348[8] - this.field4348[12] * this.field4348[6] * this.field4348[11] - this.field4348[14] * this.field4348[7] * this.field4348[8])) * var1; // L: 268 - float var7 = var1 * (this.field4348[14] * this.field4348[3] * this.field4348[8] + this.field4348[12] * this.field4348[2] * this.field4348[11] + (this.field4348[15] * this.field4348[0] * this.field4348[10] - this.field4348[11] * this.field4348[0] * this.field4348[14] - this.field4348[8] * this.field4348[2] * this.field4348[15]) - this.field4348[3] * this.field4348[10] * this.field4348[12]); // L: 269 - float var8 = (this.field4348[2] * this.field4348[4] * this.field4348[15] + this.field4348[14] * this.field4348[7] * this.field4348[0] + this.field4348[6] * -this.field4348[0] * this.field4348[15] - this.field4348[2] * this.field4348[7] * this.field4348[12] - this.field4348[14] * this.field4348[4] * this.field4348[3] + this.field4348[12] * this.field4348[3] * this.field4348[6]) * var1; // L: 270 - float var9 = var1 * (this.field4348[2] * this.field4348[7] * this.field4348[8] + (this.field4348[11] * this.field4348[0] * this.field4348[6] - this.field4348[0] * this.field4348[7] * this.field4348[10] - this.field4348[4] * this.field4348[2] * this.field4348[11]) + this.field4348[4] * this.field4348[3] * this.field4348[10] - this.field4348[6] * this.field4348[3] * this.field4348[8]); // L: 271 - float var10 = var1 * (this.field4348[7] * this.field4348[8] * this.field4348[13] + this.field4348[12] * this.field4348[5] * this.field4348[11] + (this.field4348[15] * this.field4348[4] * this.field4348[9] - this.field4348[13] * this.field4348[4] * this.field4348[11] - this.field4348[5] * this.field4348[8] * this.field4348[15]) - this.field4348[9] * this.field4348[7] * this.field4348[12]); // L: 272 - float var11 = var1 * (this.field4348[15] * this.field4348[8] * this.field4348[1] + this.field4348[13] * this.field4348[11] * this.field4348[0] + this.field4348[15] * -this.field4348[0] * this.field4348[9] - this.field4348[12] * this.field4348[1] * this.field4348[11] - this.field4348[8] * this.field4348[3] * this.field4348[13] + this.field4348[12] * this.field4348[9] * this.field4348[3]); // L: 273 - float var12 = var1 * (this.field4348[5] * this.field4348[0] * this.field4348[15] - this.field4348[13] * this.field4348[0] * this.field4348[7] - this.field4348[4] * this.field4348[1] * this.field4348[15] + this.field4348[12] * this.field4348[7] * this.field4348[1] + this.field4348[13] * this.field4348[3] * this.field4348[4] - this.field4348[5] * this.field4348[3] * this.field4348[12]); // L: 274 - float var13 = var1 * (this.field4348[8] * this.field4348[5] * this.field4348[3] + (this.field4348[4] * this.field4348[1] * this.field4348[11] + -this.field4348[0] * this.field4348[5] * this.field4348[11] + this.field4348[9] * this.field4348[0] * this.field4348[7] - this.field4348[1] * this.field4348[7] * this.field4348[8] - this.field4348[4] * this.field4348[3] * this.field4348[9])); // L: 275 - float var14 = (this.field4348[6] * this.field4348[9] * this.field4348[12] + (this.field4348[5] * this.field4348[8] * this.field4348[14] + this.field4348[13] * this.field4348[4] * this.field4348[10] + this.field4348[14] * -this.field4348[4] * this.field4348[9] - this.field4348[12] * this.field4348[10] * this.field4348[5] - this.field4348[8] * this.field4348[6] * this.field4348[13])) * var1; // L: 276 - float var15 = var1 * (this.field4348[0] * this.field4348[9] * this.field4348[14] - this.field4348[13] * this.field4348[0] * this.field4348[10] - this.field4348[8] * this.field4348[1] * this.field4348[14] + this.field4348[12] * this.field4348[1] * this.field4348[10] + this.field4348[13] * this.field4348[2] * this.field4348[8] - this.field4348[12] * this.field4348[2] * this.field4348[9]); // L: 277 - float var16 = var1 * (this.field4348[12] * this.field4348[5] * this.field4348[2] + (this.field4348[14] * -this.field4348[0] * this.field4348[5] + this.field4348[13] * this.field4348[6] * this.field4348[0] + this.field4348[4] * this.field4348[1] * this.field4348[14] - this.field4348[12] * this.field4348[6] * this.field4348[1] - this.field4348[2] * this.field4348[4] * this.field4348[13])); // L: 278 - float var17 = var1 * (this.field4348[9] * this.field4348[2] * this.field4348[4] + this.field4348[8] * this.field4348[6] * this.field4348[1] + (this.field4348[10] * this.field4348[5] * this.field4348[0] - this.field4348[0] * this.field4348[6] * this.field4348[9] - this.field4348[10] * this.field4348[1] * this.field4348[4]) - this.field4348[2] * this.field4348[5] * this.field4348[8]); // L: 279 - this.field4348[0] = var2; // L: 280 - this.field4348[1] = var3; // L: 281 - this.field4348[2] = var4; // L: 282 - this.field4348[3] = var5; // L: 283 - this.field4348[4] = var6; // L: 284 - this.field4348[5] = var7; // L: 285 - this.field4348[6] = var8; // L: 286 - this.field4348[7] = var9; // L: 287 - this.field4348[8] = var10; // L: 288 - this.field4348[9] = var11; // L: 289 - this.field4348[10] = var12; // L: 290 - this.field4348[11] = var13; // L: 291 - this.field4348[12] = var14; // L: 292 - this.field4348[13] = var15; // L: 293 - this.field4348[14] = var16; // L: 294 - this.field4348[15] = var17; // L: 295 - } // L: 296 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(I)[F", - garbageValue = "926402902" - ) - public float[] method7023() { - float[] var1 = new float[3]; // L: 330 - class385 var2 = new class385(this.field4348[0], this.field4348[1], this.field4348[2]); // L: 331 - class385 var3 = new class385(this.field4348[4], this.field4348[5], this.field4348[6]); // L: 332 - class385 var4 = new class385(this.field4348[8], this.field4348[9], this.field4348[10]); // L: 333 - var1[0] = var2.method6973(); // L: 334 - var1[1] = var3.method6973(); // L: 335 - var1[2] = var4.method6973(); // L: 336 - return var1; // L: 337 - } - - public String toString() { - StringBuilder var1 = new StringBuilder(); // L: 300 - this.method7010(); // L: 301 - this.method7009(); // L: 302 - - for (int var2 = 0; var2 < 4; ++var2) { // L: 303 - for (int var3 = 0; var3 < 4; ++var3) { // L: 304 - if (var3 > 0) { - var1.append("\t"); // L: 305 - } - - float var4 = this.field4348[var3 + var2 * 4]; // L: 306 - if (Math.sqrt((double)(var4 * var4)) < 9.999999747378752E-5D) { // L: 307 - var4 = 0.0F; - } - - var1.append(var4); // L: 308 - } - - var1.append("\n"); // L: 310 - } - - return var1.toString(); // L: 312 - } + public final void method6783(class387 var1) { + this.method6797(var1.field4397 * this.field4393 + var1.field4393 * this.field4397 + var1.field4394 * this.field4396 - var1.field4396 * this.field4394, this.field4393 * var1.field4396 + this.field4394 * var1.field4397 - var1.field4393 * this.field4396 + this.field4397 * var1.field4394, this.field4397 * var1.field4396 + (this.field4394 * var1.field4393 + var1.field4397 * this.field4396 - var1.field4394 * this.field4393), this.field4397 * var1.field4397 - var1.field4393 * this.field4393 - var1.field4394 * this.field4394 - var1.field4396 * this.field4396); // L: 61 + } // L: 62 public boolean equals(Object var1) { - if (!(var1 instanceof class387)) { // L: 323 - return false; + if (!(var1 instanceof class387)) { // L: 66 + return false; // L: 70 } else { - class387 var2 = (class387)var1; // L: 324 - - for (int var3 = 0; var3 < 16; ++var3) { // L: 325 - if (this.field4348[var3] != var2.field4348[var3]) { - return false; - } - } - - return true; // L: 326 + class387 var2 = (class387)var1; // L: 67 + return var2.field4393 == this.field4393 && var2.field4394 == this.field4394 && this.field4396 == var2.field4396 && this.field4397 == var2.field4397; // L: 68 } } public int hashCode() { - byte var2 = 1; // L: 317 - int var3 = var2 * 31 + Arrays.hashCode(this.field4348); // L: 318 - return var3; // L: 319 + boolean var1 = true; // L: 75 + float var2 = 1.0F; // L: 76 + var2 = 31.0F * var2 + this.field4393; + var2 = 31.0F * var2 + this.field4394; + var2 = this.field4396 + var2 * 31.0F; + var2 = 31.0F * var2 + this.field4397; // L: 80 + return (int)var2; + } + + public String toString() { + return this.field4393 + "," + this.field4394 + "," + this.field4396 + "," + this.field4397; // L: 86 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Llp;Llp;III)Lmx;", + garbageValue = "-1067807239" + ) + public static Font method6781(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { + if (!User.method6514(var0, var2, var3)) { // L: 69 + return null; + } else { + byte[] var5 = var1.takeFile(var2, var3); // L: 71 + Font var4; + if (var5 == null) { // L: 73 + var4 = null; // L: 74 + } else { + Font var6 = new Font(var5, class453.SpriteBuffer_xOffsets, class453.SpriteBuffer_yOffsets, ScriptFrame.SpriteBuffer_spriteWidths, class453.SpriteBuffer_spriteHeights, Decimator.SpriteBuffer_spritePalette, class127.SpriteBuffer_pixels); // L: 77 + VarcInt.method3325(); // L: 78 + var4 = var6; // L: 79 + } + + return var4; // L: 81 + } } } diff --git a/runescape-client/src/main/java/class388.java b/runescape-client/src/main/java/class388.java index a494995603..9a14624698 100644 --- a/runescape-client/src/main/java/class388.java +++ b/runescape-client/src/main/java/class388.java @@ -1,139 +1,436 @@ +import java.util.Arrays; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nb") -public class class388 { - @ObfuscatedName("v") - float field4355; - @ObfuscatedName("c") - float field4357; - @ObfuscatedName("i") - float field4353; - @ObfuscatedName("f") - float field4354; - @ObfuscatedName("b") - float field4352; - @ObfuscatedName("n") - float field4356; - @ObfuscatedName("s") - float field4351; - @ObfuscatedName("l") - float field4360; +@ObfuscatedName("nw") +public final class class388 { @ObfuscatedName("q") - float field4359; - @ObfuscatedName("o") - float field4362; - @ObfuscatedName("r") - float field4361; - @ObfuscatedName("p") - float field4358; + @ObfuscatedSignature( + descriptor = "[Lnw;" + ) + static class388[] field4402; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -96166557 + ) + static int field4401; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lnw;" + ) + public static final class388 field4403; + @ObfuscatedName("a") + public float[] field4400; static { - new class388(); - } // L: 6 + field4402 = new class388[0]; // L: 9 + MilliClock.method3219(100); // L: 14 + field4403 = new class388(); // L: 18 + } - class388() { - this.method7077(); // L: 22 - } // L: 23 + public class388() { + this.field4400 = new float[16]; + this.method6861(); // L: 43 + } // L: 44 + + @ObfuscatedSignature( + descriptor = "(Lnw;)V" + ) + public class388(class388 var1) { + this.field4400 = new float[16]; + this.method6868(var1); // L: 47 + } // L: 48 + + @ObfuscatedSignature( + descriptor = "(Lpx;Z)V" + ) + public class388(Buffer var1, boolean var2) { + this.field4400 = new float[16]; // L: 17 + this.method6808(var1, var2); // L: 51 + } // L: 52 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-830138790" + ) + public void method6865() { + synchronized(field4402) { // L: 37 + if (field4401 < GrandExchangeOfferTotalQuantityComparator.field4069 - 1) { // L: 38 + field4402[++field4401 - 1] = this; + } + + } + } // L: 40 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lpx;ZI)V", + garbageValue = "-1065467020" + ) + void method6808(Buffer var1, boolean var2) { + if (var2) { // L: 55 + class389 var4 = new class389(); // L: 56 + var4.method6877(ByteArrayPool.method6364(var1.readShort())); // L: 57 + var4.method6878(ByteArrayPool.method6364(var1.readShort())); // L: 58 + var4.method6879(ByteArrayPool.method6364(var1.readShort())); // L: 59 + var4.method6887((float)var1.readShort(), (float)var1.readShort(), (float)var1.readShort()); // L: 60 + this.method6812(var4); // L: 61 + } else { + for (int var3 = 0; var3 < 16; ++var3) { // L: 64 + this.field4400[var3] = var1.method7570(); // L: 65 + } + } + + } // L: 68 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)[F", + garbageValue = "817063007" + ) + float[] method6809() { + float[] var1 = new float[3]; // L: 71 + if ((double)this.field4400[2] < 0.999D && (double)this.field4400[2] > -0.999D) { // L: 72 + var1[1] = (float)(-Math.asin((double)this.field4400[2])); // L: 73 + double var2 = Math.cos((double)var1[1]); // L: 74 + var1[0] = (float)Math.atan2((double)this.field4400[6] / var2, (double)this.field4400[10] / var2); // L: 75 + var1[2] = (float)Math.atan2((double)this.field4400[1] / var2, (double)this.field4400[0] / var2); // L: 76 + } else { + var1[0] = 0.0F; // L: 79 + var1[1] = (float)Math.atan2((double)this.field4400[2], 0.0D); // L: 80 + var1[2] = (float)Math.atan2((double)(-this.field4400[9]), (double)this.field4400[5]); // L: 81 + } + + return var1; // L: 83 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I)[F", + garbageValue = "796221265" + ) + public float[] method6810() { + float[] var1 = new float[]{(float)(-Math.asin((double)this.field4400[6])), 0.0F, 0.0F}; // L: 87 88 + double var2 = Math.cos((double)var1[0]); // L: 89 + double var4; + double var6; + if (Math.abs(var2) > 0.005D) { // L: 90 + var4 = (double)this.field4400[2]; // L: 91 + var6 = (double)this.field4400[10]; // L: 92 + double var8 = (double)this.field4400[4]; // L: 93 + double var10 = (double)this.field4400[5]; // L: 94 + var1[1] = (float)Math.atan2(var4, var6); // L: 95 + var1[2] = (float)Math.atan2(var8, var10); // L: 96 + } else { + var4 = (double)this.field4400[1]; // L: 99 + var6 = (double)this.field4400[0]; // L: 100 + if (this.field4400[6] < 0.0F) { // L: 101 + var1[1] = (float)Math.atan2(var4, var6); // L: 102 + } else { + var1[1] = (float)(-Math.atan2(var4, var6)); // L: 105 + } + + var1[2] = 0.0F; // L: 107 + } + + return var1; // L: 109 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1318194285" + ) + void method6861() { + this.field4400[0] = 1.0F; // L: 113 + this.field4400[1] = 0.0F; // L: 114 + this.field4400[2] = 0.0F; // L: 115 + this.field4400[3] = 0.0F; // L: 116 + this.field4400[4] = 0.0F; // L: 117 + this.field4400[5] = 1.0F; // L: 118 + this.field4400[6] = 0.0F; // L: 119 + this.field4400[7] = 0.0F; // L: 120 + this.field4400[8] = 0.0F; // L: 121 + this.field4400[9] = 0.0F; // L: 122 + this.field4400[10] = 1.0F; // L: 123 + this.field4400[11] = 0.0F; // L: 124 + this.field4400[12] = 0.0F; // L: 125 + this.field4400[13] = 0.0F; // L: 126 + this.field4400[14] = 0.0F; // L: 127 + this.field4400[15] = 1.0F; // L: 128 + } // L: 129 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2033689784" + ) + public void method6829() { + this.field4400[0] = 0.0F; // L: 132 + this.field4400[1] = 0.0F; // L: 133 + this.field4400[2] = 0.0F; // L: 134 + this.field4400[3] = 0.0F; // L: 135 + this.field4400[4] = 0.0F; // L: 136 + this.field4400[5] = 0.0F; // L: 137 + this.field4400[6] = 0.0F; // L: 138 + this.field4400[7] = 0.0F; // L: 139 + this.field4400[8] = 0.0F; // L: 140 + this.field4400[9] = 0.0F; // L: 141 + this.field4400[10] = 0.0F; // L: 142 + this.field4400[11] = 0.0F; // L: 143 + this.field4400[12] = 0.0F; // L: 144 + this.field4400[13] = 0.0F; // L: 145 + this.field4400[14] = 0.0F; // L: 146 + this.field4400[15] = 0.0F; // L: 147 + } // L: 148 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Lnw;B)V", + garbageValue = "37" + ) + public void method6868(class388 var1) { + System.arraycopy(var1.field4400, 0, this.field4400, 0, 16); // L: 151 + } // L: 152 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1869591200" + descriptor = "(FB)V", + garbageValue = "114" ) - void method7077() { - this.field4358 = 0.0F; // L: 26 - this.field4361 = 0.0F; // L: 27 - this.field4362 = 0.0F; // L: 28 - this.field4360 = 0.0F; // L: 29 - this.field4351 = 0.0F; // L: 30 - this.field4356 = 0.0F; // L: 31 - this.field4354 = 0.0F; // L: 32 - this.field4353 = 0.0F; // L: 33 - this.field4357 = 0.0F; // L: 34 - this.field4359 = 1.0F; // L: 35 - this.field4352 = 1.0F; // L: 36 - this.field4355 = 1.0F; // L: 37 - } // L: 38 + public void method6806(float var1) { + this.method6814(var1, var1, var1); // L: 155 + } // L: 156 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(FFFI)V", + garbageValue = "627006193" + ) + public void method6814(float var1, float var2, float var3) { + this.method6861(); // L: 159 + this.field4400[0] = var1; // L: 160 + this.field4400[5] = var2; // L: 161 + this.field4400[10] = var3; // L: 162 + } // L: 163 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(FB)V", - garbageValue = "1" + descriptor = "(Lnw;I)V", + garbageValue = "-1672549450" ) - void method7078(float var1) { - float var2 = (float)Math.cos((double)var1); // L: 41 - float var3 = (float)Math.sin((double)var1); // L: 42 - float var4 = this.field4357; // L: 43 - float var5 = this.field4352; // L: 44 - float var6 = this.field4360; // L: 45 - float var7 = this.field4361; // L: 46 - this.field4357 = var2 * var4 - this.field4353 * var3; // L: 47 - this.field4353 = this.field4353 * var2 + var4 * var3; // L: 48 - this.field4352 = var2 * var5 - this.field4356 * var3; // L: 49 - this.field4356 = this.field4356 * var2 + var5 * var3; // L: 50 - this.field4360 = var6 * var2 - var3 * this.field4359; // L: 51 - this.field4359 = var2 * this.field4359 + var6 * var3; // L: 52 - this.field4361 = var7 * var2 - var3 * this.field4358; // L: 53 - this.field4358 = this.field4358 * var2 + var7 * var3; // L: 54 - } // L: 55 + public void method6815(class388 var1) { + for (int var2 = 0; var2 < this.field4400.length; ++var2) { // L: 166 + float[] var10000 = this.field4400; // L: 167 + var10000[var2] += var1.field4400[var2]; + } - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(FI)V", - garbageValue = "-118819231" - ) - void method7083(float var1) { - float var2 = (float)Math.cos((double)var1); // L: 58 - float var3 = (float)Math.sin((double)var1); // L: 59 - float var4 = this.field4355; // L: 60 - float var5 = this.field4354; // L: 61 - float var6 = this.field4351; // L: 62 - float var7 = this.field4362; // L: 63 - this.field4355 = this.field4353 * var3 + var2 * var4; // L: 64 - this.field4353 = this.field4353 * var2 - var4 * var3; // L: 65 - this.field4354 = var2 * var5 + this.field4356 * var3; // L: 66 - this.field4356 = this.field4356 * var2 - var5 * var3; // L: 67 - this.field4351 = var6 * var2 + var3 * this.field4359; // L: 68 - this.field4359 = this.field4359 * var2 - var3 * var6; // L: 69 - this.field4362 = var3 * this.field4358 + var2 * var7; // L: 70 - this.field4358 = this.field4358 * var2 - var7 * var3; // L: 71 - } // L: 72 + } // L: 169 - @ObfuscatedName("f") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(FS)V", - garbageValue = "9676" + descriptor = "(Lnw;B)V", + garbageValue = "0" ) - void method7082(float var1) { - float var2 = (float)Math.cos((double)var1); // L: 75 - float var3 = (float)Math.sin((double)var1); // L: 76 - float var4 = this.field4355; // L: 77 - float var5 = this.field4354; // L: 78 - float var6 = this.field4351; // L: 79 - float var7 = this.field4362; // L: 80 - this.field4355 = var4 * var2 - this.field4357 * var3; // L: 81 - this.field4357 = this.field4357 * var2 + var4 * var3; // L: 82 - this.field4354 = var2 * var5 - this.field4352 * var3; // L: 83 - this.field4352 = var3 * var5 + this.field4352 * var2; // L: 84 - this.field4351 = var6 * var2 - this.field4360 * var3; // L: 85 - this.field4360 = var2 * this.field4360 + var6 * var3; // L: 86 - this.field4362 = var2 * var7 - this.field4361 * var3; // L: 87 - this.field4361 = var3 * var7 + this.field4361 * var2; // L: 88 - } // L: 89 + public void method6816(class388 var1) { + float var2 = var1.field4400[8] * this.field4400[2] + var1.field4400[4] * this.field4400[1] + var1.field4400[0] * this.field4400[0] + this.field4400[3] * var1.field4400[12]; // L: 172 + float var3 = this.field4400[1] * var1.field4400[5] + var1.field4400[1] * this.field4400[0] + var1.field4400[9] * this.field4400[2] + var1.field4400[13] * this.field4400[3]; // L: 173 + float var4 = this.field4400[2] * var1.field4400[10] + this.field4400[1] * var1.field4400[6] + var1.field4400[2] * this.field4400[0] + this.field4400[3] * var1.field4400[14]; // L: 174 + float var5 = this.field4400[3] * var1.field4400[15] + var1.field4400[11] * this.field4400[2] + var1.field4400[3] * this.field4400[0] + this.field4400[1] * var1.field4400[7]; // L: 175 + float var6 = this.field4400[7] * var1.field4400[12] + this.field4400[4] * var1.field4400[0] + var1.field4400[4] * this.field4400[5] + this.field4400[6] * var1.field4400[8]; // L: 176 + float var7 = var1.field4400[1] * this.field4400[4] + var1.field4400[5] * this.field4400[5] + var1.field4400[9] * this.field4400[6] + var1.field4400[13] * this.field4400[7]; // L: 177 + float var8 = this.field4400[6] * var1.field4400[10] + this.field4400[4] * var1.field4400[2] + var1.field4400[6] * this.field4400[5] + this.field4400[7] * var1.field4400[14]; // L: 178 + float var9 = this.field4400[4] * var1.field4400[3] + this.field4400[5] * var1.field4400[7] + this.field4400[6] * var1.field4400[11] + this.field4400[7] * var1.field4400[15]; // L: 179 + float var10 = this.field4400[9] * var1.field4400[4] + var1.field4400[0] * this.field4400[8] + var1.field4400[8] * this.field4400[10] + this.field4400[11] * var1.field4400[12]; // L: 180 + float var11 = var1.field4400[1] * this.field4400[8] + var1.field4400[5] * this.field4400[9] + this.field4400[10] * var1.field4400[9] + var1.field4400[13] * this.field4400[11]; // L: 181 + float var12 = var1.field4400[14] * this.field4400[11] + var1.field4400[6] * this.field4400[9] + var1.field4400[2] * this.field4400[8] + var1.field4400[10] * this.field4400[10]; // L: 182 + float var13 = var1.field4400[15] * this.field4400[11] + var1.field4400[11] * this.field4400[10] + var1.field4400[7] * this.field4400[9] + this.field4400[8] * var1.field4400[3]; // L: 183 + float var14 = var1.field4400[8] * this.field4400[14] + this.field4400[13] * var1.field4400[4] + var1.field4400[0] * this.field4400[12] + var1.field4400[12] * this.field4400[15]; // L: 184 + float var15 = var1.field4400[13] * this.field4400[15] + var1.field4400[9] * this.field4400[14] + this.field4400[13] * var1.field4400[5] + var1.field4400[1] * this.field4400[12]; // L: 185 + float var16 = this.field4400[13] * var1.field4400[6] + this.field4400[12] * var1.field4400[2] + this.field4400[14] * var1.field4400[10] + this.field4400[15] * var1.field4400[14]; // L: 186 + float var17 = this.field4400[12] * var1.field4400[3] + var1.field4400[7] * this.field4400[13] + this.field4400[14] * var1.field4400[11] + var1.field4400[15] * this.field4400[15]; // L: 187 + this.field4400[0] = var2; // L: 188 + this.field4400[1] = var3; // L: 189 + this.field4400[2] = var4; // L: 190 + this.field4400[3] = var5; // L: 191 + this.field4400[4] = var6; // L: 192 + this.field4400[5] = var7; // L: 193 + this.field4400[6] = var8; // L: 194 + this.field4400[7] = var9; // L: 195 + this.field4400[8] = var10; // L: 196 + this.field4400[9] = var11; // L: 197 + this.field4400[10] = var12; // L: 198 + this.field4400[11] = var13; // L: 199 + this.field4400[12] = var14; // L: 200 + this.field4400[13] = var15; // L: 201 + this.field4400[14] = var16; // L: 202 + this.field4400[15] = var17; // L: 203 + } // L: 204 @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(FFFI)V", - garbageValue = "-1907030010" + descriptor = "(Lnh;I)V", + garbageValue = "74712963" ) - void method7091(float var1, float var2, float var3) { - this.field4362 += var1; // L: 92 - this.field4361 += var2; // L: 93 - this.field4358 += var3; // L: 94 - } // L: 95 + public void method6817(class387 var1) { + float var2 = var1.field4397 * var1.field4397; // L: 207 + float var3 = var1.field4393 * var1.field4397; // L: 208 + float var4 = var1.field4397 * var1.field4394; // L: 209 + float var5 = var1.field4396 * var1.field4397; // L: 210 + float var6 = var1.field4393 * var1.field4393; // L: 211 + float var7 = var1.field4394 * var1.field4393; // L: 212 + float var8 = var1.field4396 * var1.field4393; // L: 213 + float var9 = var1.field4394 * var1.field4394; // L: 214 + float var10 = var1.field4394 * var1.field4396; // L: 215 + float var11 = var1.field4396 * var1.field4396; // L: 216 + this.field4400[0] = var2 + var6 - var11 - var9; // L: 217 + this.field4400[1] = var7 + var5 + var7 + var5; // L: 218 + this.field4400[2] = var8 - var4 - var4 + var8; // L: 219 + this.field4400[4] = var7 + (var7 - var5 - var5); // L: 220 + this.field4400[5] = var9 + var2 - var6 - var11; // L: 221 + this.field4400[6] = var10 + var3 + var10 + var3; // L: 222 + this.field4400[8] = var4 + var8 + var4 + var8; // L: 223 + this.field4400[9] = var10 + (var10 - var3 - var3); // L: 224 + this.field4400[10] = var2 + var11 - var9 - var6; // L: 225 + } // L: 226 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Lnt;I)V", + garbageValue = "-51279559" + ) + void method6812(class389 var1) { + this.field4400[0] = var1.field4410; // L: 229 + this.field4400[1] = var1.field4405; // L: 230 + this.field4400[2] = var1.field4406; // L: 231 + this.field4400[3] = 0.0F; // L: 232 + this.field4400[4] = var1.field4407; // L: 233 + this.field4400[5] = var1.field4409; // L: 234 + this.field4400[6] = var1.field4412; // L: 235 + this.field4400[7] = 0.0F; // L: 236 + this.field4400[8] = var1.field4413; // L: 237 + this.field4400[9] = var1.field4411; // L: 238 + this.field4400[10] = var1.field4404; // L: 239 + this.field4400[11] = 0.0F; // L: 240 + this.field4400[12] = var1.field4408; // L: 241 + this.field4400[13] = var1.field4414; // L: 242 + this.field4400[14] = var1.field4415; // L: 243 + this.field4400[15] = 1.0F; // L: 244 + } // L: 245 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)F", + garbageValue = "1576396889" + ) + float method6819() { + return this.field4400[12] * this.field4400[9] * this.field4400[6] * this.field4400[3] + (this.field4400[5] * this.field4400[3] * this.field4400[8] * this.field4400[14] + this.field4400[13] * this.field4400[4] * this.field4400[3] * this.field4400[10] + (this.field4400[13] * this.field4400[8] * this.field4400[7] * this.field4400[2] + this.field4400[4] * this.field4400[2] * this.field4400[9] * this.field4400[15] + this.field4400[7] * this.field4400[1] * this.field4400[10] * this.field4400[12] + (this.field4400[8] * this.field4400[1] * this.field4400[6] * this.field4400[15] + this.field4400[14] * this.field4400[1] * this.field4400[4] * this.field4400[11] + (this.field4400[0] * this.field4400[5] * this.field4400[10] * this.field4400[15] - this.field4400[14] * this.field4400[0] * this.field4400[5] * this.field4400[11] - this.field4400[15] * this.field4400[0] * this.field4400[6] * this.field4400[9] + this.field4400[0] * this.field4400[6] * this.field4400[11] * this.field4400[13] + this.field4400[9] * this.field4400[7] * this.field4400[0] * this.field4400[14] - this.field4400[13] * this.field4400[7] * this.field4400[0] * this.field4400[10] - this.field4400[15] * this.field4400[1] * this.field4400[4] * this.field4400[10]) - this.field4400[12] * this.field4400[6] * this.field4400[1] * this.field4400[11] - this.field4400[7] * this.field4400[1] * this.field4400[8] * this.field4400[14]) - this.field4400[13] * this.field4400[4] * this.field4400[2] * this.field4400[11] - this.field4400[15] * this.field4400[2] * this.field4400[5] * this.field4400[8] + this.field4400[12] * this.field4400[11] * this.field4400[2] * this.field4400[5] - this.field4400[9] * this.field4400[2] * this.field4400[7] * this.field4400[12] - this.field4400[14] * this.field4400[9] * this.field4400[3] * this.field4400[4]) - this.field4400[12] * this.field4400[3] * this.field4400[5] * this.field4400[10] - this.field4400[6] * this.field4400[3] * this.field4400[8] * this.field4400[13]); // L: 248 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "122973203" + ) + public void method6820() { + float var1 = 1.0F / this.method6819(); // L: 252 + float var2 = (this.field4400[15] * this.field4400[10] * this.field4400[5] - this.field4400[11] * this.field4400[5] * this.field4400[14] - this.field4400[15] * this.field4400[6] * this.field4400[9] + this.field4400[13] * this.field4400[6] * this.field4400[11] + this.field4400[14] * this.field4400[7] * this.field4400[9] - this.field4400[7] * this.field4400[10] * this.field4400[13]) * var1; // L: 253 + float var3 = var1 * (this.field4400[13] * this.field4400[10] * this.field4400[3] + (this.field4400[1] * this.field4400[11] * this.field4400[14] + this.field4400[15] * this.field4400[10] * -this.field4400[1] + this.field4400[2] * this.field4400[9] * this.field4400[15] - this.field4400[11] * this.field4400[2] * this.field4400[13] - this.field4400[9] * this.field4400[3] * this.field4400[14])); // L: 254 + float var4 = var1 * (this.field4400[14] * this.field4400[5] * this.field4400[3] + this.field4400[2] * this.field4400[7] * this.field4400[13] + (this.field4400[6] * this.field4400[1] * this.field4400[15] - this.field4400[14] * this.field4400[7] * this.field4400[1] - this.field4400[15] * this.field4400[2] * this.field4400[5]) - this.field4400[13] * this.field4400[3] * this.field4400[6]); // L: 255 + float var5 = var1 * (this.field4400[11] * -this.field4400[1] * this.field4400[6] + this.field4400[10] * this.field4400[7] * this.field4400[1] + this.field4400[11] * this.field4400[5] * this.field4400[2] - this.field4400[7] * this.field4400[2] * this.field4400[9] - this.field4400[10] * this.field4400[3] * this.field4400[5] + this.field4400[6] * this.field4400[3] * this.field4400[9]); // L: 256 + float var6 = var1 * (this.field4400[15] * this.field4400[8] * this.field4400[6] + this.field4400[14] * this.field4400[11] * this.field4400[4] + this.field4400[10] * -this.field4400[4] * this.field4400[15] - this.field4400[11] * this.field4400[6] * this.field4400[12] - this.field4400[8] * this.field4400[7] * this.field4400[14] + this.field4400[12] * this.field4400[10] * this.field4400[7]); // L: 257 + float var7 = (this.field4400[8] * this.field4400[3] * this.field4400[14] + this.field4400[11] * this.field4400[2] * this.field4400[12] + (this.field4400[15] * this.field4400[0] * this.field4400[10] - this.field4400[14] * this.field4400[0] * this.field4400[11] - this.field4400[15] * this.field4400[2] * this.field4400[8]) - this.field4400[12] * this.field4400[3] * this.field4400[10]) * var1; // L: 258 + float var8 = var1 * (this.field4400[6] * this.field4400[3] * this.field4400[12] + (this.field4400[15] * -this.field4400[0] * this.field4400[6] + this.field4400[7] * this.field4400[0] * this.field4400[14] + this.field4400[15] * this.field4400[4] * this.field4400[2] - this.field4400[12] * this.field4400[7] * this.field4400[2] - this.field4400[14] * this.field4400[3] * this.field4400[4])); // L: 259 + float var9 = var1 * (this.field4400[11] * this.field4400[6] * this.field4400[0] - this.field4400[10] * this.field4400[7] * this.field4400[0] - this.field4400[2] * this.field4400[4] * this.field4400[11] + this.field4400[2] * this.field4400[7] * this.field4400[8] + this.field4400[4] * this.field4400[3] * this.field4400[10] - this.field4400[6] * this.field4400[3] * this.field4400[8]); // L: 260 + float var10 = (this.field4400[11] * this.field4400[5] * this.field4400[12] + (this.field4400[15] * this.field4400[4] * this.field4400[9] - this.field4400[13] * this.field4400[4] * this.field4400[11] - this.field4400[8] * this.field4400[5] * this.field4400[15]) + this.field4400[8] * this.field4400[7] * this.field4400[13] - this.field4400[12] * this.field4400[9] * this.field4400[7]) * var1; // L: 261 + float var11 = (this.field4400[9] * this.field4400[3] * this.field4400[12] + (this.field4400[11] * this.field4400[0] * this.field4400[13] + this.field4400[9] * -this.field4400[0] * this.field4400[15] + this.field4400[8] * this.field4400[1] * this.field4400[15] - this.field4400[12] * this.field4400[11] * this.field4400[1] - this.field4400[3] * this.field4400[8] * this.field4400[13])) * var1; // L: 262 + float var12 = var1 * (this.field4400[15] * this.field4400[5] * this.field4400[0] - this.field4400[0] * this.field4400[7] * this.field4400[13] - this.field4400[1] * this.field4400[4] * this.field4400[15] + this.field4400[7] * this.field4400[1] * this.field4400[12] + this.field4400[13] * this.field4400[3] * this.field4400[4] - this.field4400[12] * this.field4400[3] * this.field4400[5]); // L: 263 + float var13 = var1 * (this.field4400[3] * this.field4400[5] * this.field4400[8] + (this.field4400[1] * this.field4400[4] * this.field4400[11] + this.field4400[7] * this.field4400[0] * this.field4400[9] + -this.field4400[0] * this.field4400[5] * this.field4400[11] - this.field4400[7] * this.field4400[1] * this.field4400[8] - this.field4400[9] * this.field4400[3] * this.field4400[4])); // L: 264 + float var14 = (this.field4400[10] * this.field4400[4] * this.field4400[13] + this.field4400[9] * -this.field4400[4] * this.field4400[14] + this.field4400[8] * this.field4400[5] * this.field4400[14] - this.field4400[5] * this.field4400[10] * this.field4400[12] - this.field4400[13] * this.field4400[8] * this.field4400[6] + this.field4400[12] * this.field4400[6] * this.field4400[9]) * var1; // L: 265 + float var15 = (this.field4400[14] * this.field4400[9] * this.field4400[0] - this.field4400[0] * this.field4400[10] * this.field4400[13] - this.field4400[1] * this.field4400[8] * this.field4400[14] + this.field4400[12] * this.field4400[1] * this.field4400[10] + this.field4400[8] * this.field4400[2] * this.field4400[13] - this.field4400[12] * this.field4400[9] * this.field4400[2]) * var1; // L: 266 + float var16 = (this.field4400[14] * this.field4400[4] * this.field4400[1] + this.field4400[14] * this.field4400[5] * -this.field4400[0] + this.field4400[13] * this.field4400[6] * this.field4400[0] - this.field4400[12] * this.field4400[1] * this.field4400[6] - this.field4400[13] * this.field4400[4] * this.field4400[2] + this.field4400[5] * this.field4400[2] * this.field4400[12]) * var1; // L: 267 + float var17 = (this.field4400[9] * this.field4400[2] * this.field4400[4] + this.field4400[5] * this.field4400[0] * this.field4400[10] - this.field4400[9] * this.field4400[0] * this.field4400[6] - this.field4400[1] * this.field4400[4] * this.field4400[10] + this.field4400[1] * this.field4400[6] * this.field4400[8] - this.field4400[8] * this.field4400[5] * this.field4400[2]) * var1; // L: 268 + this.field4400[0] = var2; // L: 269 + this.field4400[1] = var3; // L: 270 + this.field4400[2] = var4; // L: 271 + this.field4400[3] = var5; // L: 272 + this.field4400[4] = var6; // L: 273 + this.field4400[5] = var7; // L: 274 + this.field4400[6] = var8; // L: 275 + this.field4400[7] = var9; // L: 276 + this.field4400[8] = var10; // L: 277 + this.field4400[9] = var11; // L: 278 + this.field4400[10] = var12; // L: 279 + this.field4400[11] = var13; // L: 280 + this.field4400[12] = var14; // L: 281 + this.field4400[13] = var15; // L: 282 + this.field4400[14] = var16; // L: 283 + this.field4400[15] = var17; // L: 284 + } // L: 285 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(B)[F", + garbageValue = "82" + ) + public float[] method6821() { + float[] var1 = new float[3]; // L: 322 + class386 var2 = new class386(this.field4400[0], this.field4400[1], this.field4400[2]); // L: 323 + class386 var3 = new class386(this.field4400[4], this.field4400[5], this.field4400[6]); // L: 324 + class386 var4 = new class386(this.field4400[8], this.field4400[9], this.field4400[10]); // L: 325 + var1[0] = var2.method6771(); // L: 326 + var1[1] = var3.method6771(); // L: 327 + var1[2] = var4.method6771(); // L: 328 + return var1; // L: 329 + } + + public int hashCode() { + boolean var1 = true; // L: 307 + byte var2 = 1; // L: 308 + int var3 = 31 * var2 + Arrays.hashCode(this.field4400); // L: 309 + return var3; // L: 310 + } public String toString() { - return this.field4355 + "," + this.field4354 + "," + this.field4351 + "," + this.field4362 + "\n" + this.field4357 + "," + this.field4352 + "," + this.field4360 + "," + this.field4361 + "\n" + this.field4353 + "," + this.field4356 + "," + this.field4359 + "," + this.field4358; // L: 99 + StringBuilder var1 = new StringBuilder(); // L: 290 + this.method6810(); // L: 291 + this.method6809(); // L: 292 + + for (int var2 = 0; var2 < 4; ++var2) { // L: 293 + for (int var3 = 0; var3 < 4; ++var3) { // L: 294 + if (var3 > 0) { + var1.append("\t"); // L: 295 + } + + float var4 = this.field4400[var3 + var2 * 4]; // L: 296 + if (Math.sqrt((double)(var4 * var4)) < 9.999999747378752E-5D) { // L: 297 + var4 = 0.0F; + } + + var1.append(var4); // L: 298 + } + + var1.append("\n"); // L: 300 + } + + return var1.toString(); // L: 302 + } + + public boolean equals(Object var1) { + if (!(var1 instanceof class388)) { // L: 315 + return false; + } else { + class388 var2 = (class388)var1; // L: 316 + + for (int var3 = 0; var3 < 16; ++var3) { // L: 317 + if (this.field4400[var3] != var2.field4400[var3]) { + return false; + } + } + + return true; // L: 318 + } } } diff --git a/runescape-client/src/main/java/class389.java b/runescape-client/src/main/java/class389.java index 7004028664..00dc1310a3 100644 --- a/runescape-client/src/main/java/class389.java +++ b/runescape-client/src/main/java/class389.java @@ -1,44 +1,139 @@ -import java.io.IOException; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nj") +@ObfuscatedName("nt") public class class389 { + @ObfuscatedName("o") + float field4410; + @ObfuscatedName("q") + float field4405; + @ObfuscatedName("l") + float field4406; + @ObfuscatedName("k") + float field4407; + @ObfuscatedName("a") + float field4409; + @ObfuscatedName("m") + float field4412; + @ObfuscatedName("p") + float field4413; + @ObfuscatedName("s") + float field4411; + @ObfuscatedName("r") + float field4404; @ObfuscatedName("v") - float[] field4364; + float field4408; + @ObfuscatedName("y") + float field4414; @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1953516053 - ) - int field4363; + float field4415; - class389(float[] var1, int var2) { - this.field4364 = var1; // L: 10 - this.field4363 = var2; // L: 11 - } // L: 12 + static { + new class389(); + } // L: 6 - @ObfuscatedName("hh") + class389() { + this.method6876(); // L: 22 + } // L: 23 + + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "82" + descriptor = "(I)V", + garbageValue = "1906485872" ) - static final void method7094(boolean var0) { - class116.playPcmPlayers(); // L: 5631 - ++Client.packetWriter.pendingWrites; // L: 5632 - if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 5633 - Client.packetWriter.pendingWrites = 0; // L: 5634 - if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { // L: 5635 - PacketBufferNode var1 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2950, Client.packetWriter.isaacCipher); // L: 5637 - Client.packetWriter.addNode(var1); // L: 5638 + void method6876() { + this.field4415 = 0.0F; // L: 26 + this.field4414 = 0.0F; // L: 27 + this.field4408 = 0.0F; // L: 28 + this.field4411 = 0.0F; // L: 29 + this.field4413 = 0.0F; // L: 30 + this.field4412 = 0.0F; // L: 31 + this.field4407 = 0.0F; // L: 32 + this.field4406 = 0.0F; // L: 33 + this.field4405 = 0.0F; // L: 34 + this.field4404 = 1.0F; // L: 35 + this.field4409 = 1.0F; // L: 36 + this.field4410 = 1.0F; // L: 37 + } // L: 38 - try { - Client.packetWriter.flush(); // L: 5640 - } catch (IOException var3) { // L: 5642 - Client.hadNetworkError = true; // L: 5643 - } - } + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(FI)V", + garbageValue = "-1653714241" + ) + void method6877(float var1) { + float var2 = (float)Math.cos((double)var1); // L: 41 + float var3 = (float)Math.sin((double)var1); // L: 42 + float var4 = this.field4405; // L: 43 + float var5 = this.field4409; // L: 44 + float var6 = this.field4411; // L: 45 + float var7 = this.field4414; // L: 46 + this.field4405 = var4 * var2 - this.field4406 * var3; // L: 47 + this.field4406 = this.field4406 * var2 + var3 * var4; // L: 48 + this.field4409 = var5 * var2 - var3 * this.field4412; // L: 49 + this.field4412 = var3 * var5 + this.field4412 * var2; // L: 50 + this.field4411 = var6 * var2 - this.field4404 * var3; // L: 51 + this.field4404 = var3 * var6 + var2 * this.field4404; // L: 52 + this.field4414 = var2 * var7 - var3 * this.field4415; // L: 53 + this.field4415 = var2 * this.field4415 + var7 * var3; // L: 54 + } // L: 55 - } - } // L: 5646 + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(FI)V", + garbageValue = "1318784664" + ) + void method6878(float var1) { + float var2 = (float)Math.cos((double)var1); // L: 58 + float var3 = (float)Math.sin((double)var1); // L: 59 + float var4 = this.field4410; // L: 60 + float var5 = this.field4407; // L: 61 + float var6 = this.field4413; // L: 62 + float var7 = this.field4408; // L: 63 + this.field4410 = var4 * var2 + this.field4406 * var3; // L: 64 + this.field4406 = this.field4406 * var2 - var4 * var3; // L: 65 + this.field4407 = var5 * var2 + var3 * this.field4412; // L: 66 + this.field4412 = var2 * this.field4412 - var5 * var3; // L: 67 + this.field4413 = var2 * var6 + var3 * this.field4404; // L: 68 + this.field4404 = var2 * this.field4404 - var6 * var3; // L: 69 + this.field4408 = this.field4415 * var3 + var7 * var2; // L: 70 + this.field4415 = this.field4415 * var2 - var3 * var7; // L: 71 + } // L: 72 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(FI)V", + garbageValue = "1867033025" + ) + void method6879(float var1) { + float var2 = (float)Math.cos((double)var1); // L: 75 + float var3 = (float)Math.sin((double)var1); // L: 76 + float var4 = this.field4410; // L: 77 + float var5 = this.field4407; // L: 78 + float var6 = this.field4413; // L: 79 + float var7 = this.field4408; // L: 80 + this.field4410 = var2 * var4 - var3 * this.field4405; // L: 81 + this.field4405 = var4 * var3 + var2 * this.field4405; // L: 82 + this.field4407 = var5 * var2 - this.field4409 * var3; // L: 83 + this.field4409 = var5 * var3 + this.field4409 * var2; // L: 84 + this.field4413 = var2 * var6 - var3 * this.field4411; // L: 85 + this.field4411 = var6 * var3 + this.field4411 * var2; // L: 86 + this.field4408 = var2 * var7 - var3 * this.field4414; // L: 87 + this.field4414 = this.field4414 * var2 + var7 * var3; // L: 88 + } // L: 89 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(FFFI)V", + garbageValue = "-1766831994" + ) + void method6887(float var1, float var2, float var3) { + this.field4408 += var1; // L: 92 + this.field4414 += var2; // L: 93 + this.field4415 += var3; // L: 94 + } // L: 95 + + public String toString() { + return this.field4410 + "," + this.field4407 + "," + this.field4413 + "," + this.field4408 + "\n" + this.field4405 + "," + this.field4409 + "," + this.field4411 + "," + this.field4414 + "\n" + this.field4406 + "," + this.field4412 + "," + this.field4404 + "," + this.field4415; // L: 99 + } } diff --git a/runescape-client/src/main/java/class390.java b/runescape-client/src/main/java/class390.java index a87ee96ba0..fec03855c9 100644 --- a/runescape-client/src/main/java/class390.java +++ b/runescape-client/src/main/java/class390.java @@ -1,54 +1,18 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ob") -public enum class390 implements MouseWheel { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lob;" - ) - field4369(0, 1), - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lob;" - ) - field4366(3, 2), - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lob;" - ) - field4367(2, 3), - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lob;" - ) - field4368(1, 10); - - @ObfuscatedName("b") +@ObfuscatedName("oo") +public class class390 { + @ObfuscatedName("o") + float[] field4416; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1064934695 + intValue = 1754270311 ) - final int field4370; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1290046755 - ) - final int field4365; + int field4417; - class390(int var3, int var4) { - this.field4370 = var3; // L: 16 - this.field4365 = var4; // L: 17 - } // L: 18 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "16" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field4365; // L: 21 - } + class390(float[] var1, int var2) { + this.field4416 = var1; // L: 10 + this.field4417 = var2; // L: 11 + } // L: 12 } diff --git a/runescape-client/src/main/java/class391.java b/runescape-client/src/main/java/class391.java index 6d33629c1d..972fea8dce 100644 --- a/runescape-client/src/main/java/class391.java +++ b/runescape-client/src/main/java/class391.java @@ -3,78 +3,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oa") -public class class391 implements class396 { - @ObfuscatedName("fn") - @ObfuscatedGetter( - intValue = -1037477201 - ) - static int field4372; - @ObfuscatedName("v") +@ObfuscatedName("oe") +public enum class391 implements MouseWheel { + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lpd;" + descriptor = "Loe;" ) - public final class419 field4373; - + field4422(1, 1), + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lpp;)V" + descriptor = "Loe;" ) - class391(class420 var1) { - this.field4373 = var1; // L: 14 - } // L: 15 - - @ObfuscatedSignature( - descriptor = "(Lom;)V" - ) - public class391(class392 var1) { - this(new class420(var1)); // L: 10 - } // L: 11 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "50" - ) - public int method7105(int var1) { - return this.field4373.vmethod7471(var1); // L: 18 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZZI)V", - garbageValue = "977969655" - ) - @Export("openURL") - public static void openURL(String var0, boolean var1, boolean var2) { - WorldMapElement.method3403(var0, var1, "openjs", var2); // L: 27 - } // L: 28 - + field4419(2, 2), @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)[Lqi;", - garbageValue = "1455527219" + descriptor = "Loe;" ) - static SpritePixels[] method7111() { - SpritePixels[] var0 = new SpritePixels[class451.SpriteBuffer_spriteCount]; // L: 169 + field4421(0, 3), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Loe;" + ) + field4424(3, 10); - for (int var1 = 0; var1 < class451.SpriteBuffer_spriteCount; ++var1) { // L: 170 - SpritePixels var2 = var0[var1] = new SpritePixels(); // L: 171 - var2.width = class451.SpriteBuffer_spriteWidth; // L: 172 - var2.height = class451.SpriteBuffer_spriteHeight; // L: 173 - var2.xOffset = class451.SpriteBuffer_xOffsets[var1]; // L: 174 - var2.yOffset = class271.SpriteBuffer_yOffsets[var1]; // L: 175 - var2.subWidth = class451.SpriteBuffer_spriteWidths[var1]; // L: 176 - var2.subHeight = class451.SpriteBuffer_spriteHeights[var1]; // L: 177 - int var3 = var2.subHeight * var2.subWidth; // L: 178 - byte[] var4 = FriendLoginUpdate.SpriteBuffer_pixels[var1]; // L: 179 - var2.pixels = new int[var3]; // L: 180 + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "Lpj;" + ) + @Export("loginType") + static LoginType loginType; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 2065434727 + ) + final int field4423; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -683331803 + ) + final int field4420; - for (int var5 = 0; var5 < var3; ++var5) { // L: 181 - var2.pixels[var5] = NetFileRequest.SpriteBuffer_spritePalette[var4[var5] & 255]; - } - } + class391(int var3, int var4) { + this.field4423 = var3; // L: 16 + this.field4420 = var4; // L: 17 + } // L: 18 - ArchiveDiskActionHandler.method5813(); // L: 183 - return var0; // L: 184 + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "30" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4420; // L: 22 } } diff --git a/runescape-client/src/main/java/class392.java b/runescape-client/src/main/java/class392.java index 183ff67669..e11d0ffb56 100644 --- a/runescape-client/src/main/java/class392.java +++ b/runescape-client/src/main/java/class392.java @@ -1,74 +1,45 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("om") -public abstract class class392 extends class250 implements class444 { - @ObfuscatedName("l") - static byte[][][] field4374; +@ObfuscatedName("oa") +public class class392 implements class397 { + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lpk;" + ) + public final class421 field4427; @ObfuscatedSignature( - descriptor = "(Lkt;Llo;I)V" + descriptor = "(Lpw;)V" ) - protected class392(StudioGame var1, Language var2, int var3) { - super(var1, var2, var3); // L: 15 - } // L: 16 + class392(class422 var1) { + this.field4427 = var1; // L: 14 + } // L: 15 - @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)Lox;", - garbageValue = "60" + descriptor = "(Lod;)V" ) - protected abstract class394 vmethod7542(int var1); + public class392(class393 var1) { + this(new class422(var1)); // L: 10 + } // L: 11 - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-693594265" + descriptor = "(IB)I", + garbageValue = "-1" ) - public int method7113() { - return super.field2872; // L: 19 + public int method6905(int var1) { + return this.field4427.vmethod7293(var1); // L: 18 } - @ObfuscatedName("i") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/Object;", - garbageValue = "-61" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "666324052" ) - public Object vmethod7950(int var1) { - class394 var2 = this.vmethod7542(var1); // L: 23 - return var2 != null && var2.method7127() ? var2.method7131() : null; // L: 24 25 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(Lpi;B)Lqd;", - garbageValue = "109" - ) - public class445 method7115(Buffer var1) { - int var2 = var1.readUnsignedShort(); // L: 29 - class394 var3 = this.vmethod7542(var2); // L: 30 - class445 var4 = new class445(var2); // L: 31 - Class var5 = var3.field4378.field4593; // L: 32 - if (var5 == Integer.class) { // L: 33 - var4.field4681 = var1.readInt(); - } else if (var5 == Long.class) { - var4.field4681 = var1.readLong(); // L: 34 - } else if (var5 == String.class) { // L: 35 - var4.field4681 = var1.readStringCp1252NullCircumfixed(); - } else { - if (!class440.class.isAssignableFrom(var5)) { // L: 36 - throw new IllegalStateException(); // L: 45 - } - - try { - class440 var6 = (class440)var5.newInstance(); // L: 38 - var6.method7924(var1); // L: 39 - var4.field4681 = var6; // L: 40 - } catch (InstantiationException var7) { // L: 42 - } catch (IllegalAccessException var8) { // L: 43 - } - } - - return var4; // L: 46 + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { + return var0.length() + 1; // L: 121 } } diff --git a/runescape-client/src/main/java/class393.java b/runescape-client/src/main/java/class393.java index 1f16aa196c..8e3153b1a3 100644 --- a/runescape-client/src/main/java/class393.java +++ b/runescape-client/src/main/java/class393.java @@ -1,25 +1,74 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oh") -public class class393 extends class394 { - @ObfuscatedName("cc") - @ObfuscatedSignature( - descriptor = "[Lqi;" - ) - @Export("worldSelectBackSprites") - static SpritePixels[] worldSelectBackSprites; +@ObfuscatedName("od") +public abstract class class393 extends class250 implements class446 { + @ObfuscatedName("dt") + static boolean field4428; - public class393(int var1) { - super(var1); // L: 7 - } // L: 8 - - @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;IS)V", - garbageValue = "256" + descriptor = "(Lke;Llq;I)V" ) - void vmethod7129(Buffer var1, int var2) { - } // L: 11 + protected class393(StudioGame var1, Language var2, int var3) { + super(var1, var2, var3); // L: 15 + } // L: 16 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)Lou;", + garbageValue = "-318323569" + ) + protected abstract class395 vmethod7381(int var1); + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "970560687" + ) + public int method6909() { + return super.field2926; // L: 19 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/Object;", + garbageValue = "-322202585" + ) + public Object vmethod7814(int var1) { + class395 var2 = this.vmethod7381(var1); // L: 24 + return var2 != null && var2.method6929() ? var2.method6930() : null; // L: 25 26 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lpx;I)Lqx;", + garbageValue = "1616655669" + ) + public class447 method6920(Buffer var1) { + int var2 = var1.readUnsignedShort(); // L: 30 + class395 var3 = this.vmethod7381(var2); // L: 31 + class447 var4 = new class447(var2); // L: 32 + Class var5 = var3.field4430.field4667; // L: 33 + if (var5 == Integer.class) { // L: 34 + var4.field4742 = var1.readInt(); + } else if (var5 == Long.class) { + var4.field4742 = var1.readLong(); // L: 35 + } else if (var5 == String.class) { // L: 36 + var4.field4742 = var1.readStringCp1252NullCircumfixed(); + } else { + if (!class442.class.isAssignableFrom(var5)) { // L: 37 + throw new IllegalStateException(); // L: 46 + } + + try { + class442 var6 = (class442)var5.newInstance(); // L: 39 + var6.method7783(var1); // L: 40 + var4.field4742 = var6; // L: 41 + } catch (InstantiationException var7) { // L: 43 + } catch (IllegalAccessException var8) { // L: 44 + } + } + + return var4; // L: 47 + } } diff --git a/runescape-client/src/main/java/class394.java b/runescape-client/src/main/java/class394.java index 2a425d7ea0..c5fce7db60 100644 --- a/runescape-client/src/main/java/class394.java +++ b/runescape-client/src/main/java/class394.java @@ -1,118 +1,17 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ox") -public abstract class class394 implements class249 { - @ObfuscatedName("v") +@ObfuscatedName("ow") +public class class394 extends class395 { + public class394(int var1) { + super(var1); // L: 7 + } // L: 8 + + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lpk;" + descriptor = "(Lpx;II)V", + garbageValue = "-1749736682" ) - class431 field4378; - - class394(int var1) { - } // L: 13 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Lpi;IS)V", - garbageValue = "256" - ) - abstract void vmethod7129(Buffer var1, int var2); - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "3" - ) - public void method7128(Buffer var1) { - while (true) { - int var2 = var1.readUnsignedByte(); // L: 17 - if (var2 == 0) { // L: 18 - return; // L: 60 - } - - class390[] var3 = new class390[]{class390.field4367, class390.field4368, class390.field4366, class390.field4369}; // L: 21 - class390 var4 = (class390)MusicPatchPcmStream.findEnumerated(var3, var2); // L: 23 - if (var4 != null) { // L: 24 - switch(var4.field4370) { // L: 25 - case 0: - int var5 = var1.readUnsignedByte(); // L: 27 - int var7 = class429.field4588[var5]; - class431 var6; - if (var7 == 1) { - var6 = class431.field4595; - } else if (var7 == 2) { - var6 = class431.field4598; - } else if (var7 == 3) { // L: 39 - var6 = class431.field4592; // L: 40 - } else { - var6 = null; // L: 43 - } - - this.field4378 = var6; // L: 45 - if (this.field4378 != null) { - break; - } - - throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var5); // L: 46 - case 1: - var1.readStringCp1252NullCircumfixed(); // L: 49 - break; // L: 50 - case 2: - default: - throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var4); // L: 55 - case 3: - MusicPatchPcmStream.findEnumerated(Client.method1633(), var1.readUnsignedByte()); // L: 52 - } - } else { - this.vmethod7129(var1, var2); // L: 58 - } - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "95" - ) - boolean method7127() { - return this.field4378 != null; // L: 65 - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/Object;", - garbageValue = "1513731633" - ) - Object method7131() { - if (this.field4378 == class431.field4595) { // L: 69 - return 0; // L: 70 - } else if (this.field4378 == class431.field4592) { // L: 72 - return -1L; // L: 73 - } else { - return this.field4378 == class431.field4598 ? "" : null; // L: 75 76 78 - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(IIIIIIB)I", - garbageValue = "-20" - ) - public static int method7141(int var0, int var1, int var2, int var3, int var4, int var5) { - if ((var5 & 1) == 1) { // L: 30 - int var6 = var3; // L: 31 - var3 = var4; // L: 32 - var4 = var6; // L: 33 - } - - var2 &= 3; // L: 35 - if (var2 == 0) { // L: 36 - return var1; - } else if (var2 == 1) { // L: 37 - return 7 - var0 - (var3 - 1); - } else { - return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 38 - } - } + void vmethod6936(Buffer var1, int var2) { + } // L: 12 } diff --git a/runescape-client/src/main/java/class395.java b/runescape-client/src/main/java/class395.java index b82e8b474d..37548061d2 100644 --- a/runescape-client/src/main/java/class395.java +++ b/runescape-client/src/main/java/class395.java @@ -1,5 +1,97 @@ import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oe") -public interface class395 { +@ObfuscatedName("ou") +public abstract class class395 implements class249 { + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lpm;" + ) + class433 field4430; + + class395(int var1) { + } // L: 13 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lpx;II)V", + garbageValue = "-1749736682" + ) + abstract void vmethod6936(Buffer var1, int var2); + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Lpx;I)V", + garbageValue = "622445456" + ) + public void method6927(Buffer var1) { + while (true) { + int var2 = var1.readUnsignedByte(); // L: 17 + if (var2 == 0) { // L: 18 + return; // L: 64 + } + + class391[] var3 = new class391[]{class391.field4421, class391.field4419, class391.field4424, class391.field4422}; // L: 21 + class391 var4 = (class391)class291.findEnumerated(var3, var2); // L: 23 + if (var4 != null) { // L: 24 + switch(var4.field4423) { // L: 25 + case 1: + int var6 = var1.readUnsignedByte(); // L: 37 + int var8 = class431.field4651[var6]; // L: 40 + class433 var7; + if (var8 == 1) { // L: 41 + var7 = class433.field4664; // L: 42 + } else if (var8 == 2) { // L: 45 + var7 = class433.field4656; // L: 46 + } else if (var8 == 3) { // L: 49 + var7 = class433.field4655; // L: 50 + } else { + var7 = null; // L: 53 + } + + this.field4430 = var7; // L: 55 + if (this.field4430 != null) { // L: 56 + break; + } + + throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var6); + case 2: + class309[] var5 = new class309[]{class309.field3973, class309.field3976, class309.field3972, class309.field3974}; // L: 32 + class291.findEnumerated(var5, var1.readUnsignedByte()); // L: 34 + break; // L: 35 + case 3: + var1.readStringCp1252NullCircumfixed(); // L: 27 + break; + default: + throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var4); // L: 59 + } + } else { + this.vmethod6936(var1, var2); // L: 62 + } + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "8" + ) + boolean method6929() { + return this.field4430 != null; // L: 69 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/Object;", + garbageValue = "-29" + ) + Object method6930() { + if (this.field4430 == class433.field4664) { // L: 73 + return 0; // L: 74 + } else if (this.field4430 == class433.field4655) { // L: 76 + return -1L; // L: 77 + } else { + return this.field4430 == class433.field4656 ? "" : null; // L: 79 80 82 + } + } } diff --git a/runescape-client/src/main/java/class396.java b/runescape-client/src/main/java/class396.java index 6e04fc3fd0..8b1b9a241a 100644 --- a/runescape-client/src/main/java/class396.java +++ b/runescape-client/src/main/java/class396.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("oi") -public interface class396 extends class395 { +@ObfuscatedName("ol") +public interface class396 { } diff --git a/runescape-client/src/main/java/class397.java b/runescape-client/src/main/java/class397.java index 74738e1dd5..6bab3c4597 100644 --- a/runescape-client/src/main/java/class397.java +++ b/runescape-client/src/main/java/class397.java @@ -1,36 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oy") -public class class397 { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Loy;" - ) - static final class397 field4380; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Loy;" - ) - static final class397 field4379; - @ObfuscatedName("i") - String field4381; - - static { - field4380 = new class397("application/json"); // L: 4 - field4379 = new class397("text/plain"); // L: 5 - } - - class397(String var1) { - this.field4381 = var1; // L: 9 - } // L: 10 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-28" - ) - public String method7142() { - return this.field4381; // L: 13 - } +@ObfuscatedName("ob") +public interface class397 extends class396 { } diff --git a/runescape-client/src/main/java/class398.java b/runescape-client/src/main/java/class398.java index d94f5fb524..0d1e4f5020 100644 --- a/runescape-client/src/main/java/class398.java +++ b/runescape-client/src/main/java/class398.java @@ -1,13 +1,36 @@ -import java.io.UnsupportedEncodingException; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ok") -public interface class398 { - @ObfuscatedName("v") +@ObfuscatedName("oz") +public class class398 { + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(S)[B", - garbageValue = "201" + descriptor = "Loz;" ) - byte[] vmethod7150() throws UnsupportedEncodingException; + public static final class398 field4432; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Loz;" + ) + static final class398 field4433; + @ObfuscatedName("l") + String field4434; + + static { + field4432 = new class398("application/json"); // L: 4 + field4433 = new class398("text/plain"); // L: 5 + } + + class398(String var1) { + this.field4434 = var1; // L: 9 + } // L: 10 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "120" + ) + public String method6940() { + return this.field4434; // L: 13 + } } diff --git a/runescape-client/src/main/java/class399.java b/runescape-client/src/main/java/class399.java index aa68fd7c26..cf3297a985 100644 --- a/runescape-client/src/main/java/class399.java +++ b/runescape-client/src/main/java/class399.java @@ -1,68 +1,13 @@ import java.io.UnsupportedEncodingException; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -@ObfuscatedName("op") -public class class399 implements class398 { - @ObfuscatedName("i") - JSONObject field4384; - - public class399(byte[] var1) throws UnsupportedEncodingException { - this.method7148(var1); // L: 13 - } // L: 14 - - @ObfuscatedName("v") +@ObfuscatedName("ot") +public interface class399 { + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(S)[B", - garbageValue = "201" + descriptor = "(I)[B", + garbageValue = "-2132228640" ) - public byte[] vmethod7150() throws UnsupportedEncodingException { - return this.field4384 == null ? new byte[0] : this.field4384.toString().getBytes("UTF-8"); // L: 45 46 48 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "1800116953" - ) - void method7148(byte[] var1) throws UnsupportedEncodingException { - String var2 = new String(var1, "UTF-8"); // L: 17 - this.method7149(var2); // L: 18 - } // L: 19 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-2059250912" - ) - void method7149(String var1) throws UnsupportedEncodingException { - try { - if (var1.charAt(0) == '{') { // L: 23 - this.field4384 = new JSONObject(var1); // L: 24 - } else { - if (var1.charAt(0) != '[') { // L: 26 - throw new UnsupportedEncodingException("Invalid JSON passed to the JSON content builder."); // L: 32 - } - - JSONArray var2 = new JSONArray(var1); // L: 27 - this.field4384 = new JSONObject(); // L: 28 - this.field4384.put("arrayValues", var2); // L: 29 - } - - } catch (JSONException var3) { // L: 35 - throw new UnsupportedEncodingException(var3.getMessage()); // L: 36 - } - } // L: 38 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)Lorg/json/JSONObject;", - garbageValue = "1611326690" - ) - public JSONObject method7156() { - return this.field4384; // L: 41 - } + byte[] vmethod6962() throws UnsupportedEncodingException; } diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 6d80a0edb3..bef01347d5 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -2,57 +2,42 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("b") +@ObfuscatedName("a") public final class class4 { - @ObfuscatedName("w") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1921636813" + descriptor = "(II)I", + garbageValue = "2109768845" ) - @Export("setLoginResponseString") - static void setLoginResponseString(String var0, String var1, String var2) { - Login.Login_response1 = var0; // L: 1817 - Login.Login_response2 = var1; // L: 1818 - Login.Login_response3 = var2; // L: 1819 - } // L: 1820 - - @ObfuscatedName("gy") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-5" - ) - static void method17() { - PacketBufferNode var0 = WorldMapSprite.getPacketBufferNode(ClientPacket.field3000, Client.packetWriter.isaacCipher); // L: 4277 - var0.packetBuffer.writeByte(Client.getWindowedMode()); // L: 4278 - var0.packetBuffer.writeShort(InvDefinition.canvasWidth); // L: 4279 - var0.packetBuffer.writeShort(class321.canvasHeight); // L: 4280 - Client.packetWriter.addNode(var0); // L: 4281 - } // L: 4282 - - @ObfuscatedName("ke") - @ObfuscatedSignature( - descriptor = "(IIII)Lcc;", - garbageValue = "-1034458506" - ) - static final InterfaceParent method16(int var0, int var1, int var2) { - InterfaceParent var3 = new InterfaceParent(); // L: 12149 - var3.group = var1; // L: 12150 - var3.type = var2; // L: 12151 - Client.interfaceParents.put(var3, (long)var0); // L: 12152 - class29.Widget_resetModelFrames(var1); // L: 12153 - Widget var4 = class127.getWidget(var0); // L: 12154 - class346.invalidateWidget(var4); // L: 12155 - if (Client.meslayerContinueWidget != null) { // L: 12156 - class346.invalidateWidget(Client.meslayerContinueWidget); // L: 12157 - Client.meslayerContinueWidget = null; // L: 12158 + @Export("Messages_getLastChatID") + static int Messages_getLastChatID(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 64 + if (var1 == null) { // L: 65 + return -1; + } else { + return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 66 67 } - - AbstractByteArrayCopier.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 12160 - class145.runWidgetOnLoadListener(var1); // L: 12161 - if (Client.rootInterface != -1) { // L: 12162 - MouseRecorder.runIntfCloseListeners(Client.rootInterface, 1); - } - - return var3; // L: 12163 } + + @ObfuscatedName("jy") + @ObfuscatedSignature( + descriptor = "(IIIIIIIB)V", + garbageValue = "-57" + ) + @Export("updateRootInterface") + static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (WorldMapDecoration.loadInterface(var0)) { // L: 11204 + WorldMapRegion.updateInterface(NetSocket.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 11205 + } + } // L: 11206 + + @ObfuscatedName("lk") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-924904180" + ) + static void method22() { + Client.packetWriter.addNode(WallDecoration.getPacketBufferNode(ClientPacket.field3020, Client.packetWriter.isaacCipher)); // L: 12669 + Client.oculusOrbState = 0; // L: 12670 + } // L: 12671 } diff --git a/runescape-client/src/main/java/class400.java b/runescape-client/src/main/java/class400.java index ac4cb9162d..e815e4766a 100644 --- a/runescape-client/src/main/java/class400.java +++ b/runescape-client/src/main/java/class400.java @@ -1,29 +1,82 @@ -import net.runelite.mapping.Export; +import java.io.UnsupportedEncodingException; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; -@ObfuscatedName("on") -public class class400 { - @ObfuscatedName("b") - static final int[] field4389; - @ObfuscatedName("n") - static final int[] field4391; - @ObfuscatedName("ch") +@ObfuscatedName("oh") +public class class400 implements class399 { + @ObfuscatedName("l") + JSONObject field4439; + + public class400(byte[] var1) throws UnsupportedEncodingException { + this.method6946(var1); // L: 17 + } // L: 18 + + public class400(String var1) throws UnsupportedEncodingException { + this.method6954(var1); // L: 13 + } // L: 14 + + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Lqq;" + descriptor = "(I)[B", + garbageValue = "-2132228640" ) - @Export("worldSelectFlagSprites") - static IndexedSprite[] worldSelectFlagSprites; + public byte[] vmethod6962() throws UnsupportedEncodingException { + return this.field4439 == null ? new byte[0] : this.field4439.toString().getBytes("UTF-8"); // L: 50 51 53 + } - static { - field4389 = new int[16384]; // L: 8 - field4391 = new int[16384]; // L: 9 - double var0 = 3.834951969714103E-4D; // L: 12 + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "([BI)V", + garbageValue = "1886855287" + ) + void method6946(byte[] var1) throws UnsupportedEncodingException { + String var2 = new String(var1, "UTF-8"); // L: 21 + this.method6954(var2); // L: 22 + } // L: 23 - for (int var2 = 0; var2 < 16384; ++var2) { // L: 13 - field4389[var2] = (int)(16384.0D * Math.sin((double)var2 * var0)); // L: 14 - field4391[var2] = (int)(16384.0D * Math.cos(var0 * (double)var2)); // L: 15 + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "3" + ) + void method6954(String var1) throws UnsupportedEncodingException { + try { + if (var1.charAt(0) == '{') { // L: 27 + this.field4439 = new JSONObject(var1); // L: 28 + } else { + if (var1.charAt(0) != '[') { // L: 30 + throw new UnsupportedEncodingException("Invalid JSON passed to the JSON content builder."); // L: 36 + } + + JSONArray var2 = new JSONArray(var1); // L: 31 + this.field4439 = new JSONObject(); // L: 32 + this.field4439.put("arrayValues", var2); // L: 33 + } + + } catch (JSONException var3) { // L: 39 + throw new UnsupportedEncodingException(var3.getMessage()); // L: 40 } + } // L: 42 - } // L: 17 + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)Lorg/json/JSONObject;", + garbageValue = "579331976" + ) + public JSONObject method6947() { + return this.field4439; // L: 45 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "50" + ) + static void method6957(int var0) { + class126.method2799(14); // L: 1944 + Login.field887 = var0; // L: 1945 + } // L: 1946 } diff --git a/runescape-client/src/main/java/class401.java b/runescape-client/src/main/java/class401.java index 16c4e907d1..5a19aae2b9 100644 --- a/runescape-client/src/main/java/class401.java +++ b/runescape-client/src/main/java/class401.java @@ -1,21 +1,109 @@ +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ov") +public class class401 implements class399 { + @ObfuscatedName("q") + final Map field4440; + + public class401(Map var1) { + this.field4440 = var1; // L: 11 + } // L: 12 -@ObfuscatedName("oc") -public class class401 { @ObfuscatedName("o") - static final int[] field4398; - @ObfuscatedName("r") - static final int[] field4399; + @ObfuscatedSignature( + descriptor = "(I)[B", + garbageValue = "-2132228640" + ) + public byte[] vmethod6962() throws UnsupportedEncodingException { + return this.method6961().getBytes("UTF-8"); // L: 16 + } - static { - field4398 = new int[2048]; // L: 13 - field4399 = new int[2048]; // L: 14 - double var0 = 0.0030679615757712823D; // L: 17 + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "685635787" + ) + public String method6961() throws UnsupportedEncodingException { + StringBuilder var1 = new StringBuilder(); // L: 20 + Iterator var2 = this.field4440.entrySet().iterator(); // L: 21 - for (int var2 = 0; var2 < 2048; ++var2) { // L: 18 - field4398[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); // L: 19 - field4399[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); // L: 20 + while (var2.hasNext()) { + Entry var3 = (Entry)var2.next(); // L: 22 + String var4 = URLEncoder.encode((String)var3.getKey(), "UTF-8"); + String var5 = URLEncoder.encode((String)var3.getValue(), "UTF-8"); + var1.append(var4).append("=").append(var5).append("&"); } - } // L: 22 + if (var1.length() == 0) { + return ""; + } else { + var1.deleteCharAt(var1.length() - 1); + var1.insert(0, "?"); // L: 31 + return var1.toString(); // L: 32 + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(II)Lgp;", + garbageValue = "-961996891" + ) + @Export("StructDefinition_getStructDefinition") + public static StructComposition StructDefinition_getStructDefinition(int var0) { + StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); // L: 23 + if (var1 != null) { // L: 24 + return var1; + } else { + byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); // L: 25 + var1 = new StructComposition(); // L: 26 + if (var2 != null) { // L: 27 + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); // L: 28 + StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 29 + return var1; // L: 30 + } + } + + @ObfuscatedName("jp") + @ObfuscatedSignature( + descriptor = "(Lki;B)Z", + garbageValue = "-1" + ) + @Export("runCs1") + static final boolean runCs1(Widget var0) { + if (var0.cs1Comparisons == null) { // L: 10886 + return false; + } else { + for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 10887 + int var2 = Players.method2413(var0, var1); // L: 10888 + int var3 = var0.cs1ComparisonValues[var1]; // L: 10889 + if (var0.cs1Comparisons[var1] == 2) { // L: 10890 + if (var2 >= var3) { // L: 10891 + return false; + } + } else if (var0.cs1Comparisons[var1] == 3) { // L: 10893 + if (var2 <= var3) { // L: 10894 + return false; + } + } else if (var0.cs1Comparisons[var1] == 4) { // L: 10896 + if (var2 == var3) { // L: 10897 + return false; + } + } else if (var3 != var2) { // L: 10899 + return false; + } + } + + return true; // L: 10901 + } + } } diff --git a/runescape-client/src/main/java/class402.java b/runescape-client/src/main/java/class402.java new file mode 100644 index 0000000000..f4b6fecad1 --- /dev/null +++ b/runescape-client/src/main/java/class402.java @@ -0,0 +1,21 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("or") +public class class402 { + @ObfuscatedName("a") + static final int[] field4444; + @ObfuscatedName("m") + static final int[] field4445; + + static { + field4444 = new int[16384]; // L: 8 + field4445 = new int[16384]; // L: 9 + double var0 = 3.834951969714103E-4D; // L: 12 + + for (int var2 = 0; var2 < 16384; ++var2) { // L: 13 + field4444[var2] = (int)(16384.0D * Math.sin((double)var2 * var0)); // L: 14 + field4445[var2] = (int)(16384.0D * Math.cos(var0 * (double)var2)); // L: 15 + } + + } // L: 17 +} diff --git a/runescape-client/src/main/java/class403.java b/runescape-client/src/main/java/class403.java new file mode 100644 index 0000000000..d9970bf0bc --- /dev/null +++ b/runescape-client/src/main/java/class403.java @@ -0,0 +1,29 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ox") +public class class403 { + @ObfuscatedName("sg") + @ObfuscatedSignature( + descriptor = "Lbr;" + ) + @Export("decimator") + static Decimator decimator; + @ObfuscatedName("v") + static final int[] field4453; + @ObfuscatedName("y") + static final int[] field4450; + + static { + field4453 = new int[2048]; // L: 13 + field4450 = new int[2048]; // L: 14 + double var0 = 0.0030679615757712823D; // L: 17 + + for (int var2 = 0; var2 < 2048; ++var2) { // L: 18 + field4453[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); // L: 19 + field4450[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); // L: 20 + } + + } // L: 22 +} diff --git a/runescape-client/src/main/java/class406.java b/runescape-client/src/main/java/class406.java deleted file mode 100644 index 18ee7a6f4b..0000000000 --- a/runescape-client/src/main/java/class406.java +++ /dev/null @@ -1,11 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("os") -public class class406 extends Node { - @ObfuscatedName("v") - public long field4407; - - public class406(long var1) { - this.field4407 = var1; // L: 7 - } // L: 8 -} diff --git a/runescape-client/src/main/java/class408.java b/runescape-client/src/main/java/class408.java new file mode 100644 index 0000000000..208390466f --- /dev/null +++ b/runescape-client/src/main/java/class408.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("on") +public class class408 extends Node { + @ObfuscatedName("o") + public long field4463; + + public class408(long var1) { + this.field4463 = var1; // L: 7 + } // L: 8 +} diff --git a/runescape-client/src/main/java/class419.java b/runescape-client/src/main/java/class419.java deleted file mode 100644 index 7a1668e704..0000000000 --- a/runescape-client/src/main/java/class419.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("pd") -public interface class419 extends Iterable { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "1" - ) - int vmethod7471(int var1); - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/Object;B)V", - garbageValue = "-12" - ) - void vmethod7464(int var1, Object var2); -} diff --git a/runescape-client/src/main/java/class420.java b/runescape-client/src/main/java/class420.java deleted file mode 100644 index ceef94984d..0000000000 --- a/runescape-client/src/main/java/class420.java +++ /dev/null @@ -1,127 +0,0 @@ -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("pp") -public class class420 implements class419 { - @ObfuscatedName("d") - static int[][][] field4545; - @ObfuscatedName("v") - Map field4547; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lqf;" - ) - final class444 field4546; - - @ObfuscatedSignature( - descriptor = "(Lqf;)V" - ) - public class420(class444 var1) { - this.field4546 = var1; // L: 15 - } // L: 16 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "1" - ) - public int vmethod7471(int var1) { - if (this.field4547 != null) { // L: 19 - class445 var2 = (class445)this.field4547.get(var1); // L: 20 - if (var2 != null) { - return (Integer)var2.field4681; // L: 21 - } - } - - return (Integer)this.field4546.vmethod7950(var1); // L: 23 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/Object;B)V", - garbageValue = "-12" - ) - public void vmethod7464(int var1, Object var2) { - if (this.field4547 == null) { // L: 27 - this.field4547 = new HashMap(); // L: 28 - this.field4547.put(var1, new class445(var1, var2)); // L: 29 - } else { - class445 var3 = (class445)this.field4547.get(var1); // L: 32 - if (var3 == null) { - this.field4547.put(var1, new class445(var1, var2)); // L: 33 - } else { - var3.field4681 = var2; // L: 34 - } - } - - } // L: 36 - - public Iterator iterator() { - return this.field4547 == null ? Collections.emptyList().iterator() : this.field4547.values().iterator(); // L: 39 40 - } - - @ObfuscatedName("gn") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "126" - ) - @Export("doCheat") - static final void doCheat(String var0) { - if (var0.equalsIgnoreCase("toggleroof")) { // L: 3681 - class131.clientPreferences.method2246(!class131.clientPreferences.method2263()); // L: 3682 - if (class131.clientPreferences.method2263()) { // L: 3683 - Actor.addGameMessage(99, "", "Roofs are now all hidden"); // L: 3684 - } else { - Actor.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 3687 - } - } - - if (var0.equalsIgnoreCase("displayfps")) { // L: 3690 - class131.clientPreferences.method2302(); - } - - if (var0.equalsIgnoreCase("renderself")) { // L: 3691 - Client.renderSelf = !Client.renderSelf; - } - - if (var0.equalsIgnoreCase("mouseovertext")) { - Client.showMouseOverText = !Client.showMouseOverText; // L: 3692 - } - - if (Client.staffModLevel >= 2) { // L: 3693 - if (var0.equalsIgnoreCase("errortest")) { // L: 3694 - throw new RuntimeException(); - } - - if (var0.equalsIgnoreCase("showcoord")) { // L: 3695 - ScriptFrame.worldMap.showCoord = !ScriptFrame.worldMap.showCoord; - } - - if (var0.equalsIgnoreCase("fpson")) { // L: 3696 - class131.clientPreferences.method2234(true); - } - - if (var0.equalsIgnoreCase("fpsoff")) { // L: 3697 - class131.clientPreferences.method2234(false); - } - - if (var0.equalsIgnoreCase("gc")) { // L: 3698 - System.gc(); - } - - if (var0.equalsIgnoreCase("clientdrop")) { // L: 3699 - ClanChannelMember.method2868(); - } - } - - PacketBufferNode var1 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2987, Client.packetWriter.isaacCipher); // L: 3702 - var1.packetBuffer.writeByte(var0.length() + 1); // L: 3703 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 3704 - Client.packetWriter.addNode(var1); // L: 3705 - } // L: 3706 -} diff --git a/runescape-client/src/main/java/class421.java b/runescape-client/src/main/java/class421.java new file mode 100644 index 0000000000..8c2117384d --- /dev/null +++ b/runescape-client/src/main/java/class421.java @@ -0,0 +1,19 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("pk") +public interface class421 extends Iterable { + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "41" + ) + int vmethod7293(int var1); + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/Object;B)V", + garbageValue = "113" + ) + void vmethod7295(int var1, Object var2); +} diff --git a/runescape-client/src/main/java/class422.java b/runescape-client/src/main/java/class422.java index 31c1d878c0..0996d7e64f 100644 --- a/runescape-client/src/main/java/class422.java +++ b/runescape-client/src/main/java/class422.java @@ -1,14 +1,114 @@ +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pg") -public class class422 { - @ObfuscatedName("i") - static final char[] field4560; - @ObfuscatedName("f") - static final char[] field4563; +@ObfuscatedName("pw") +public class class422 implements class421 { + @ObfuscatedName("o") + Map field4606; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lqo;" + ) + final class446 field4607; - static { - field4560 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8 - field4563 = new char[]{'[', ']', '#'}; // L: 9 + @ObfuscatedSignature( + descriptor = "(Lqo;)V" + ) + public class422(class446 var1) { + this.field4607 = var1; // L: 15 + } // L: 16 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "41" + ) + public int vmethod7293(int var1) { + if (this.field4606 != null) { // L: 20 + class447 var2 = (class447)this.field4606.get(var1); // L: 21 + if (var2 != null) { + return (Integer)var2.field4742; // L: 22 + } + } + + return (Integer)this.field4607.vmethod7814(var1); // L: 24 } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/Object;B)V", + garbageValue = "113" + ) + public void vmethod7295(int var1, Object var2) { + if (this.field4606 == null) { // L: 29 + this.field4606 = new HashMap(); // L: 30 + this.field4606.put(var1, new class447(var1, var2)); // L: 31 + } else { + class447 var3 = (class447)this.field4606.get(var1); // L: 34 + if (var3 == null) { + this.field4606.put(var1, new class447(var1, var2)); // L: 35 + } else { + var3.field4742 = var2; // L: 36 + } + } + + } // L: 38 + + public Iterator iterator() { + return this.field4606 == null ? Collections.emptyList().iterator() : this.field4606.values().iterator(); // L: 42 43 + } + + @ObfuscatedName("gl") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-2021735109" + ) + static final void method7303(int var0, int var1, int var2) { + if (class343.cameraX < var0) { // L: 3922 + class343.cameraX = (var0 - class343.cameraX) * HitSplatDefinition.field2077 / 1000 + class343.cameraX + class229.field2805; // L: 3923 + if (class343.cameraX > var0) { // L: 3924 + class343.cameraX = var0; + } + } + + if (class343.cameraX > var0) { // L: 3926 + class343.cameraX -= (class343.cameraX - var0) * HitSplatDefinition.field2077 / 1000 + class229.field2805; // L: 3927 + if (class343.cameraX < var0) { // L: 3928 + class343.cameraX = var0; + } + } + + if (class295.cameraY < var1) { // L: 3930 + class295.cameraY = (var1 - class295.cameraY) * HitSplatDefinition.field2077 / 1000 + class295.cameraY + class229.field2805; // L: 3931 + if (class295.cameraY > var1) { // L: 3932 + class295.cameraY = var1; + } + } + + if (class295.cameraY > var1) { // L: 3934 + class295.cameraY -= (class295.cameraY - var1) * HitSplatDefinition.field2077 / 1000 + class229.field2805; // L: 3935 + if (class295.cameraY < var1) { // L: 3936 + class295.cameraY = var1; + } + } + + if (FaceNormal.cameraZ < var2) { // L: 3938 + FaceNormal.cameraZ = (var2 - FaceNormal.cameraZ) * HitSplatDefinition.field2077 / 1000 + FaceNormal.cameraZ + class229.field2805; // L: 3939 + if (FaceNormal.cameraZ > var2) { // L: 3940 + FaceNormal.cameraZ = var2; + } + } + + if (FaceNormal.cameraZ > var2) { // L: 3942 + FaceNormal.cameraZ -= (FaceNormal.cameraZ - var2) * HitSplatDefinition.field2077 / 1000 + class229.field2805; // L: 3943 + if (FaceNormal.cameraZ < var2) { // L: 3944 + FaceNormal.cameraZ = var2; + } + } + + } // L: 3946 } diff --git a/runescape-client/src/main/java/class424.java b/runescape-client/src/main/java/class424.java new file mode 100644 index 0000000000..713024422f --- /dev/null +++ b/runescape-client/src/main/java/class424.java @@ -0,0 +1,22 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("pe") +public class class424 { + @ObfuscatedName("l") + static final char[] field4621; + @ObfuscatedName("k") + static final char[] field4623; + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "Lqd;" + ) + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; + + static { + field4621 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8 + field4623 = new char[]{'[', ']', '#'}; // L: 9 + } +} diff --git a/runescape-client/src/main/java/class425.java b/runescape-client/src/main/java/class425.java deleted file mode 100644 index 56d9fd210f..0000000000 --- a/runescape-client/src/main/java/class425.java +++ /dev/null @@ -1,50 +0,0 @@ -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("pn") -class class425 implements Iterator { - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -991583815 - ) - int field4581; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Lpj;" - ) - final class426 this$0; - - @ObfuscatedSignature( - descriptor = "(Lpj;)V" - ) - class425(class426 var1) { - this.this$0 = var1; // L: 50 - } - - public boolean hasNext() { - return this.field4581 < this.this$0.method7113(); // L: 54 - } - - public Object next() { - int var1 = ++this.field4581 - 1; // L: 58 - class393 var2 = (class393)this.this$0.field4583.get((long)var1); // L: 59 - return var2 != null ? var2 : this.this$0.method7543(var1); // L: 60 61 - } - - public void remove() { - throw new UnsupportedOperationException(); // L: 65 - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-131933810" - ) - @Export("stringCp1252NullTerminatedByteSize") - public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; // L: 117 - } -} diff --git a/runescape-client/src/main/java/class426.java b/runescape-client/src/main/java/class426.java deleted file mode 100644 index edbb3c1c06..0000000000 --- a/runescape-client/src/main/java/class426.java +++ /dev/null @@ -1,90 +0,0 @@ -import java.util.Iterator; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("pj") -public class class426 extends class392 implements class252 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - final AbstractArchive field4584; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - final DemotingHashTable field4583; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 474099221 - ) - final int field4585; - - @ObfuscatedSignature( - descriptor = "(Lkt;ILlo;Lln;)V" - ) - public class426(StudioGame var1, int var2, Language var3, AbstractArchive var4) { - super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); // L: 19 - this.field4583 = new DemotingHashTable(64); // L: 15 - this.field4584 = var4; // L: 20 - this.field4585 = var2; // L: 21 - } // L: 22 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IB)Lox;", - garbageValue = "60" - ) - protected class394 vmethod7542(int var1) { - synchronized(this.field4583) { // L: 26 - class393 var2 = (class393)this.field4583.get((long)var1); // L: 27 - if (var2 == null) { // L: 28 - var2 = this.method7543(var1); // L: 29 - this.field4583.method5124(var2, (long)var1); // L: 30 - } - - return var2; // L: 33 - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(II)Loh;", - garbageValue = "1788746986" - ) - class393 method7543(int var1) { - byte[] var2 = this.field4584.takeFile(this.field4585, var1); // L: 37 - class393 var3 = new class393(var1); // L: 38 - if (var2 != null) { - var3.method7128(new Buffer(var2)); // L: 39 - } - - return var3; // L: 40 - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-9" - ) - public void method7541() { - synchronized(this.field4583) { // L: 44 - this.field4583.clear(); // L: 45 - } - } // L: 47 - - public Iterator iterator() { - return new class425(this); // L: 50 - } - - @ObfuscatedName("lz") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" - ) - static final void method7546() { - Client.field703 = Client.cycleCntr; // L: 12380 - SoundSystem.field309 = true; // L: 12381 - } // L: 12382 -} diff --git a/runescape-client/src/main/java/class427.java b/runescape-client/src/main/java/class427.java index 35895e89b1..e4a3007dbc 100644 --- a/runescape-client/src/main/java/class427.java +++ b/runescape-client/src/main/java/class427.java @@ -1,19 +1,118 @@ +import java.io.BufferedReader; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringReader; +import java.io.StringWriter; +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("pw") -public interface class427 { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lpi;I)V", - garbageValue = "-700069158" +@ObfuscatedName("pg") +class class427 implements Iterator { + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1587824921 ) - void vmethod7597(Object var1, Buffer var2); + int field4643; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lpd;" + ) + final class428 this$0; - @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpi;I)Ljava/lang/Object;", - garbageValue = "-1640188252" + descriptor = "(Lpd;)V" ) - Object vmethod7598(Buffer var1); + class427(class428 var1) { + this.this$0 = var1; // L: 51 + } + + public boolean hasNext() { + return this.field4643 < this.this$0.method6909(); // L: 56 + } + + public void remove() { + throw new UnsupportedOperationException(); + } + + public Object next() { + int var1 = ++this.field4643 - 1; // L: 61 + class394 var2 = (class394)this.this$0.field4646.get((long)var1); // L: 62 + return var2 != null ? var2 : this.this$0.method7380(var1); // L: 63 64 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Throwable;B)Ljava/lang/String;", + garbageValue = "7" + ) + static String method7379(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("jj") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "1191393646" + ) + @Export("formatItemStacks") + static final String formatItemStacks(int var0) { + String var1 = Integer.toString(var0); // L: 10729 + + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 10730 + var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 10731 + } + + if (var1.length() > 9) { // L: 10733 + return " " + class166.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; + } else { + return var1.length() > 6 ? " " + class166.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + class166.colorStartTag(16776960) + var1 + ""; // L: 10734 10735 + } + } } diff --git a/runescape-client/src/main/java/class428.java b/runescape-client/src/main/java/class428.java index 77d0d44449..35e2d20d72 100644 --- a/runescape-client/src/main/java/class428.java +++ b/runescape-client/src/main/java/class428.java @@ -1,32 +1,80 @@ +import java.util.Iterator; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pa") -final class class428 implements class427 { - @ObfuscatedName("v") +@ObfuscatedName("pd") +public class class428 extends class393 implements class252 { + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lpi;I)V", - garbageValue = "-700069158" + descriptor = "Llp;" ) - public void vmethod7597(Object var1, Buffer var2) { - this.method7561((Integer)var1, var2); // L: 20 - } // L: 21 + final AbstractArchive field4645; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lic;" + ) + final DemotingHashTable field4646; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 858241003 + ) + final int field4647; - @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpi;I)Ljava/lang/Object;", - garbageValue = "-1640188252" + descriptor = "(Lke;ILlq;Llp;)V" ) - public Object vmethod7598(Buffer var1) { - return var1.readInt(); // L: 16 + public class428(StudioGame var1, int var2, Language var3, AbstractArchive var4) { + super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); // L: 19 + this.field4646 = new DemotingHashTable(64); // L: 15 + this.field4645 = var4; // L: 20 + this.field4647 = var2; // L: 21 + } // L: 22 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)Lou;", + garbageValue = "-318323569" + ) + protected class395 vmethod7381(int var1) { + synchronized(this.field4646) { // L: 26 + class394 var2 = (class394)this.field4646.get((long)var1); // L: 27 + if (var2 == null) { // L: 28 + var2 = this.method7380(var1); // L: 29 + this.field4646.method4942(var2, (long)var1); // L: 30 + } + + return var2; // L: 33 + } } - @ObfuscatedName("s") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Integer;Lpi;B)V", - garbageValue = "1" + descriptor = "(IB)Low;", + garbageValue = "52" ) - void method7561(Integer var1, Buffer var2) { - var2.writeInt(var1); // L: 12 - } // L: 13 + class394 method7380(int var1) { + byte[] var2 = this.field4645.takeFile(this.field4647, var1); // L: 37 + class394 var3 = new class394(var1); // L: 38 + if (var2 != null) { + var3.method6927(new Buffer(var2)); // L: 39 + } + + return var3; // L: 40 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-380169429" + ) + public void method7382() { + synchronized(this.field4646) { // L: 44 + this.field4646.clear(); // L: 45 + } + } // L: 47 + + public Iterator iterator() { + return new class427(this); // L: 51 + } } diff --git a/runescape-client/src/main/java/class429.java b/runescape-client/src/main/java/class429.java index eb5a8e2d09..0978e53ae0 100644 --- a/runescape-client/src/main/java/class429.java +++ b/runescape-client/src/main/java/class429.java @@ -1,30 +1,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("py") -public class class429 { - @ObfuscatedName("v") - public static final int[] field4588; - - static { - field4588 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3}; // L: 4 - } - - @ObfuscatedName("v") +@ObfuscatedName("pb") +public interface class429 { + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lln;III)[Lqi;", - garbageValue = "311728442" + descriptor = "(Ljava/lang/Object;Lpx;I)V", + garbageValue = "-2139027116" ) - public static SpritePixels[] method7568(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 { - WorldMapArea.SpriteBuffer_decode(var4); // L: 30 - var3 = true; // L: 31 - } + void vmethod7440(Object var1, Buffer var2); - return !var3 ? null : class391.method7111(); // L: 33 34 - } + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Lpx;I)Ljava/lang/Object;", + garbageValue = "352015354" + ) + Object vmethod7436(Buffer var1); } diff --git a/runescape-client/src/main/java/class430.java b/runescape-client/src/main/java/class430.java index 2a216a5a1c..fa8875a89f 100644 --- a/runescape-client/src/main/java/class430.java +++ b/runescape-client/src/main/java/class430.java @@ -1,62 +1,41 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("pc") -final class class430 implements class427 { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lpi;I)V", - garbageValue = "-700069158" +@ObfuscatedName("pp") +final class class430 implements class429 { + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1505376757 ) - public void vmethod7597(Object var1, Buffer var2) { - this.method7570((Long)var1, var2); // L: 33 - } // L: 34 + @Export("clientType") + public static int clientType; - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)Ljava/lang/Object;", - garbageValue = "-1640188252" + descriptor = "(Ljava/lang/Object;Lpx;I)V", + garbageValue = "-2139027116" ) - public Object vmethod7598(Buffer var1) { - return var1.readLong(); // L: 29 + public void vmethod7440(Object var1, Buffer var2) { + this.method7399((Integer)var1, var2); // L: 21 + } // L: 22 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Lpx;I)Ljava/lang/Object;", + garbageValue = "352015354" + ) + public Object vmethod7436(Buffer var1) { + return var1.readInt(); // L: 17 } @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Long;Lpi;B)V", - garbageValue = "-28" + descriptor = "(Ljava/lang/Integer;Lpx;I)V", + garbageValue = "819909184" ) - void method7570(Long var1, Buffer var2) { - var2.writeLong(var1); // L: 25 - } // L: 26 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", - garbageValue = "1539194584" - ) - @Export("loadClassFromDescriptor") - static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { - if (var0.equals("B")) { // L: 222 - return Byte.TYPE; - } else if (var0.equals("I")) { // L: 223 - return Integer.TYPE; - } else if (var0.equals("S")) { // L: 224 - return Short.TYPE; - } else if (var0.equals("J")) { // L: 225 - return Long.TYPE; - } else if (var0.equals("Z")) { // L: 226 - return Boolean.TYPE; - } else if (var0.equals("F")) { // L: 227 - return Float.TYPE; - } else if (var0.equals("D")) { // L: 228 - return Double.TYPE; - } else if (var0.equals("C")) { // L: 229 - return Character.TYPE; - } else { - return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 230 231 - } - } + void method7399(Integer var1, Buffer var2) { + var2.writeInt(var1); // L: 12 + } // L: 13 } diff --git a/runescape-client/src/main/java/class431.java b/runescape-client/src/main/java/class431.java index 923412d31b..ff52aeaff2 100644 --- a/runescape-client/src/main/java/class431.java +++ b/runescape-client/src/main/java/class431.java @@ -1,199 +1,11 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pk") -public class class431 implements MouseWheel { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lpk;" - ) - public static final class431 field4595; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lpk;" - ) - public static final class431 field4592; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lpk;" - ) - public static final class431 field4598; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lfr;" - ) - @Export("clock") - static Clock clock; - @ObfuscatedName("do") - static boolean field4602; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1045232419 - ) - final int field4594; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 690785775 - ) - public final int field4596; - @ObfuscatedName("n") - public final Class field4593; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lpw;" - ) - final class427 field4597; +@ObfuscatedName("pa") +public class class431 { + @ObfuscatedName("o") + public static final int[] field4651; static { - field4595 = new class431(1, 0, Integer.class, new class428()); // L: 10 - field4592 = new class431(0, 1, Long.class, new class430()); // L: 23 - field4598 = new class431(2, 2, String.class, new class432()); // L: 36 - } - - @ObfuscatedSignature( - descriptor = "(IILjava/lang/Class;Lpw;)V" - ) - class431(int var1, int var2, Class var3, class427 var4) { - this.field4594 = var1; // L: 59 - this.field4596 = var2; // L: 60 - this.field4593 = var3; // L: 61 - this.field4597 = var4; // L: 62 - } // L: 63 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "16" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field4596; // L: 94 - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lpi;I)Ljava/lang/Object;", - garbageValue = "1124863933" - ) - public Object method7581(Buffer var1) { - return this.field4597.vmethod7598(var1); // L: 98 - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "32" - ) - static final void method7593(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 - class392.field4374[0][var5][var4] = 127; // L: 82 - if (var0 == var5 && var5 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; - } - - if (var5 == var0 + var2 && 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 (var4 == var3 + var1 && var4 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; - } - } - } - } - - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(B)[Lpk;", - garbageValue = "1" - ) - public static class431[] method7584() { - return new class431[]{field4592, field4595, field4598}; // L: 55 - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lpi;B)V", - garbageValue = "54" - ) - public static void method7579(Object var0, Buffer var1) { - Class var3 = var0.getClass(); // L: 67 - class431[] var5 = method7584(); // L: 72 - int var6 = 0; - - class431 var4; - while (true) { - if (var6 >= var5.length) { - var4 = null; // L: 83 - break; - } - - class431 var7 = var5[var6]; // L: 74 - if (var3 == var7.field4593) { // L: 76 - var4 = var7; // L: 77 - break; - } - - ++var6; // L: 73 - } - - if (var4 == null) { // L: 86 - throw new IllegalArgumentException(); - } else { - class427 var2 = var4.field4597; // L: 87 - var2.vmethod7597(var0, var1); // L: 90 - } - } // L: 91 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lln;Lln;Ljava/lang/String;Ljava/lang/String;I)Lmd;", - garbageValue = "986567968" - ) - public static Font method7594(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { - int var4 = var0.getGroupId(var2); // L: 149 - int var5 = var0.getFileId(var4, var3); // L: 150 - return class163.method3322(var0, var1, var4, var5); // L: 151 - } - - @ObfuscatedName("jq") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lky;I)Ljava/lang/String;", - garbageValue = "695765846" - ) - static String method7592(String var0, Widget var1) { - if (var0.indexOf("%") != -1) { // L: 10730 - for (int var2 = 1; var2 <= 5; ++var2) { // L: 10731 - while (true) { - int var3 = var0.indexOf("%" + var2); // L: 10733 - if (var3 == -1) { // L: 10734 - break; - } - - String var4 = var0.substring(0, var3); // L: 10735 - int var6 = BufferedSource.method6907(var1, var2 - 1); // L: 10737 - String var5; - if (var6 < 999999999) { // L: 10739 - var5 = Integer.toString(var6); // L: 10740 - } else { - var5 = "*"; // L: 10743 - } - - var0 = var4 + var5 + var0.substring(var3 + 2); // L: 10745 - } - } - } - - return var0; // L: 10749 + field4651 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3}; // L: 4 } } diff --git a/runescape-client/src/main/java/class432.java b/runescape-client/src/main/java/class432.java index c947143297..adecd0ace0 100644 --- a/runescape-client/src/main/java/class432.java +++ b/runescape-client/src/main/java/class432.java @@ -1,41 +1,32 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ps") -final class class432 implements class427 { - @ObfuscatedName("nv") - @ObfuscatedGetter( - intValue = -951968351 - ) - @Export("selectedItemSlot") - static int selectedItemSlot; - - @ObfuscatedName("v") +@ObfuscatedName("pr") +final class class432 implements class429 { + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lpi;I)V", - garbageValue = "-700069158" + descriptor = "(Ljava/lang/Object;Lpx;I)V", + garbageValue = "-2139027116" ) - public void vmethod7597(Object var1, Buffer var2) { - this.method7601((String)var1, var2); // L: 46 - } // L: 47 + public void vmethod7440(Object var1, Buffer var2) { + this.method7409((Long)var1, var2); // L: 35 + } // L: 36 - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lpi;I)Ljava/lang/Object;", - garbageValue = "-1640188252" + descriptor = "(Lpx;I)Ljava/lang/Object;", + garbageValue = "352015354" ) - public Object vmethod7598(Buffer var1) { - return var1.readStringCp1252NullTerminated(); // L: 42 + public Object vmethod7436(Buffer var1) { + return var1.readLong(); // L: 31 } @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lpi;I)V", - garbageValue = "-1186525563" + descriptor = "(Ljava/lang/Long;Lpx;I)V", + garbageValue = "1601706825" ) - void method7601(String var1, Buffer var2) { - var2.writeStringCp1252NullTerminated(var1); // L: 38 - } // L: 39 + void method7409(Long var1, Buffer var2) { + var2.writeLong(var1); // L: 26 + } // L: 27 } diff --git a/runescape-client/src/main/java/class433.java b/runescape-client/src/main/java/class433.java index 749c474aec..441db21afa 100644 --- a/runescape-client/src/main/java/class433.java +++ b/runescape-client/src/main/java/class433.java @@ -1,42 +1,174 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pl") -public final class class433 { - @ObfuscatedName("c") +@ObfuscatedName("pm") +public class class433 implements MouseWheel { + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[IIIB)V", - garbageValue = "91" + descriptor = "Lpm;" ) - public static void method7605(String[] var0, int[] var1, int var2, int var3) { - if (var2 < var3) { // L: 39 - int var4 = (var3 + var2) / 2; // L: 40 - int var5 = var2; // L: 41 - String var6 = var0[var4]; // L: 42 - var0[var4] = var0[var3]; // L: 43 - var0[var3] = var6; // L: 44 - int var7 = var1[var4]; // L: 45 - var1[var4] = var1[var3]; // L: 46 - var1[var3] = var7; // L: 47 + public static final class433 field4664; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lpm;" + ) + public static final class433 field4655; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lpm;" + ) + public static final class433 field4656; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 511130033 + ) + @Export("canvasHeight") + public static int canvasHeight; + @ObfuscatedName("hw") + @ObfuscatedGetter( + intValue = -2114897749 + ) + static int field4657; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -822067139 + ) + final int field4654; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1795458283 + ) + public final int field4658; + @ObfuscatedName("m") + public final Class field4667; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lpb;" + ) + final class429 field4660; - for (int var8 = var2; var8 < var3; ++var8) { // L: 48 - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 49 - String var9 = var0[var8]; // L: 50 - var0[var8] = var0[var5]; // L: 51 - var0[var5] = var9; // L: 52 - int var10 = var1[var8]; // L: 53 - var1[var8] = var1[var5]; // L: 54 - var1[var5++] = var10; // L: 55 - } + static { + field4664 = new class433(0, 0, Integer.class, new class430()); // L: 10 + field4655 = new class433(2, 1, Long.class, new class432()); // L: 24 + field4656 = new class433(1, 2, String.class, new class434()); // L: 38 + } + + @ObfuscatedSignature( + descriptor = "(IILjava/lang/Class;Lpb;)V" + ) + class433(int var1, int var2, Class var3, class429 var4) { + this.field4654 = var1; // L: 58 + this.field4658 = var2; // L: 59 + this.field4667 = var3; // L: 60 + this.field4660 = var4; // L: 61 + } // L: 62 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "30" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4658; // L: 99 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Lpx;B)Ljava/lang/Object;", + garbageValue = "-88" + ) + public Object method7423(Buffer var1) { + return this.field4660.vmethod7436(var1); // L: 103 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lpx;I)V", + garbageValue = "2054774363" + ) + public static void method7420(Object var0, Buffer var1) { + class429 var2 = method7424(var0.getClass()); // L: 66 + var2.vmethod7440(var0, var1); // L: 67 + } // L: 68 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Class;B)Lpb;", + garbageValue = "95" + ) + static class429 method7424(Class var0) { + class433[] var2 = new class433[]{field4655, field4656, field4664}; // L: 77 + class433[] var3 = var2; // L: 79 + int var4 = 0; + + class433 var1; + while (true) { + if (var4 >= var3.length) { + var1 = null; // L: 90 + break; } - var0[var3] = var0[var5]; // L: 59 - var0[var5] = var6; // L: 60 - var1[var3] = var1[var5]; // L: 61 - var1[var5] = var7; // L: 62 - method7605(var0, var1, var2, var5 - 1); // L: 63 - method7605(var0, var1, var5 + 1, var3); // L: 64 + class433 var5 = var3[var4]; // L: 81 + if (var5.field4667 == var0) { // L: 83 + var1 = var5; // L: 84 + break; + } + + ++var4; // L: 80 } - } // L: 66 + if (var1 == null) { // L: 93 + throw new IllegalArgumentException(); + } else { + return var1.field4660; // L: 94 + } + } + + @ObfuscatedName("jq") + @ObfuscatedSignature( + descriptor = "(IIIIIII)V", + garbageValue = "687799312" + ) + static final void method7433(int var0, int var1, int var2, int var3, int var4, int var5) { + int var6 = var2 - var0; // L: 10684 + int var7 = var3 - var1; // L: 10685 + int var8 = var6 >= 0 ? var6 : -var6; // L: 10686 + int var9 = var7 >= 0 ? var7 : -var7; // L: 10687 + int var10 = var8; // L: 10688 + if (var8 < var9) { // L: 10689 + var10 = var9; + } + + if (var10 != 0) { // L: 10690 + int var11 = (var6 << 16) / var10; // L: 10691 + int var12 = (var7 << 16) / var10; // L: 10692 + if (var12 <= var11) { // L: 10693 + var11 = -var11; + } else { + var12 = -var12; // L: 10694 + } + + int var13 = var5 * var12 >> 17; // L: 10695 + int var14 = var5 * var12 + 1 >> 17; // L: 10696 + int var15 = var5 * var11 >> 17; // L: 10697 + int var16 = var5 * var11 + 1 >> 17; // L: 10698 + var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 10699 + var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 10700 + int var17 = var0 + var13; // L: 10701 + int var18 = var0 - var14; // L: 10702 + int var19 = var0 + var6 - var14; // L: 10703 + int var20 = var0 + var6 + var13; // L: 10704 + int var21 = var15 + var1; // L: 10705 + int var22 = var1 - var16; // L: 10706 + int var23 = var7 + var1 - var16; // L: 10707 + int var24 = var15 + var7 + var1; // L: 10708 + Rasterizer3D.method3976(var17, var18, var19); // L: 10709 + Rasterizer3D.method3919(var21, var22, var23, var17, var18, var19, var4); // L: 10710 + Rasterizer3D.method3976(var17, var19, var20); // L: 10711 + Rasterizer3D.method3919(var21, var23, var24, var17, var19, var20, var4); // L: 10712 + } + } // L: 10713 } diff --git a/runescape-client/src/main/java/class434.java b/runescape-client/src/main/java/class434.java new file mode 100644 index 0000000000..37c6d5f6c0 --- /dev/null +++ b/runescape-client/src/main/java/class434.java @@ -0,0 +1,43 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ps") +final class class434 implements class429 { + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lpx;I)V", + garbageValue = "-2139027116" + ) + public void vmethod7440(Object var1, Buffer var2) { + this.method7435((String)var1, var2); // L: 49 + } // L: 50 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Lpx;I)Ljava/lang/Object;", + garbageValue = "352015354" + ) + public Object vmethod7436(Buffer var1) { + return var1.readStringCp1252NullTerminated(); // L: 45 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lpx;I)V", + garbageValue = "1690387944" + ) + void method7435(String var1, Buffer var2) { + var2.writeStringCp1252NullTerminated(var1); // L: 40 + } // L: 41 + + @ObfuscatedName("lb") + @ObfuscatedSignature( + descriptor = "(Lki;I)Z", + garbageValue = "284900734" + ) + @Export("isComponentHidden") + static boolean isComponentHidden(Widget var0) { + return var0.isHidden; // L: 12509 + } +} diff --git a/runescape-client/src/main/java/class440.java b/runescape-client/src/main/java/class440.java deleted file mode 100644 index cfd558a5af..0000000000 --- a/runescape-client/src/main/java/class440.java +++ /dev/null @@ -1,11 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("pv") -public interface class440 { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Lpi;S)V" - ) - void method7924(Buffer var1); -} diff --git a/runescape-client/src/main/java/class441.java b/runescape-client/src/main/java/class441.java deleted file mode 100644 index c2c34037b1..0000000000 --- a/runescape-client/src/main/java/class441.java +++ /dev/null @@ -1,81 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("pq") -public class class441 implements MouseWheel { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lpq;" - ) - public static final class441 field4678; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lpq;" - ) - public static final class441 field4671; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lpq;" - ) - static final class441 field4673; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lpq;" - ) - static final class441 field4674; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lpq;" - ) - static final class441 field4677; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lpq;" - ) - static final class441 field4676; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 489938793 - ) - final int field4675; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 464620871 - ) - final int field4672; - - static { - field4678 = new class441(2, 0); // L: 8 - field4671 = new class441(4, 2); // L: 9 - field4673 = new class441(0, 5); // L: 10 - field4674 = new class441(3, 6); // L: 11 - field4677 = new class441(1, 7); // L: 12 - field4676 = new class441(5, 8); // L: 13 - } - - class441(int var1, int var2) { - this.field4675 = var1; // L: 18 - this.field4672 = var2; // L: 19 - } // L: 20 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "16" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field4672; // L: 23 - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1052027203" - ) - public boolean method7928() { - return this == field4671; // L: 27 - } -} diff --git a/runescape-client/src/main/java/class442.java b/runescape-client/src/main/java/class442.java new file mode 100644 index 0000000000..7ae67c5bcc --- /dev/null +++ b/runescape-client/src/main/java/class442.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("qe") +public interface class442 { + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lpx;I)V" + ) + void method7783(Buffer var1); +} diff --git a/runescape-client/src/main/java/class443.java b/runescape-client/src/main/java/class443.java new file mode 100644 index 0000000000..d6671e2967 --- /dev/null +++ b/runescape-client/src/main/java/class443.java @@ -0,0 +1,81 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("qu") +public class class443 implements MouseWheel { + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lqu;" + ) + public static final class443 field4734; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lqu;" + ) + public static final class443 field4730; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lqu;" + ) + static final class443 field4732; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lqu;" + ) + static final class443 field4729; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lqu;" + ) + static final class443 field4733; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lqu;" + ) + static final class443 field4731; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 937638557 + ) + final int field4735; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1478684649 + ) + final int field4736; + + static { + field4734 = new class443(3, 0); // L: 8 + field4730 = new class443(4, 2); // L: 9 + field4732 = new class443(1, 5); // L: 10 + field4729 = new class443(2, 6); // L: 11 + field4733 = new class443(5, 7); // L: 12 + field4731 = new class443(0, 8); // L: 13 + } + + class443(int var1, int var2) { + this.field4735 = var1; // L: 18 + this.field4736 = var2; // L: 19 + } // L: 20 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "30" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4736; // L: 24 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-832611575" + ) + public boolean method7790() { + return this == field4730; // L: 28 + } +} diff --git a/runescape-client/src/main/java/class444.java b/runescape-client/src/main/java/class444.java deleted file mode 100644 index 0931b1fce8..0000000000 --- a/runescape-client/src/main/java/class444.java +++ /dev/null @@ -1,12 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("qf") -public interface class444 { - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/Object;", - garbageValue = "-61" - ) - Object vmethod7950(int var1); -} diff --git a/runescape-client/src/main/java/class445.java b/runescape-client/src/main/java/class445.java deleted file mode 100644 index 2df798297f..0000000000 --- a/runescape-client/src/main/java/class445.java +++ /dev/null @@ -1,41 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("qd") -public class class445 { - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -994672853 - ) - public final int field4683; - @ObfuscatedName("c") - public Object field4681; - - public class445(int var1) { - this.field4683 = var1; // L: 8 - } // L: 9 - - public class445(int var1, Object var2) { - this.field4683 = var1; // L: 12 - this.field4681 = var2; // L: 13 - } // L: 14 - - public int hashCode() { - return super.hashCode(); // L: 17 - } - - public boolean equals(Object var1) { - if (!(var1 instanceof class445)) { // L: 21 - return false; - } else { - class445 var2 = (class445)var1; // L: 22 - if (var2.field4681 == null && this.field4681 != null) { // L: 23 - return false; - } else if (this.field4681 == null && var2.field4681 != null) { // L: 24 - return false; - } else { - return this.field4683 == var2.field4683 && var2.field4681.equals(this.field4681); // L: 25 - } - } - } -} diff --git a/runescape-client/src/main/java/class446.java b/runescape-client/src/main/java/class446.java new file mode 100644 index 0000000000..6a5dbca54b --- /dev/null +++ b/runescape-client/src/main/java/class446.java @@ -0,0 +1,12 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("qo") +public interface class446 { + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/Object;", + garbageValue = "-322202585" + ) + Object vmethod7814(int var1); +} diff --git a/runescape-client/src/main/java/class447.java b/runescape-client/src/main/java/class447.java new file mode 100644 index 0000000000..33e1c01f60 --- /dev/null +++ b/runescape-client/src/main/java/class447.java @@ -0,0 +1,41 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("qx") +public class class447 { + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1868107489 + ) + public final int field4741; + @ObfuscatedName("q") + public Object field4742; + + public class447(int var1) { + this.field4741 = var1; // L: 8 + } // L: 9 + + public class447(int var1, Object var2) { + this.field4741 = var1; // L: 12 + this.field4742 = var2; // L: 13 + } // L: 14 + + public int hashCode() { + return super.hashCode(); // L: 18 + } + + public boolean equals(Object var1) { + if (!(var1 instanceof class447)) { // L: 23 + return false; + } else { + class447 var2 = (class447)var1; // L: 24 + if (var2.field4742 == null && this.field4742 != null) { // L: 25 + return false; + } else if (this.field4742 == null && var2.field4742 != null) { // L: 26 + return false; + } else { + return this.field4741 == var2.field4741 && var2.field4742.equals(this.field4742); // L: 27 + } + } + } +} diff --git a/runescape-client/src/main/java/class451.java b/runescape-client/src/main/java/class453.java similarity index 64% rename from runescape-client/src/main/java/class451.java rename to runescape-client/src/main/java/class453.java index a88a265d8d..51c6e948af 100644 --- a/runescape-client/src/main/java/class451.java +++ b/runescape-client/src/main/java/class453.java @@ -2,33 +2,33 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("qy") -public class class451 { - @ObfuscatedName("v") +@ObfuscatedName("qk") +public class class453 { + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1097850827 + intValue = 1540266419 ) @Export("SpriteBuffer_spriteCount") public static int SpriteBuffer_spriteCount; - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 28448161 + intValue = 1346768065 ) @Export("SpriteBuffer_spriteWidth") public static int SpriteBuffer_spriteWidth; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 972266423 + intValue = 1623360163 ) @Export("SpriteBuffer_spriteHeight") public static int SpriteBuffer_spriteHeight; - @ObfuscatedName("f") + @ObfuscatedName("k") @Export("SpriteBuffer_xOffsets") public static int[] SpriteBuffer_xOffsets; - @ObfuscatedName("n") - @Export("SpriteBuffer_spriteWidths") - public static int[] SpriteBuffer_spriteWidths; - @ObfuscatedName("s") + @ObfuscatedName("a") + @Export("SpriteBuffer_yOffsets") + public static int[] SpriteBuffer_yOffsets; + @ObfuscatedName("p") @Export("SpriteBuffer_spriteHeights") public static int[] SpriteBuffer_spriteHeights; } diff --git a/runescape-client/src/main/java/class462.java b/runescape-client/src/main/java/class462.java new file mode 100644 index 0000000000..4b89b761be --- /dev/null +++ b/runescape-client/src/main/java/class462.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("qf") +public class class462 { + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Llp;" + ) + @Export("musicSamplesArchive") + public static AbstractArchive musicSamplesArchive; +} diff --git a/runescape-client/src/main/java/class45.java b/runescape-client/src/main/java/class47.java similarity index 67% rename from runescape-client/src/main/java/class45.java rename to runescape-client/src/main/java/class47.java index f7f2cbafa1..1184da7b77 100644 --- a/runescape-client/src/main/java/class45.java +++ b/runescape-client/src/main/java/class47.java @@ -3,11 +3,11 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ai") -public interface class45 { - @ObfuscatedName("v") +public interface class47 { + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Lay;", - garbageValue = "-262480710" + descriptor = "(I)Lal;", + garbageValue = "-1051033843" ) @Export("player") PcmPlayer player(); diff --git a/runescape-client/src/main/java/class5.java b/runescape-client/src/main/java/class5.java index 77eabf5bd4..b6e76c8fdb 100644 --- a/runescape-client/src/main/java/class5.java +++ b/runescape-client/src/main/java/class5.java @@ -4,26 +4,26 @@ import java.security.NoSuchAlgorithmException; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("n") +@ObfuscatedName("m") public class class5 implements class2 { - @ObfuscatedName("v") + @ObfuscatedName("o") final MessageDigest field9; @ObfuscatedSignature( - descriptor = "(Lq;)V" + descriptor = "(Lr;)V" ) class5(class8 var1) { - this.field9 = this.method23(); // L: 14 + this.field9 = this.method27(); // L: 14 } // L: 15 - @ObfuscatedName("v") - boolean method19(int var1, String var2, long var3) { - byte[] var5 = this.method22(var2, var3); // L: 18 - return method33(var5) >= var1; // L: 19 + @ObfuscatedName("o") + boolean method36(int var1, String var2, long var3) { + byte[] var5 = this.method37(var2, var3); // L: 18 + return method25(var5) >= var1; // L: 19 } - @ObfuscatedName("f") - byte[] method22(String var1, long var2) { + @ObfuscatedName("k") + byte[] method37(String var1, long var2) { StringBuilder var4 = new StringBuilder(); // L: 56 var4.append(var1).append(Long.toHexString(var2)); // L: 57 this.field9.reset(); // L: 58 @@ -37,8 +37,8 @@ public class class5 implements class2 { return this.field9.digest(); // L: 65 } - @ObfuscatedName("b") - MessageDigest method23() { + @ObfuscatedName("a") + MessageDigest method27() { try { return MessageDigest.getInstance("SHA-256"); // L: 70 } catch (NoSuchAlgorithmException var2) { // L: 72 @@ -47,14 +47,14 @@ public class class5 implements class2 { } } - @ObfuscatedName("c") - static int method33(byte[] var0) { + @ObfuscatedName("q") + static int method25(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 = method26(var4); // L: 29 + int var5 = method35(var4); // L: 29 var1 += var5; // L: 30 if (var5 != 8) { // L: 31 break; @@ -64,8 +64,8 @@ public class class5 implements class2 { return var1; // L: 37 } - @ObfuscatedName("i") - static int method26(byte var0) { + @ObfuscatedName("l") + static int method35(byte var0) { int var1 = 0; // L: 41 if (var0 == 0) { // L: 42 var1 = 8; // L: 43 diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java deleted file mode 100644 index ae4dffde39..0000000000 --- a/runescape-client/src/main/java/class54.java +++ /dev/null @@ -1,56 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("br") -public class class54 { - @ObfuscatedName("sn") - @ObfuscatedGetter( - intValue = -508954501 - ) - static int field447; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Llk;" - ) - @Export("reflectionChecks") - static IterableNodeDeque reflectionChecks; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lqq;" - ) - @Export("options_buttons_2Sprite") - static IndexedSprite options_buttons_2Sprite; - @ObfuscatedName("cz") - @ObfuscatedSignature( - descriptor = "Lqq;" - ) - @Export("worldSelectLeftSprite") - static IndexedSprite worldSelectLeftSprite; - @ObfuscatedName("en") - @ObfuscatedSignature( - descriptor = "Llx;" - ) - @Export("archive17") - static Archive archive17; - @ObfuscatedName("ic") - @ObfuscatedSignature( - descriptor = "[Lqi;" - ) - @Export("mapDotSprites") - static SpritePixels[] mapDotSprites; - - static { - reflectionChecks = new IterableNodeDeque(); // L: 17 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1793988868" - ) - public static int method1078(int var0) { - return class271.field3155[var0]; // L: 24 - } -} diff --git a/runescape-client/src/main/java/class6.java b/runescape-client/src/main/java/class6.java index 43c0477766..9d0445798e 100644 --- a/runescape-client/src/main/java/class6.java +++ b/runescape-client/src/main/java/class6.java @@ -3,91 +3,101 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("s") +@ObfuscatedName("p") public enum class6 implements MouseWheel { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ls;" + descriptor = "Lp;" ) - field14(0, 0); + field16(0, 0); + + @ObfuscatedName("i") + @Export("BZip2Decompressor_block") + static int[] BZip2Decompressor_block; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 2103814257 + ) + public final int field11; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 23593839 + ) + final int field15; + + class6(int var3, int var4) { + this.field11 = var3; // L: 12 + this.field15 = var4; // L: 13 + } // L: 14 @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lah;" - ) - @Export("soundSystem") - static SoundSystem soundSystem; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -758443575 - ) - public final int field12; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 834021789 - ) - final int field13; - - class6(int var3, int var4) { - this.field12 = var3; // L: 12 - this.field13 = var4; // L: 13 - } // L: 14 - - @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field13; // L: 17 + return this.field15; // L: 18 } - @ObfuscatedName("c") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lln;III)Lqi;", - garbageValue = "-1027602960" + descriptor = "(III)I", + garbageValue = "-918039654" ) - @Export("SpriteBuffer_getSprite") - public static SpritePixels SpriteBuffer_getSprite(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 + static int method45(int var0, int var1) { + long var2 = (long)((var0 << 16) + var1); // L: 164 + return WorldMapIcon_0.NetCache_currentResponse != null && var2 == WorldMapIcon_0.NetCache_currentResponse.key ? class357.NetCache_responseArchiveBuffer.offset * 99 / (class357.NetCache_responseArchiveBuffer.array.length - WorldMapIcon_0.NetCache_currentResponse.padding) + 1 : 0; // L: 165 166 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(CB)Z", + garbageValue = "-55" + ) + @Export("isCharPrintable") + public static boolean isCharPrintable(char var0) { + if (var0 >= ' ' && var0 <= '~') { // L: 187 + return true; + } else if (var0 >= 160 && var0 <= 255) { + return true; // L: 188 } else { - WorldMapArea.SpriteBuffer_decode(var4); // L: 45 - var3 = true; // L: 46 + return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 189 } + } - if (!var3) { // L: 48 - return null; - } else { - SpritePixels var5 = new SpritePixels(); // L: 51 - var5.width = class451.SpriteBuffer_spriteWidth; // L: 52 - var5.height = class451.SpriteBuffer_spriteHeight; // L: 53 - var5.xOffset = class451.SpriteBuffer_xOffsets[0]; // L: 54 - var5.yOffset = class271.SpriteBuffer_yOffsets[0]; // L: 55 - var5.subWidth = class451.SpriteBuffer_spriteWidths[0]; // L: 56 - var5.subHeight = class451.SpriteBuffer_spriteHeights[0]; // L: 57 - int var6 = var5.subWidth * var5.subHeight; // L: 58 - byte[] var7 = FriendLoginUpdate.SpriteBuffer_pixels[0]; // L: 59 - var5.pixels = new int[var6]; // L: 60 - - for (int var8 = 0; var8 < var6; ++var8) { // L: 61 - var5.pixels[var8] = NetFileRequest.SpriteBuffer_spritePalette[var7[var8] & 255]; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(ILbb;ZI)I", + garbageValue = "1816581663" + ) + static int method47(int var0, Script var1, boolean var2) { + if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { // L: 4484 + if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { // L: 4489 + if (var0 == 6750) { // L: 4493 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 4494 + return 1; // L: 4495 + } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { // L: 4497 + if (var0 == 6754) { // L: 4501 + int var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4502 + NPCComposition var4 = WorldMapSectionType.getNpcDefinition(var3); // L: 4503 + Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; // L: 4504 + return 1; // L: 4505 + } else { + return 2; // L: 4507 + } + } else { + Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4498 + return 1; // L: 4499 + } + } else { + --class12.Interpreter_intStackSize; // L: 4490 + return 1; // L: 4491 } - - ArchiveDiskActionHandler.method5813(); // L: 62 - return var5; // L: 65 + } else { + class12.Interpreter_intStackSize -= 2; // L: 4485 + --class9.Interpreter_stringStackSize; // L: 4486 + return 1; // L: 4487 } } - - @ObfuscatedName("hn") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "144596898" - ) - static boolean method36() { - return (Client.drawPlayerNames & 8) != 0; // L: 4857 - } } diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java index 58ff80498e..97497929ee 100644 --- a/runescape-client/src/main/java/class65.java +++ b/runescape-client/src/main/java/class65.java @@ -1,54 +1,29 @@ import java.math.BigInteger; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bq") +@ObfuscatedName("bz") public class class65 { - @ObfuscatedName("b") - static final BigInteger field863; - @ObfuscatedName("n") - static final BigInteger field864; - @ObfuscatedName("bx") - static String field868; + @ObfuscatedName("a") + static final BigInteger field854; + @ObfuscatedName("m") + static final BigInteger field862; static { - field863 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20 - field864 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21 + field854 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20 + field862 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21 } - @ObfuscatedName("jt") + @ObfuscatedName("ib") @ObfuscatedSignature( - descriptor = "(Lky;Lgf;IIZI)V", - garbageValue = "1206801353" + descriptor = "(III)Lgw;", + garbageValue = "-1781154478" ) - @Export("addWidgetItemMenuItem") - static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) { - String[] var5 = var1.inventoryActions; // L: 11004 - byte var6 = -1; // L: 11005 - String var7 = null; // L: 11006 - if (var5 != null && var5[var3] != null) { // L: 11007 - if (var3 == 0) { // L: 11008 - var6 = 33; - } else if (var3 == 1) { // L: 11009 - var6 = 34; - } else if (var3 == 2) { // L: 11010 - var6 = 35; - } else if (var3 == 3) { // L: 11011 - var6 = 36; - } else { - var6 = 37; // L: 11012 - } - - var7 = var5[var3]; // L: 11013 - } else if (var3 == 4) { // L: 11016 - var6 = 37; // L: 11017 - var7 = "Drop"; // L: 11018 - } - - if (var6 != -1 && var7 != null) { // L: 11021 - class28.insertMenuItem(var7, UserComparator9.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 11022 - } - - } // L: 11024 + static RouteStrategy method1879(int var0, int var1) { + Client.field771.approxDestinationX = var0; // L: 8689 + Client.field771.approxDestinationY = var1; // L: 8690 + Client.field771.approxDestinationSizeX = 1; // L: 8691 + Client.field771.approxDestinationSizeY = 1; // L: 8692 + return Client.field771; // L: 8693 + } } diff --git a/runescape-client/src/main/java/class67.java b/runescape-client/src/main/java/class67.java index d0cc127716..b7cb96a565 100644 --- a/runescape-client/src/main/java/class67.java +++ b/runescape-client/src/main/java/class67.java @@ -1,80 +1,122 @@ import java.math.BigInteger; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bk") +@ObfuscatedName("bt") public class class67 { - @ObfuscatedName("sk") - @ObfuscatedGetter( - intValue = -19074661 + @ObfuscatedName("o") + static final BigInteger field875; + @ObfuscatedName("q") + static final BigInteger field871; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lqd;" ) - static int field881; - @ObfuscatedName("v") - static final BigInteger field882; - @ObfuscatedName("c") - static final BigInteger field880; + @Export("options_buttons_0Sprite") + static IndexedSprite options_buttons_0Sprite; static { - field882 = new BigInteger("10001", 16); // L: 6 - field880 = new BigInteger("a297f6692a7a1d8b2786f93cf85ef1d85f2a702a6f04b4503c079d0c3970d7a7bda84292dd1c8249b1cd8d0eb0fe10e16ad2d42a7fbbb321f4f5603afec3f13a03d534b8e2233ba479c346208306d2d816ef9f8f1ee69896d2cd1f3dfcb7d8e5987ed6e9412f962811bfbfb59b689ce506438d4f3c8dfb5c95c1670ad4d2e767", 16); // L: 7 + field875 = new BigInteger("10001", 16); // L: 6 + field871 = new BigInteger("b53e1d1321015e2b89b11477ee53d8352f43919de31343ff871ec92cae904da943010aeeb8026f3499c5850107833d2068992bf58921ee3a16ead4ac3f5b0aba763660bd6e68e45b863c2d6364b1d6faa581596c56c1117caf3f637c8dd223d6272654c304d3de1c13c47ef929a582788a1f9058b01e13082fbe05d69591d05d", 16); // L: 7 } - @ObfuscatedName("i") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-309865537" + descriptor = "(Lpx;IIIIIIB)V", + garbageValue = "109" ) - static int method1910(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 + @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: 168 + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 169 - for (int var4 = 0; var4 < var2.quantities.length; ++var4) { // L: 32 - if (var2.ids[var4] == var1) { - var3 += var2.quantities[var4]; // L: 33 + while (true) { + var7 = var0.readUnsignedByte(); // L: 171 + if (var7 == 0) { // L: 172 + if (var1 == 0) { + Tiles.Tiles_heights[0][var2][var3] = -GrandExchangeOfferUnitPriceComparator.method5846(var4 + var2 + 932731, 556238 + var3 + var5) * 8; // L: 173 + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 174 + } + break; + } + + if (var7 == 1) { // L: 177 + int var8 = var0.readUnsignedByte(); // L: 178 + if (var8 == 1) { // L: 179 + var8 = 0; + } + + if (var1 == 0) { // L: 180 + 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: 181 + } + break; + } + + if (var7 <= 49) { // L: 184 + Tiles.Tiles_overlays[var1][var2][var3] = var0.readByte(); // L: 185 + Tiles.Tiles_shapes[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 186 + RunException.field4812[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 187 + } else if (var7 <= 81) { // L: 190 + Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 191 + } else { + Tiles.Tiles_underlays[var1][var2][var3] = (byte)(var7 - 81); // L: 194 } } - - return var3; // L: 35 - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "822904825" - ) - public static int method1909(int var0) { - --var0; // L: 50 - var0 |= var0 >>> 1; // L: 51 - var0 |= var0 >>> 2; // L: 52 - var0 |= var0 >>> 4; // L: 53 - var0 |= var0 >>> 8; // L: 54 - var0 |= var0 >>> 16; // L: 55 - return var0 + 1; // L: 56 - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Lky;II)V", - garbageValue = "1726042020" - ) - @Export("Widget_setKeyIgnoreHeld") - static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { - if (var0.field3415 == null) { // L: 1020 - throw new RuntimeException(); // L: 1021 } else { - if (var0.field3484 == null) { // L: 1023 - var0.field3484 = new int[var0.field3415.length]; // L: 1024 - } + while (true) { + var7 = var0.readUnsignedByte(); // L: 199 + if (var7 == 0) { // L: 200 + break; + } - var0.field3484[var1] = Integer.MAX_VALUE; // L: 1026 + if (var7 == 1) { // L: 201 + var0.readUnsignedByte(); // L: 202 + break; + } + + if (var7 <= 49) { // L: 205 + var0.readUnsignedByte(); + } + } } - } // L: 1027 + + } // L: 208 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Llp;IB)Lqd;", + garbageValue = "69" + ) + public static IndexedSprite method1883(AbstractArchive var0, int var1) { + if (!class28.method374(var0, var1)) { // L: 130 + return null; + } else { + IndexedSprite var3 = new IndexedSprite(); // L: 133 + var3.width = class453.SpriteBuffer_spriteWidth; // L: 134 + var3.height = class453.SpriteBuffer_spriteHeight; // L: 135 + var3.xOffset = class453.SpriteBuffer_xOffsets[0]; // L: 136 + var3.yOffset = class453.SpriteBuffer_yOffsets[0]; // L: 137 + var3.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[0]; // L: 138 + var3.subHeight = class453.SpriteBuffer_spriteHeights[0]; // L: 139 + var3.palette = Decimator.SpriteBuffer_spritePalette; // L: 140 + var3.pixels = class127.SpriteBuffer_pixels[0]; // L: 141 + VarcInt.method3325(); // L: 142 + return var3; // L: 145 + } + } + + @ObfuscatedName("ki") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1989518897" + ) + static final void method1881(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); // L: 12073 + class12.clientPreferences.updateSoundEffectVolume(var0); // L: 12074 + } // L: 12075 } diff --git a/runescape-client/src/main/java/class7.java b/runescape-client/src/main/java/class7.java index 8feffb7ab9..373c8a5a77 100644 --- a/runescape-client/src/main/java/class7.java +++ b/runescape-client/src/main/java/class7.java @@ -1,210 +1,87 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +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("l") +@ObfuscatedName("s") public class class7 { - @ObfuscatedName("v") - ExecutorService field20; - @ObfuscatedName("c") - Future field18; - @ObfuscatedName("i") + @ObfuscatedName("bo") + @ObfuscatedGetter( + intValue = -1318475581 + ) + static int field26; + @ObfuscatedName("mg") + @ObfuscatedGetter( + intValue = 881204407 + ) + @Export("menuHeight") + static int menuHeight; + @ObfuscatedName("o") + ExecutorService field25; + @ObfuscatedName("q") + Future field20; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lpi;" + descriptor = "Lpx;" ) final Buffer field19; - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lf;" + descriptor = "Lk;" ) - final class3 field17; + final class3 field22; @ObfuscatedSignature( - descriptor = "(Lpi;Lf;)V" + descriptor = "(Lpx;Lk;)V" ) public class7(Buffer var1, class3 var2) { - this.field20 = Executors.newSingleThreadExecutor(); // L: 10 - this.field19 = var1; - this.field17 = var2; - this.method42(); // L: 18 - } + this.field25 = Executors.newSingleThreadExecutor(); // L: 10 + this.field19 = var1; // L: 16 + this.field22 = var2; // L: 17 + this.method52(); // L: 18 + } // L: 19 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-254090586" + descriptor = "(B)Z", + garbageValue = "16" ) - public boolean method43() { - return this.field18.isDone(); + public boolean method49() { + return this.field20.isDone(); // L: 22 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "67" + garbageValue = "-81" ) - public void method47() { - this.field20.shutdown(); // L: 26 - this.field20 = null; - } + public void method50() { + this.field25.shutdown(); // L: 26 + this.field25 = null; // L: 27 + } // L: 28 - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Lpi;", - garbageValue = "-2056850231" + descriptor = "(S)Lpx;", + garbageValue = "26345" ) - public Buffer method45() { + public Buffer method51() { try { - return (Buffer)this.field18.get(); + return (Buffer)this.field20.get(); // L: 32 } catch (Exception var2) { // L: 34 - return null; + return null; // L: 35 } } - @ObfuscatedName("f") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(S)V", + garbageValue = "16321" ) - void method42() { - this.field18 = this.field20.submit(new class1(this, this.field19, this.field17)); // L: 40 + void method52() { + this.field20 = this.field25.submit(new class1(this, this.field19, this.field22)); // L: 40 } // L: 41 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "6" - ) - static int method53(int var0, int var1) { - FloorOverlayDefinition var2 = Clock.method3349(var0); // L: 15 - if (var2 == null) { // L: 16 - return var1; // L: 17 - } else if (var2.secondaryRgb >= 0) { // L: 19 - return var2.secondaryRgb | -16777216; // L: 20 - } else { - int var3; - int var4; - byte var5; - int var7; - if (var2.texture >= 0) { // L: 22 - var4 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture); // L: 24 - var5 = 96; // L: 25 - if (var4 == -2) { // L: 27 - var3 = 12345678; // L: 28 - } else if (var4 == -1) { // L: 31 - if (var5 < 0) { // L: 32 - var5 = 0; // L: 33 - } else if (var5 > 127) { // L: 35 - var5 = 127; // L: 36 - } - - var7 = 127 - var5; // L: 38 - var3 = var7; // L: 39 - } else { - var7 = var5 * (var4 & 127) / 128; // L: 42 - if (var7 < 2) { - var7 = 2; // L: 43 - } else if (var7 > 126) { // L: 44 - var7 = 126; - } - - var3 = var7 + (var4 & 65408); // L: 45 - } - - return Rasterizer3D.Rasterizer3D_colorPalette[var3] | -16777216; // L: 48 - } else if (var2.primaryRgb == 16711935) { // L: 50 - return var1; // L: 51 - } else { - var3 = FontName.method7415(var2.hue, var2.saturation, var2.lightness); // L: 54 - var5 = 96; // L: 56 - if (var3 == -2) { // L: 58 - var4 = 12345678; // L: 59 - } else if (var3 == -1) { // L: 62 - if (var5 < 0) { // L: 63 - var5 = 0; // L: 64 - } else if (var5 > 127) { // L: 66 - var5 = 127; // L: 67 - } - - var7 = 127 - var5; // L: 69 - var4 = var7; // L: 70 - } else { - var7 = var5 * (var3 & 127) / 128; // L: 73 - if (var7 < 2) { // L: 74 - var7 = 2; - } else if (var7 > 126) { // L: 75 - var7 = 126; - } - - var4 = var7 + (var3 & 65408); // L: 76 - } - - return Rasterizer3D.Rasterizer3D_colorPalette[var4] | -16777216; // L: 79 - } - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(ILbd;ZI)I", - garbageValue = "17269568" - ) - static int method54(int var0, Script var1, boolean var2) { - int var3 = -1; // L: 561 - Widget var4; - if (var0 >= 2000) { // L: 563 - var0 -= 1000; // L: 564 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 565 - var4 = class127.getWidget(var3); // L: 566 - } else { - var4 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 568 - } - - if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 569 - Interpreter.Interpreter_intStackSize -= 4; // L: 570 - var4.rawX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 571 - var4.rawY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 572 - var4.xAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 573 - var4.yAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 574 - class346.invalidateWidget(var4); // L: 575 - class127.client.alignWidget(var4); // L: 576 - if (var3 != -1 && var4.type == 0) { // L: 577 - AbstractByteArrayCopier.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; // L: 578 - } else if (var0 == ScriptOpcodes.CC_SETSIZE) { // L: 580 - Interpreter.Interpreter_intStackSize -= 4; // L: 581 - var4.rawWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 582 - var4.rawHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 583 - var4.widthAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 584 - var4.heightAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 585 - class346.invalidateWidget(var4); // L: 586 - class127.client.alignWidget(var4); // L: 587 - if (var3 != -1 && var4.type == 0) { // L: 588 - AbstractByteArrayCopier.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; // L: 589 - } else if (var0 == ScriptOpcodes.CC_SETHIDE) { // L: 591 - boolean var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 592 - if (var5 != var4.isHidden) { // L: 593 - var4.isHidden = var5; // L: 594 - class346.invalidateWidget(var4); // L: 595 - } - - return 1; // L: 597 - } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 599 - var4.noClickThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 600 - return 1; // L: 601 - } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { // L: 603 - var4.noScrollThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 604 - return 1; // L: 605 - } else { - return 2; // L: 607 - } - } } diff --git a/runescape-client/src/main/java/class78.java b/runescape-client/src/main/java/class78.java index d4fae49ae5..dff57bc41e 100644 --- a/runescape-client/src/main/java/class78.java +++ b/runescape-client/src/main/java/class78.java @@ -2,54 +2,50 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cm") +@ObfuscatedName("co") public class class78 { - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IB)Lfs;", - garbageValue = "124" + descriptor = "(II)Lgv;", + garbageValue = "788038626" ) - @Export("getEnum") - public static EnumComposition getEnum(int var0) { - EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 29 - if (var1 != null) { // L: 30 + @Export("getParamDefinition") + public static ParamComposition getParamDefinition(int var0) { + ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); // L: 25 + if (var1 != null) { // L: 26 return var1; } else { - byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); // L: 31 - var1 = new EnumComposition(); // L: 32 - if (var2 != null) { // L: 33 + byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); // L: 27 + var1 = new ParamComposition(); // L: 28 + if (var2 != null) { // L: 29 var1.decode(new Buffer(var2)); } - EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 34 - return var1; // L: 35 + var1.postDecode(); // L: 30 + ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 31 + return var1; // L: 32 } } - @ObfuscatedName("n") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-39348286" + descriptor = "(CI)Z", + garbageValue = "2081460925" ) - static void method2081(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72 - if (var1 != null) { - var1.remove(); // L: 74 - } - } // L: 73 75 + @Export("isAlphaNumeric") + public static boolean isAlphaNumeric(char var0) { + return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 154 + } - @ObfuscatedName("y") + @ObfuscatedName("lf") @ObfuscatedSignature( - descriptor = "(IZIB)V", - garbageValue = "2" + descriptor = "(B)V", + garbageValue = "4" ) - public static final void method2082(int var0, boolean var1, int var2) { - if (var0 >= 8000 && var0 <= 48000) { // L: 45 - PcmPlayer.field268 = var0; // L: 46 - PcmPlayer.PcmPlayer_stereo = var1; // L: 47 - PcmPlayer.field295 = var2; // L: 48 - } else { - throw new IllegalArgumentException(); - } - } // L: 49 + @Export("Clan_leaveChat") + static final void Clan_leaveChat() { + PacketBufferNode var0 = WallDecoration.getPacketBufferNode(ClientPacket.field2970, Client.packetWriter.isaacCipher); // L: 12457 + var0.packetBuffer.writeByte(0); // L: 12458 + Client.packetWriter.addNode(var0); // L: 12459 + } // L: 12460 } diff --git a/runescape-client/src/main/java/class8.java b/runescape-client/src/main/java/class8.java index 5af61f3480..6bd0505aed 100644 --- a/runescape-client/src/main/java/class8.java +++ b/runescape-client/src/main/java/class8.java @@ -1,35 +1,35 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("q") +@ObfuscatedName("r") public class class8 { - @ObfuscatedName("v") - final int field23; - @ObfuscatedName("c") - final int field24; - @ObfuscatedName("i") - final String field25; + @ObfuscatedName("o") + final int field29; + @ObfuscatedName("q") + final int field30; + @ObfuscatedName("l") + final String field31; @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpx;)V" ) class8(Buffer var1) { this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); // L: 19 } // L: 20 class8(int var1, int var2, String var3) { - this.field23 = var1; // L: 13 - this.field24 = var2; // L: 14 - this.field25 = var3; // L: 15 + this.field29 = var1; // L: 13 + this.field30 = var2; // L: 14 + this.field31 = var3; // L: 15 } // L: 16 - @ObfuscatedName("v") - String method61() { - return Integer.toHexString(this.field23) + Integer.toHexString(this.field24) + this.field25; // L: 23 + @ObfuscatedName("o") + String method60() { + return Integer.toHexString(this.field29) + Integer.toHexString(this.field30) + this.field31; // L: 23 } - @ObfuscatedName("c") - int method56() { - return this.field24; // L: 27 + @ObfuscatedName("q") + int method58() { + return this.field30; // L: 27 } } diff --git a/runescape-client/src/main/java/class82.java b/runescape-client/src/main/java/class82.java index 38bf79c2a3..4766bcd2ff 100644 --- a/runescape-client/src/main/java/class82.java +++ b/runescape-client/src/main/java/class82.java @@ -3,122 +3,235 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cv") +@ObfuscatedName("cs") public enum class82 implements MouseWheel { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lcv;" + descriptor = "Lcs;" ) - field1055(0, -1), - @ObfuscatedName("c") + field1073(0, -1), + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lcv;" + descriptor = "Lcs;" ) - field1053(1, 1), - @ObfuscatedName("i") + field1079(1, 1), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lcv;" + descriptor = "Lcs;" ) - field1059(2, 7), - @ObfuscatedName("f") + field1078(2, 7), + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lcv;" + descriptor = "Lcs;" ) - field1057(3, 8), - @ObfuscatedName("b") + field1075(3, 8), + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lcv;" + descriptor = "Lcs;" ) - field1056(4, 9); + field1076(4, 9); - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1351015755 - ) - final int field1054; @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -520596277 + @Export("ItemDefinition_inMembersWorld") + public static boolean ItemDefinition_inMembersWorld; + @ObfuscatedName("r") + static int[] field1072; + @ObfuscatedName("ax") + @Export("client") + @ObfuscatedSignature( + descriptor = "Lclient;" ) - final int field1058; + static Client client; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 2093138331 + ) + final int field1077; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 612324331 + ) + final int field1081; class82(int var3, int var4) { - this.field1054 = var3; - this.field1058 = var4; - } + this.field1077 = var3; // L: 20 + this.field1081 = var4; // L: 21 + } // L: 22 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1058; + return this.field1081; // L: 26 } - @ObfuscatedName("v") - @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; var3 != 0L; var3 /= 37L) { // L: 19 20 22 - ++var2; // L: 21 - } - - StringBuilder var5; - char var8; - for (var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { // L: 24 25 34 - long var6 = var0; // L: 26 - var0 /= 37L; // L: 27 - var8 = class349.base37Table[(int)(var6 - var0 * 37L)]; // 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 - } + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(IB)Lgy;", + garbageValue = "1" + ) + @Export("getObjectDefinition") + public static ObjectComposition getObjectDefinition(int var0) { + ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); // L: 79 + if (var1 != null) { // L: 80 + return var1; } else { - return null; + byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); // L: 81 + var1 = new ObjectComposition(); // L: 82 + var1.id = var0; // L: 83 + if (var2 != null) { // L: 84 + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); // L: 85 + if (var1.isSolid) { // L: 86 + var1.interactType = 0; // L: 87 + var1.boolean1 = false; // L: 88 + } + + ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); // L: 90 + return var1; // L: 91 } } - @ObfuscatedName("v") + @ObfuscatedName("hs") @ObfuscatedSignature( - descriptor = "(B)[Ljq;", - garbageValue = "0" + descriptor = "(ZLpc;B)V", + garbageValue = "-25" ) - @Export("ServerPacket_values") - public static ServerPacket[] ServerPacket_values() { - return new ServerPacket[]{ServerPacket.field3033, ServerPacket.field3053, ServerPacket.field3096, ServerPacket.field3026, ServerPacket.field3038, ServerPacket.field3028, ServerPacket.field3025, ServerPacket.field3030, ServerPacket.field3031, ServerPacket.field3027, ServerPacket.field3072, ServerPacket.field3116, ServerPacket.field3035, ServerPacket.field3036, ServerPacket.field3037, ServerPacket.field3128, ServerPacket.field3114, ServerPacket.field3111, ServerPacket.field3041, ServerPacket.field3042, ServerPacket.field3097, ServerPacket.field3044, ServerPacket.field3086, ServerPacket.field3047, ServerPacket.field3119, ServerPacket.field3048, ServerPacket.field3049, ServerPacket.field3050, ServerPacket.field3034, ServerPacket.field3052, ServerPacket.field3029, ServerPacket.field3023, ServerPacket.field3024, ServerPacket.field3056, ServerPacket.field3057, ServerPacket.field3058, ServerPacket.field3045, ServerPacket.field3060, ServerPacket.field3054, ServerPacket.field3062, ServerPacket.field3063, ServerPacket.field3064, ServerPacket.field3101, ServerPacket.field3066, ServerPacket.field3067, ServerPacket.field3068, ServerPacket.field3105, ServerPacket.field3070, ServerPacket.field3071, ServerPacket.field3120, ServerPacket.field3073, ServerPacket.field3079, ServerPacket.field3043, ServerPacket.field3076, ServerPacket.field3077, ServerPacket.field3078, ServerPacket.field3069, ServerPacket.field3080, ServerPacket.field3081, ServerPacket.field3115, ServerPacket.field3083, ServerPacket.field3084, ServerPacket.field3085, ServerPacket.field3061, ServerPacket.field3087, ServerPacket.field3046, ServerPacket.field3089, ServerPacket.field3090, ServerPacket.field3091, ServerPacket.field3092, ServerPacket.field3093, ServerPacket.field3094, ServerPacket.field3051, ServerPacket.field3095, ServerPacket.field3032, ServerPacket.field3040, ServerPacket.field3099, ServerPacket.field3100, ServerPacket.field3074, ServerPacket.field3102, ServerPacket.field3088, ServerPacket.field3103, ServerPacket.field3075, ServerPacket.field3106, ServerPacket.field3107, ServerPacket.field3108, ServerPacket.field3109, ServerPacket.field3110, ServerPacket.field3055, ServerPacket.field3112, ServerPacket.field3113, ServerPacket.field3039, ServerPacket.field3059, ServerPacket.field3104, ServerPacket.field3117, ServerPacket.field3118, ServerPacket.field3082, ServerPacket.field3098, ServerPacket.field3121, ServerPacket.field3122, ServerPacket.field3123, ServerPacket.field3124, ServerPacket.field3125, ServerPacket.field3126}; // L: 113 - } + static final void method2098(boolean var0, PacketBuffer var1) { + while (true) { + if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 8080 + int var2 = var1.readBits(15); // L: 8081 + if (var2 != 32767) { // L: 8082 + boolean var3 = false; // L: 8083 + if (Client.npcs[var2] == null) { // L: 8084 + Client.npcs[var2] = new NPC(); // L: 8085 + var3 = true; // L: 8086 + } - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "54" - ) - public static int method2102(int var0, int var1) { - int var2 = var0 >>> 31; // L: 85 - return (var0 + var2) / var1 - var2; // L: 86 - } + NPC var4 = Client.npcs[var2]; // L: 8088 + Client.npcIndices[++Client.npcCount - 1] = var2; // L: 8089 + var4.npcCycle = Client.cycle; // L: 8090 + int var5; + int var6; + int var7; + int var10; + if (class393.field4428) { // L: 8094 + int var8 = Client.defaultRotations[var1.readBits(3)]; // L: 8095 + if (var3) { // L: 8096 + var4.orientation = var4.rotation = var8; + } - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "542795153" - ) - public static final void method2104() { - ViewportMouse.ViewportMouse_isInViewport = false; // L: 75 - ViewportMouse.ViewportMouse_entityCount = 0; // L: 76 - } // L: 77 + if (var0) { // L: 8097 + var7 = var1.readBits(8); // L: 8098 + if (var7 > 127) { // L: 8099 + var7 -= 256; + } + } else { + var7 = var1.readBits(5); // L: 8102 + if (var7 > 15) { // L: 8103 + var7 -= 32; + } + } + + var4.definition = WorldMapSectionType.getNpcDefinition(var1.readBits(14)); // L: 8105 + boolean var9 = var1.readBits(1) == 1; // L: 8106 + if (var9) { // L: 8107 + var1.readBits(32); // L: 8108 + } + + var5 = var1.readBits(1); // L: 8110 + var10 = var1.readBits(1); // L: 8111 + if (var10 == 1) { // L: 8112 + Client.field601[++Client.field565 - 1] = var2; + } + + if (var0) { // L: 8113 + var6 = var1.readBits(8); // L: 8114 + if (var6 > 127) { // L: 8115 + var6 -= 256; + } + } else { + var6 = var1.readBits(5); // L: 8118 + if (var6 > 15) { // L: 8119 + var6 -= 32; + } + } + } else { + boolean var11 = var1.readBits(1) == 1; // L: 8123 + if (var11) { // L: 8124 + var1.readBits(32); // L: 8125 + } + + if (var0) { // L: 8127 + var7 = var1.readBits(8); // L: 8128 + if (var7 > 127) { // L: 8129 + var7 -= 256; + } + } else { + var7 = var1.readBits(5); // L: 8132 + if (var7 > 15) { // L: 8133 + var7 -= 32; + } + } + + var5 = var1.readBits(1); // L: 8135 + if (var0) { // L: 8136 + var6 = var1.readBits(8); // L: 8137 + if (var6 > 127) { // L: 8138 + var6 -= 256; + } + } else { + var6 = var1.readBits(5); // L: 8141 + if (var6 > 15) { // L: 8142 + var6 -= 32; + } + } + + var4.definition = WorldMapSectionType.getNpcDefinition(var1.readBits(14)); // L: 8144 + int var12 = Client.defaultRotations[var1.readBits(3)]; // L: 8145 + if (var3) { // L: 8146 + var4.orientation = var4.rotation = var12; + } + + var10 = var1.readBits(1); // L: 8147 + if (var10 == 1) { // L: 8148 + Client.field601[++Client.field565 - 1] = var2; + } + } + + var4.field1167 = var4.definition.size; // L: 8150 + var4.field1204 = var4.definition.rotation; // L: 8151 + if (var4.field1204 == 0) { // L: 8152 + var4.rotation = 0; + } + + var4.walkSequence = var4.definition.walkSequence; // L: 8153 + var4.walkBackSequence = var4.definition.walkBackSequence; // L: 8154 + var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 8155 + var4.walkRightSequence = var4.definition.walkRightSequence; // L: 8156 + var4.idleSequence = var4.definition.idleSequence; // L: 8157 + var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 8158 + var4.turnRightSequence = var4.definition.turnRightSequence; // L: 8159 + var4.runSequence = var4.definition.field1959; // L: 8160 + var4.field1150 = var4.definition.field1960; // L: 8161 + var4.field1183 = var4.definition.field1961; // L: 8162 + var4.field1152 = var4.definition.field1946; // L: 8163 + var4.field1160 = var4.definition.field1985; // L: 8164 + var4.field1154 = var4.definition.field1964; // L: 8165 + var4.field1155 = var4.definition.field1956; // L: 8166 + var4.field1156 = var4.definition.field1966; // L: 8167 + var4.method2341(ModelData0.localPlayer.pathX[0] + var6, ModelData0.localPlayer.pathY[0] + var7, var5 == 1); // L: 8168 + continue; // L: 8169 + } + } + + var1.exportIndex(); // L: 8170 + return; // L: 8171 + } + } } diff --git a/runescape-client/src/main/java/class83.java b/runescape-client/src/main/java/class83.java index 1060b47626..8be1049964 100644 --- a/runescape-client/src/main/java/class83.java +++ b/runescape-client/src/main/java/class83.java @@ -3,90 +3,68 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cs") +@ObfuscatedName("cm") public enum class83 implements MouseWheel { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lcs;" + descriptor = "Lcm;" ) - field1064(0, -1), - @ObfuscatedName("c") + field1088(0, -1), + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lcs;" + descriptor = "Lcm;" ) - field1066(1, 2), - @ObfuscatedName("i") + field1083(1, 2), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lcs;" + descriptor = "Lcm;" ) - field1062(2, 3), - @ObfuscatedName("f") + field1084(2, 3), + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lcs;" + descriptor = "Lcm;" ) - field1061(3, 4), - @ObfuscatedName("b") + field1087(3, 4), + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lcs;" + descriptor = "Lcm;" ) - field1067(4, 5), - @ObfuscatedName("n") + field1086(4, 5), + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lcs;" + descriptor = "Lcm;" ) - field1065(5, 6); + field1092(5, 6); - @ObfuscatedName("uk") - @ObfuscatedSignature( - descriptor = "Llu;" + @ObfuscatedName("n") + @Export("cacheSubPaths") + static String[] cacheSubPaths; + @ObfuscatedName("he") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 403650745 ) - @Export("grandExchangeEvents") - static GrandExchangeEvents grandExchangeEvents; + final int field1090; @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -106805987 + intValue = 105353159 ) - final int field1060; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -672454085 - ) - final int field1063; + final int field1089; class83(int var3, int var4) { - this.field1060 = var3; // L: 21 - this.field1063 = var4; // L: 22 + this.field1090 = var3; // L: 21 + this.field1089 = var4; // L: 22 } // L: 23 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1063; // L: 26 - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(ILky;IIIII[FI)Lky;", - garbageValue = "-511868196" - ) - static Widget method2111(int var0, Widget var1, int var2, int var3, int var4, int var5, int var6, float[] var7) { - Widget var8 = new Widget(); // L: 890 - var8.type = var0; // L: 891 - var8.parentId = var1.id; // L: 892 - var8.childIndex = var2; // L: 893 - var8.isIf3 = true; // L: 894 - var8.xAlignment = var3; // L: 895 - var8.yAlignment = var4; // L: 896 - var8.widthAlignment = var5; // L: 897 - var8.heightAlignment = var6; // L: 898 - var8.rawX = (int)(var7[0] * (float)var1.width); // L: 899 - var8.rawY = (int)(var7[1] * (float)var1.height); // L: 900 - var8.rawWidth = (int)(var7[2] * (float)var1.width); // L: 901 - var8.rawHeight = (int)((float)var1.height * var7[3]); // L: 902 - return var8; // L: 903 + return this.field1089; // L: 27 } } diff --git a/runescape-client/src/main/java/class9.java b/runescape-client/src/main/java/class9.java index 1444db218d..17b838eac0 100644 --- a/runescape-client/src/main/java/class9.java +++ b/runescape-client/src/main/java/class9.java @@ -3,913 +3,106 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("o") +@ObfuscatedName("v") public class class9 implements MouseWheel { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Lv;" ) - static final class9 field28; - @ObfuscatedName("c") + public static final class9 field32; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Lv;" ) - public static final class9 field37; - @ObfuscatedName("i") + public static final class9 field40; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Lv;" ) - static final class9 field38; + static final class9 field36; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lv;" + ) + static final class9 field34; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lv;" + ) + static final class9 field37; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = -1322409525 + ) + @Export("Interpreter_stringStackSize") + static int Interpreter_stringStackSize; @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Lit;" ) - static final class9 field29; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lo;" - ) - static final class9 field30; - @ObfuscatedName("r") + @Export("worldMapEvent") + static WorldMapEvent worldMapEvent; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1242087125 + intValue = -941198057 ) - static int field35; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1758617613 - ) - int field31; + int field33; + @ObfuscatedName("p") + String field38; @ObfuscatedName("s") - String field32; - @ObfuscatedName("l") - boolean field27; - @ObfuscatedName("q") - boolean field34; + boolean field39; + @ObfuscatedName("r") + boolean field35; static { - field28 = new class9(0, "POST", true, true); // L: 6 - field37 = new class9(1, "GET", true, false); // L: 7 - field38 = new class9(2, "PUT", false, true); // L: 8 - field29 = new class9(3, "PATCH", false, true); // L: 9 - field30 = new class9(4, "DELETE", false, true); // L: 10 + field32 = new class9(0, "POST", true, true); // L: 6 + field40 = new class9(1, "GET", true, false); // L: 7 + field36 = new class9(2, "PUT", false, true); // L: 8 + field34 = new class9(3, "PATCH", false, true); // L: 9 + field37 = new class9(4, "DELETE", false, true); // L: 10 } class9(int var1, String var2, boolean var3, boolean var4) { - this.field31 = var1; // L: 17 - this.field32 = var2; // L: 18 - this.field27 = var3; // L: 19 - this.field34 = var4; // L: 20 + this.field33 = var1; // L: 17 + this.field38 = var2; // L: 18 + this.field39 = var3; // L: 19 + this.field35 = var4; // L: 20 } // L: 21 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "16" + garbageValue = "30" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field31; // L: 36 + return this.field33; // L: 37 } - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "5017" - ) - boolean method63() { - return this.field27; // L: 24 - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1928506926" - ) - String method62() { - return this.field32; // L: 28 - } - - @ObfuscatedName("n") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "905166088" + garbageValue = "-29760861" ) - boolean method66() { - return this.field34; // L: 32 + boolean method76() { + return this.field39; // L: 24 } - @ObfuscatedName("c") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(ZZI)Lqq;", - garbageValue = "1901588068" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-128" ) - static IndexedSprite method73(boolean var0, boolean var1) { - return var0 ? (var1 ? ParamComposition.field1983 : class54.options_buttons_2Sprite) : (var1 ? class93.field1254 : WorldMapSection2.options_buttons_0Sprite); // L: 236 + public String method67() { + return this.field38; // L: 28 } - @ObfuscatedName("iy") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;Ljava/lang/String;III)V", - garbageValue = "1522440534" + descriptor = "(I)Z", + garbageValue = "-791619446" ) - @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: 8803 - var2 -= 2000; - } - - PacketBufferNode var8; - if (var2 == 1) { // L: 8804 - Client.mouseCrossX = var6; // L: 9123 - Client.mouseCrossY = var7; // L: 9124 - Client.mouseCrossColor = 2; // L: 9125 - Client.mouseCrossState = 0; // L: 9126 - Client.destinationX = var0; // L: 9127 - Client.destinationY = var1; // L: 9128 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2994, Client.packetWriter.isaacCipher); // L: 9130 - var8.packetBuffer.method7710(class432.selectedItemSlot); // L: 9131 - var8.packetBuffer.method7710(Varcs.selectedItemId); // L: 9132 - var8.packetBuffer.method7701(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9133 - var8.packetBuffer.writeShort(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 9134 - var8.packetBuffer.writeShort(var3); // L: 9135 - var8.packetBuffer.method7723(TaskHandler.selectedItemWidget); // L: 9136 - var8.packetBuffer.method7711(VarcInt.baseY + var1); // L: 9137 - Client.packetWriter.addNode(var8); // L: 9138 - } else if (var2 == 2) { - Client.mouseCrossX = var6; // L: 9053 - Client.mouseCrossY = var7; // L: 9054 - Client.mouseCrossColor = 2; // L: 9055 - Client.mouseCrossState = 0; // L: 9056 - Client.destinationX = var0; // L: 9057 - Client.destinationY = var1; // L: 9058 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2977, Client.packetWriter.isaacCipher); // L: 9059 - var8.packetBuffer.method7711(Client.selectedSpellItemId); // L: 9060 - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9061 - var8.packetBuffer.method7712(VarcInt.baseY + var1); // L: 9062 - var8.packetBuffer.method7711(Client.selectedSpellChildIndex); // L: 9063 - var8.packetBuffer.method7711(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 9064 - var8.packetBuffer.method7723(Timer.selectedSpellWidget); // L: 9065 - var8.packetBuffer.method7710(var3); // L: 9066 - Client.packetWriter.addNode(var8); // L: 9067 - } else if (var2 == 3) { - Client.mouseCrossX = var6; // L: 9573 - Client.mouseCrossY = var7; // L: 9574 - Client.mouseCrossColor = 2; // L: 9575 - Client.mouseCrossState = 0; // L: 9576 - Client.destinationX = var0; // L: 9577 - Client.destinationY = var1; // L: 9578 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2914, Client.packetWriter.isaacCipher); // L: 9580 - var8.packetBuffer.method7711(VarcInt.baseY + var1); // L: 9581 - var8.packetBuffer.method7710(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 9582 - var8.packetBuffer.writeShort(var3); // L: 9583 - var8.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9584 - Client.packetWriter.addNode(var8); // L: 9585 - } else if (var2 == 4) { - Client.mouseCrossX = var6; // L: 9189 - Client.mouseCrossY = var7; // L: 9190 - Client.mouseCrossColor = 2; // L: 9191 - Client.mouseCrossState = 0; // L: 9192 - Client.destinationX = var0; // L: 9193 - Client.destinationY = var1; // L: 9194 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2901, Client.packetWriter.isaacCipher); // L: 9196 - var8.packetBuffer.method7703(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9197 - var8.packetBuffer.writeShort(VarcInt.baseY + var1); // L: 9198 - var8.packetBuffer.method7712(var3); // L: 9199 - var8.packetBuffer.method7710(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 9200 - Client.packetWriter.addNode(var8); // L: 9201 - } else if (var2 == 5) { - Client.mouseCrossX = var6; // L: 8870 - Client.mouseCrossY = var7; // L: 8871 - Client.mouseCrossColor = 2; // L: 8872 - Client.mouseCrossState = 0; // L: 8873 - Client.destinationX = var0; // L: 8874 - Client.destinationY = var1; // L: 8875 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2927, Client.packetWriter.isaacCipher); // L: 8877 - var8.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8878 - var8.packetBuffer.method7711(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 8879 - var8.packetBuffer.writeShort(VarcInt.baseY + var1); // L: 8880 - var8.packetBuffer.method7711(var3); // L: 8881 - Client.packetWriter.addNode(var8); // L: 8882 - } else if (var2 == 6) { - Client.mouseCrossX = var6; // L: 8844 - Client.mouseCrossY = var7; // L: 8845 - Client.mouseCrossColor = 2; // L: 8846 - Client.mouseCrossState = 0; // L: 8847 - Client.destinationX = var0; // L: 8848 - Client.destinationY = var1; // L: 8849 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2895, Client.packetWriter.isaacCipher); // L: 8851 - var8.packetBuffer.method7701(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8852 - var8.packetBuffer.method7712(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 8853 - var8.packetBuffer.method7711(var3); // L: 8854 - var8.packetBuffer.method7711(VarcInt.baseY + var1); // L: 8855 - Client.packetWriter.addNode(var8); // L: 8856 - } else { - PacketBufferNode var9; - NPC var13; - if (var2 == 7) { - var13 = Client.npcs[var3]; // L: 9034 - if (var13 != null) { // L: 9035 - Client.mouseCrossX = var6; // L: 9036 - Client.mouseCrossY = var7; // L: 9037 - Client.mouseCrossColor = 2; // L: 9038 - Client.mouseCrossState = 0; // L: 9039 - Client.destinationX = var0; // L: 9040 - Client.destinationY = var1; // L: 9041 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2995, Client.packetWriter.isaacCipher); // L: 9043 - var9.packetBuffer.method7710(var3); // L: 9044 - var9.packetBuffer.writeIntME(TaskHandler.selectedItemWidget); // L: 9045 - var9.packetBuffer.method7712(Varcs.selectedItemId); // L: 9046 - var9.packetBuffer.method7703(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9047 - var9.packetBuffer.method7711(class432.selectedItemSlot); // L: 9048 - Client.packetWriter.addNode(var9); // L: 9049 - } - } else if (var2 == 8) { - var13 = Client.npcs[var3]; // L: 9165 - if (var13 != null) { // L: 9166 - Client.mouseCrossX = var6; // L: 9167 - Client.mouseCrossY = var7; // L: 9168 - Client.mouseCrossColor = 2; // L: 9169 - Client.mouseCrossState = 0; // L: 9170 - Client.destinationX = var0; // L: 9171 - Client.destinationY = var1; // L: 9172 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2930, Client.packetWriter.isaacCipher); // L: 9173 - var9.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9174 - var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 9175 - var9.packetBuffer.method7710(var3); // L: 9176 - var9.packetBuffer.method7721(Timer.selectedSpellWidget); // L: 9177 - var9.packetBuffer.method7711(Client.selectedSpellItemId); // L: 9178 - Client.packetWriter.addNode(var9); // L: 9179 - } - } else if (var2 == 9) { - var13 = Client.npcs[var3]; // L: 9332 - if (var13 != null) { // L: 9333 - Client.mouseCrossX = var6; // L: 9334 - Client.mouseCrossY = var7; // L: 9335 - Client.mouseCrossColor = 2; // L: 9336 - Client.mouseCrossState = 0; // L: 9337 - Client.destinationX = var0; // L: 9338 - Client.destinationY = var1; // L: 9339 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2981, Client.packetWriter.isaacCipher); // L: 9341 - var9.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9342 - var9.packetBuffer.method7710(var3); // L: 9343 - Client.packetWriter.addNode(var9); // L: 9344 - } - } else if (var2 == 10) { - var13 = Client.npcs[var3]; // L: 8950 - if (var13 != null) { // L: 8951 - Client.mouseCrossX = var6; // L: 8952 - Client.mouseCrossY = var7; // L: 8953 - Client.mouseCrossColor = 2; // L: 8954 - Client.mouseCrossState = 0; // L: 8955 - Client.destinationX = var0; // L: 8956 - Client.destinationY = var1; // L: 8957 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2925, Client.packetWriter.isaacCipher); // L: 8959 - var9.packetBuffer.writeShort(var3); // L: 8960 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8961 - Client.packetWriter.addNode(var9); // L: 8962 - } - } else if (var2 == 11) { - var13 = Client.npcs[var3]; // L: 9070 - if (var13 != null) { // L: 9071 - Client.mouseCrossX = var6; // L: 9072 - Client.mouseCrossY = var7; // L: 9073 - Client.mouseCrossColor = 2; // L: 9074 - Client.mouseCrossState = 0; // L: 9075 - Client.destinationX = var0; // L: 9076 - Client.destinationY = var1; // L: 9077 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2902, Client.packetWriter.isaacCipher); // L: 9079 - var9.packetBuffer.method7710(var3); // L: 9080 - var9.packetBuffer.method7701(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9081 - Client.packetWriter.addNode(var9); // L: 9082 - } - } else if (var2 == 12) { - var13 = Client.npcs[var3]; // L: 8991 - if (var13 != null) { // L: 8992 - Client.mouseCrossX = var6; // L: 8993 - Client.mouseCrossY = var7; // L: 8994 - Client.mouseCrossColor = 2; // L: 8995 - Client.mouseCrossState = 0; // L: 8996 - Client.destinationX = var0; // L: 8997 - Client.destinationY = var1; // L: 8998 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2940, Client.packetWriter.isaacCipher); // L: 9000 - var9.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9001 - var9.packetBuffer.method7710(var3); // L: 9002 - Client.packetWriter.addNode(var9); // L: 9003 - } - } else if (var2 == 13) { - var13 = Client.npcs[var3]; // L: 9494 - if (var13 != null) { // L: 9495 - Client.mouseCrossX = var6; // L: 9496 - Client.mouseCrossY = var7; // L: 9497 - Client.mouseCrossColor = 2; // L: 9498 - Client.mouseCrossState = 0; // L: 9499 - Client.destinationX = var0; // L: 9500 - Client.destinationY = var1; // L: 9501 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2924, Client.packetWriter.isaacCipher); // L: 9503 - var9.packetBuffer.method7710(var3); // L: 9504 - var9.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9505 - Client.packetWriter.addNode(var9); // L: 9506 - } - } else { - Player var15; - if (var2 == 14) { - var15 = Client.players[var3]; // L: 9442 - if (var15 != null) { // L: 9443 - Client.mouseCrossX = var6; // L: 9444 - Client.mouseCrossY = var7; // L: 9445 - Client.mouseCrossColor = 2; // L: 9446 - Client.mouseCrossState = 0; // L: 9447 - Client.destinationX = var0; // L: 9448 - Client.destinationY = var1; // L: 9449 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2956, Client.packetWriter.isaacCipher); // L: 9451 - var9.packetBuffer.method7712(Varcs.selectedItemId); // L: 9452 - var9.packetBuffer.writeShort(var3); // L: 9453 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9454 - var9.packetBuffer.method7711(class432.selectedItemSlot); // L: 9455 - var9.packetBuffer.writeIntME(TaskHandler.selectedItemWidget); // L: 9456 - Client.packetWriter.addNode(var9); // L: 9457 - } - } else if (var2 == 15) { - var15 = Client.players[var3]; // L: 9541 - if (var15 != null) { // L: 9542 - Client.mouseCrossX = var6; // L: 9543 - Client.mouseCrossY = var7; // L: 9544 - Client.mouseCrossColor = 2; // L: 9545 - Client.mouseCrossState = 0; // L: 9546 - Client.destinationX = var0; // L: 9547 - Client.destinationY = var1; // L: 9548 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2999, Client.packetWriter.isaacCipher); // L: 9549 - var9.packetBuffer.method7710(Client.selectedSpellChildIndex); // L: 9550 - var9.packetBuffer.method7711(var3); // L: 9551 - var9.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9552 - var9.packetBuffer.writeInt(Timer.selectedSpellWidget); // L: 9553 - var9.packetBuffer.writeShort(Client.selectedSpellItemId); // L: 9554 - Client.packetWriter.addNode(var9); // L: 9555 - } - } else if (var2 == 16) { - Client.mouseCrossX = var6; // L: 8805 - Client.mouseCrossY = var7; // L: 8806 - Client.mouseCrossColor = 2; // L: 8807 - Client.mouseCrossState = 0; // L: 8808 - Client.destinationX = var0; // L: 8809 - Client.destinationY = var1; // L: 8810 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2955, Client.packetWriter.isaacCipher); // L: 8812 - var8.packetBuffer.method7703(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8813 - var8.packetBuffer.method7711(class432.selectedItemSlot); // L: 8814 - var8.packetBuffer.method7711(var3); // L: 8815 - var8.packetBuffer.method7711(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 8816 - var8.packetBuffer.method7712(VarcInt.baseY + var1); // L: 8817 - var8.packetBuffer.writeIntME(TaskHandler.selectedItemWidget); // L: 8818 - var8.packetBuffer.writeShort(Varcs.selectedItemId); // L: 8819 - Client.packetWriter.addNode(var8); // L: 8820 - } else if (var2 == 17) { - Client.mouseCrossX = var6; // L: 8885 - Client.mouseCrossY = var7; // L: 8886 - Client.mouseCrossColor = 2; // L: 8887 - Client.mouseCrossState = 0; // L: 8888 - Client.destinationX = var0; // L: 8889 - Client.destinationY = var1; // L: 8890 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2904, Client.packetWriter.isaacCipher); // L: 8891 - var8.packetBuffer.writeShort(Client.selectedSpellItemId); // L: 8892 - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8893 - var8.packetBuffer.method7710(var3); // L: 8894 - var8.packetBuffer.writeInt(Timer.selectedSpellWidget); // L: 8895 - var8.packetBuffer.writeShort(VarcInt.baseY + var1); // L: 8896 - var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8897 - var8.packetBuffer.method7711(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 8898 - Client.packetWriter.addNode(var8); // L: 8899 - } else if (var2 == 18) { - Client.mouseCrossX = var6; // L: 9348 - Client.mouseCrossY = var7; // L: 9349 - Client.mouseCrossColor = 2; // L: 9350 - Client.mouseCrossState = 0; // L: 9351 - Client.destinationX = var0; // L: 9352 - Client.destinationY = var1; // L: 9353 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2933, Client.packetWriter.isaacCipher); // L: 9355 - var8.packetBuffer.method7703(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9356 - var8.packetBuffer.method7712(var3); // L: 9357 - var8.packetBuffer.writeShort(VarcInt.baseY + var1); // L: 9358 - var8.packetBuffer.method7710(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 9359 - Client.packetWriter.addNode(var8); // L: 9360 - } else if (var2 == 19) { - Client.mouseCrossX = var6; // L: 9379 - Client.mouseCrossY = var7; // L: 9380 - Client.mouseCrossColor = 2; // L: 9381 - Client.mouseCrossState = 0; // L: 9382 - Client.destinationX = var0; // L: 9383 - Client.destinationY = var1; // L: 9384 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2915, Client.packetWriter.isaacCipher); // L: 9386 - var8.packetBuffer.writeShort(VarcInt.baseY + var1); // L: 9387 - var8.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9388 - var8.packetBuffer.writeShort(var3); // L: 9389 - var8.packetBuffer.method7710(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 9390 - Client.packetWriter.addNode(var8); // L: 9391 - } else if (var2 == 20) { - Client.mouseCrossX = var6; // L: 8919 - Client.mouseCrossY = var7; // L: 8920 - Client.mouseCrossColor = 2; // L: 8921 - Client.mouseCrossState = 0; // L: 8922 - Client.destinationX = var0; // L: 8923 - Client.destinationY = var1; // L: 8924 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2951, Client.packetWriter.isaacCipher); // L: 8926 - var8.packetBuffer.method7710(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 8927 - var8.packetBuffer.writeShort(var3); // L: 8928 - var8.packetBuffer.method7701(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8929 - var8.packetBuffer.method7711(VarcInt.baseY + var1); // L: 8930 - Client.packetWriter.addNode(var8); // L: 8931 - } else if (var2 == 21) { - Client.mouseCrossX = var6; // L: 9526 - Client.mouseCrossY = var7; // L: 9527 - Client.mouseCrossColor = 2; // L: 9528 - Client.mouseCrossState = 0; // L: 9529 - Client.destinationX = var0; // L: 9530 - Client.destinationY = var1; // L: 9531 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2942, Client.packetWriter.isaacCipher); // L: 9533 - var8.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9534 - var8.packetBuffer.writeShort(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 9535 - var8.packetBuffer.method7712(VarcInt.baseY + var1); // L: 9536 - var8.packetBuffer.method7712(var3); // L: 9537 - Client.packetWriter.addNode(var8); // L: 9538 - } else if (var2 == 22) { - Client.mouseCrossX = var6; // L: 9229 - Client.mouseCrossY = var7; // L: 9230 - Client.mouseCrossColor = 2; // L: 9231 - Client.mouseCrossState = 0; // L: 9232 - Client.destinationX = var0; // L: 9233 - Client.destinationY = var1; // L: 9234 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2920, Client.packetWriter.isaacCipher); // L: 9236 - var8.packetBuffer.method7701(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9237 - var8.packetBuffer.method7712(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 9238 - var8.packetBuffer.method7710(VarcInt.baseY + var1); // L: 9239 - var8.packetBuffer.writeShort(var3); // L: 9240 - Client.packetWriter.addNode(var8); // L: 9241 - } else if (var2 == 23) { - if (Client.isMenuOpen) { // L: 8823 - ArchiveLoader.scene.setViewportWalking(); // L: 8824 - } else { - ArchiveLoader.scene.menuOpen(class18.Client_plane, var0, var1, true); // L: 8827 - } - } else { - PacketBufferNode var10; - Widget var16; - if (var2 == 24) { - var16 = class127.getWidget(var1); // L: 8966 - if (var16 != null) { // L: 8967 - boolean var11 = true; // L: 8968 - if (var16.contentType > 0) { // L: 8969 - var11 = ModeWhere.method6100(var16); - } - - if (var11) { // L: 8970 - var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2897, Client.packetWriter.isaacCipher); // L: 8972 - var10.packetBuffer.writeInt(var1); // L: 8973 - Client.packetWriter.addNode(var10); // L: 8974 - } - } - } else { - if (var2 == 25) { - var16 = ItemComposition.getWidgetChild(var1, var0); // L: 8831 - if (var16 != null) { // L: 8832 - FriendSystem.Widget_runOnTargetLeave(); // L: 8833 - Renderable.selectSpell(var1, var0, WorldMapID.Widget_unpackTargetMask(class326.getWidgetFlags(var16)), var16.itemId); // L: 8834 - Client.isItemSelected = 0; // L: 8835 - Client.selectedSpellActionName = class152.Widget_getSpellActionName(var16); // L: 8836 - if (Client.selectedSpellActionName == null) { // L: 8837 - Client.selectedSpellActionName = "null"; - } - - if (var16.isIf3) { // L: 8838 - Client.selectedSpellName = var16.dataText + UserComparator9.colorStartTag(16777215); - } else { - Client.selectedSpellName = UserComparator9.colorStartTag(65280) + var16.spellName + UserComparator9.colorStartTag(16777215); // L: 8839 - } - } - - return; // L: 8841 - } - - if (var2 == 26) { - class20.method294(); // L: 9020 - } else { - int var12; - Widget var14; - if (var2 == 28) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2897, Client.packetWriter.isaacCipher); // L: 9205 - var8.packetBuffer.writeInt(var1); // L: 9206 - Client.packetWriter.addNode(var8); // L: 9207 - var14 = class127.getWidget(var1); // L: 9208 - if (var14 != null && var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 9209 - var12 = var14.cs1Instructions[0][1]; // L: 9210 - Varps.Varps_main[var12] = 1 - Varps.Varps_main[var12]; // L: 9211 - WorldMapLabel.changeGameOptions(var12); // L: 9212 - } - } else if (var2 == 29) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2897, Client.packetWriter.isaacCipher); // L: 9560 - var8.packetBuffer.writeInt(var1); // L: 9561 - Client.packetWriter.addNode(var8); // L: 9562 - var14 = class127.getWidget(var1); // L: 9563 - if (var14 != null && var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 9564 - var12 = var14.cs1Instructions[0][1]; // L: 9565 - if (Varps.Varps_main[var12] != var14.cs1ComparisonValues[0]) { // L: 9566 - Varps.Varps_main[var12] = var14.cs1ComparisonValues[0]; // L: 9567 - WorldMapLabel.changeGameOptions(var12); // L: 9568 - } - } - } else if (var2 == 30) { - if (Client.meslayerContinueWidget == null) { // L: 9394 - class268.resumePauseWidget(var1, var0); // L: 9395 - Client.meslayerContinueWidget = ItemComposition.getWidgetChild(var1, var0); // L: 9396 - class346.invalidateWidget(Client.meslayerContinueWidget); // L: 9397 - } - } else if (var2 == 31) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2971, Client.packetWriter.isaacCipher); // L: 9319 - var8.packetBuffer.writeIntME(TaskHandler.selectedItemWidget); // L: 9320 - var8.packetBuffer.method7710(class432.selectedItemSlot); // L: 9321 - var8.packetBuffer.method7721(var1); // L: 9322 - var8.packetBuffer.writeShort(var3); // L: 9323 - var8.packetBuffer.writeShort(var0); // L: 9324 - var8.packetBuffer.method7710(Varcs.selectedItemId); // L: 9325 - Client.packetWriter.addNode(var8); // L: 9326 - Client.field610 = 0; // L: 9327 - GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9328 - Client.field611 = var0; // L: 9329 - } else if (var2 == 32) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2959, Client.packetWriter.isaacCipher); // L: 9153 - var8.packetBuffer.method7711(var3); // L: 9154 - var8.packetBuffer.writeIntME(Timer.selectedSpellWidget); // L: 9155 - var8.packetBuffer.method7711(var0); // L: 9156 - var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 9157 - var8.packetBuffer.writeInt(var1); // L: 9158 - Client.packetWriter.addNode(var8); // L: 9159 - Client.field610 = 0; // L: 9160 - GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9161 - Client.field611 = var0; // L: 9162 - } else if (var2 == 33) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2985, Client.packetWriter.isaacCipher); // L: 9260 - var8.packetBuffer.writeShort(var3); // L: 9261 - var8.packetBuffer.writeShort(var0); // L: 9262 - var8.packetBuffer.method7721(var1); // L: 9263 - Client.packetWriter.addNode(var8); // L: 9264 - Client.field610 = 0; // L: 9265 - GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9266 - Client.field611 = var0; // L: 9267 - } else if (var2 == 34) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2969, Client.packetWriter.isaacCipher); // L: 9589 - var8.packetBuffer.method7721(var1); // L: 9590 - var8.packetBuffer.writeShort(var0); // L: 9591 - var8.packetBuffer.writeShort(var3); // L: 9592 - Client.packetWriter.addNode(var8); // L: 9593 - Client.field610 = 0; // L: 9594 - GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9595 - Client.field611 = var0; // L: 9596 - } else if (var2 == 35) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2997, Client.packetWriter.isaacCipher); // L: 9462 - var8.packetBuffer.writeShort(var3); // L: 9463 - var8.packetBuffer.writeShort(var0); // L: 9464 - var8.packetBuffer.method7721(var1); // L: 9465 - Client.packetWriter.addNode(var8); // L: 9466 - Client.field610 = 0; // L: 9467 - GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9468 - Client.field611 = var0; // L: 9469 - } else if (var2 == 36) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2954, Client.packetWriter.isaacCipher); // L: 9113 - var8.packetBuffer.method7710(var3); // L: 9114 - var8.packetBuffer.method7721(var1); // L: 9115 - var8.packetBuffer.method7712(var0); // L: 9116 - Client.packetWriter.addNode(var8); // L: 9117 - Client.field610 = 0; // L: 9118 - GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9119 - Client.field611 = var0; // L: 9120 - } else if (var2 == 37) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2998, Client.packetWriter.isaacCipher); // L: 8860 - var8.packetBuffer.writeIntME(var1); // L: 8861 - var8.packetBuffer.writeShort(var3); // L: 8862 - var8.packetBuffer.method7712(var0); // L: 8863 - Client.packetWriter.addNode(var8); // L: 8864 - Client.field610 = 0; // L: 8865 - GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 8866 - Client.field611 = var0; // L: 8867 - } else { - if (var2 == 38) { - FriendSystem.Widget_runOnTargetLeave(); // L: 8979 - var16 = class127.getWidget(var1); // L: 8980 - Client.isItemSelected = 1; // L: 8981 - class432.selectedItemSlot = var0; // L: 8982 - TaskHandler.selectedItemWidget = var1; // L: 8983 - Varcs.selectedItemId = var3; // L: 8984 - class346.invalidateWidget(var16); // L: 8985 - Client.selectedItemName = UserComparator9.colorStartTag(16748608) + class19.ItemDefinition_get(var3).name + UserComparator9.colorStartTag(16777215); // L: 8986 - if (Client.selectedItemName == null) { // L: 8987 - Client.selectedItemName = "null"; - } - - return; // L: 8988 - } - - if (var2 == 39) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2922, Client.packetWriter.isaacCipher); // L: 9024 - var8.packetBuffer.writeInt(var1); // L: 9025 - var8.packetBuffer.method7711(var0); // L: 9026 - var8.packetBuffer.method7710(var3); // L: 9027 - Client.packetWriter.addNode(var8); // L: 9028 - Client.field610 = 0; // L: 9029 - GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9030 - Client.field611 = var0; // L: 9031 - } else if (var2 == 40) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2958, Client.packetWriter.isaacCipher); // L: 9142 - var8.packetBuffer.writeIntME(var1); // L: 9143 - var8.packetBuffer.writeShort(var0); // L: 9144 - var8.packetBuffer.method7711(var3); // L: 9145 - Client.packetWriter.addNode(var8); // L: 9146 - Client.field610 = 0; // L: 9147 - GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9148 - Client.field611 = var0; // L: 9149 - } else if (var2 == 41) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2921, Client.packetWriter.isaacCipher); // L: 9432 - var8.packetBuffer.method7711(var3); // L: 9433 - var8.packetBuffer.method7721(var1); // L: 9434 - var8.packetBuffer.method7712(var0); // L: 9435 - Client.packetWriter.addNode(var8); // L: 9436 - Client.field610 = 0; // L: 9437 - GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9438 - Client.field611 = var0; // L: 9439 - } else if (var2 == 42) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2896, Client.packetWriter.isaacCipher); // L: 9484 - var8.packetBuffer.method7712(var0); // L: 9485 - var8.packetBuffer.writeInt(var1); // L: 9486 - var8.packetBuffer.method7710(var3); // L: 9487 - Client.packetWriter.addNode(var8); // L: 9488 - Client.field610 = 0; // L: 9489 - GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9490 - Client.field611 = var0; // L: 9491 - } else if (var2 == 43) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2938, Client.packetWriter.isaacCipher); // L: 9473 - var8.packetBuffer.method7712(var0); // L: 9474 - var8.packetBuffer.method7712(var3); // L: 9475 - var8.packetBuffer.writeInt(var1); // L: 9476 - Client.packetWriter.addNode(var8); // L: 9477 - Client.field610 = 0; // L: 9478 - GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9479 - Client.field611 = var0; // L: 9480 - } else if (var2 == 44) { - var15 = Client.players[var3]; // L: 9286 - if (var15 != null) { // L: 9287 - Client.mouseCrossX = var6; // L: 9288 - Client.mouseCrossY = var7; // L: 9289 - Client.mouseCrossColor = 2; // L: 9290 - Client.mouseCrossState = 0; // L: 9291 - Client.destinationX = var0; // L: 9292 - Client.destinationY = var1; // L: 9293 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2913, Client.packetWriter.isaacCipher); // L: 9295 - var9.packetBuffer.method7710(var3); // L: 9296 - var9.packetBuffer.method7701(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9297 - Client.packetWriter.addNode(var9); // L: 9298 - } - } else if (var2 == 45) { - var15 = Client.players[var3]; // L: 8934 - if (var15 != null) { // L: 8935 - Client.mouseCrossX = var6; // L: 8936 - Client.mouseCrossY = var7; // L: 8937 - Client.mouseCrossColor = 2; // L: 8938 - Client.mouseCrossState = 0; // L: 8939 - Client.destinationX = var0; // L: 8940 - Client.destinationY = var1; // L: 8941 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2957, Client.packetWriter.isaacCipher); // L: 8943 - var9.packetBuffer.method7710(var3); // L: 8944 - var9.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8945 - Client.packetWriter.addNode(var9); // L: 8946 - } - } else if (var2 == 46) { - var15 = Client.players[var3]; // L: 9086 - if (var15 != null) { // L: 9087 - Client.mouseCrossX = var6; // L: 9088 - Client.mouseCrossY = var7; // L: 9089 - Client.mouseCrossColor = 2; // L: 9090 - Client.mouseCrossState = 0; // L: 9091 - Client.destinationX = var0; // L: 9092 - Client.destinationY = var1; // L: 9093 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2964, Client.packetWriter.isaacCipher); // L: 9095 - var9.packetBuffer.method7701(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9096 - var9.packetBuffer.method7711(var3); // L: 9097 - Client.packetWriter.addNode(var9); // L: 9098 - } - } else if (var2 == 47) { - var15 = Client.players[var3]; // L: 9510 - if (var15 != null) { // L: 9511 - Client.mouseCrossX = var6; // L: 9512 - Client.mouseCrossY = var7; // L: 9513 - Client.mouseCrossColor = 2; // L: 9514 - Client.mouseCrossState = 0; // L: 9515 - Client.destinationX = var0; // L: 9516 - Client.destinationY = var1; // L: 9517 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2939, Client.packetWriter.isaacCipher); // L: 9519 - var9.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9520 - var9.packetBuffer.writeShort(var3); // L: 9521 - Client.packetWriter.addNode(var9); // L: 9522 - } - } else if (var2 == 48) { - var15 = Client.players[var3]; // L: 9415 - if (var15 != null) { // L: 9416 - Client.mouseCrossX = var6; // L: 9417 - Client.mouseCrossY = var7; // L: 9418 - Client.mouseCrossColor = 2; // L: 9419 - Client.mouseCrossState = 0; // L: 9420 - Client.destinationX = var0; // L: 9421 - Client.destinationY = var1; // L: 9422 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2972, Client.packetWriter.isaacCipher); // L: 9424 - var9.packetBuffer.writeShort(var3); // L: 9425 - var9.packetBuffer.method7701(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9426 - Client.packetWriter.addNode(var9); // L: 9427 - } - } else if (var2 == 49) { - var15 = Client.players[var3]; // L: 9270 - if (var15 != null) { // L: 9271 - Client.mouseCrossX = var6; // L: 9272 - Client.mouseCrossY = var7; // L: 9273 - Client.mouseCrossColor = 2; // L: 9274 - Client.mouseCrossState = 0; // L: 9275 - Client.destinationX = var0; // L: 9276 - Client.destinationY = var1; // L: 9277 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2931, Client.packetWriter.isaacCipher); // L: 9279 - var9.packetBuffer.method7712(var3); // L: 9280 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9281 - Client.packetWriter.addNode(var9); // L: 9282 - } - } else if (var2 == 50) { - var15 = Client.players[var3]; // L: 9363 - if (var15 != null) { // L: 9364 - Client.mouseCrossX = var6; // L: 9365 - Client.mouseCrossY = var7; // L: 9366 - Client.mouseCrossColor = 2; // L: 9367 - Client.mouseCrossState = 0; // L: 9368 - Client.destinationX = var0; // L: 9369 - Client.destinationY = var1; // L: 9370 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2923, Client.packetWriter.isaacCipher); // L: 9372 - var9.packetBuffer.writeShort(var3); // L: 9373 - var9.packetBuffer.method7701(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9374 - Client.packetWriter.addNode(var9); // L: 9375 - } - } else if (var2 == 51) { - var15 = Client.players[var3]; // L: 9302 - if (var15 != null) { // L: 9303 - Client.mouseCrossX = var6; // L: 9304 - Client.mouseCrossY = var7; // L: 9305 - Client.mouseCrossColor = 2; // L: 9306 - Client.mouseCrossState = 0; // L: 9307 - Client.destinationX = var0; // L: 9308 - Client.destinationY = var1; // L: 9309 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2974, Client.packetWriter.isaacCipher); // L: 9311 - var9.packetBuffer.method7712(var3); // L: 9312 - var9.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9313 - Client.packetWriter.addNode(var9); // L: 9314 - } - } else if (var2 != 1007 && var2 != 57) { - if (var2 == 58) { - var16 = ItemComposition.getWidgetChild(var1, var0); // L: 9401 - if (var16 != null) { // L: 9402 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2894, Client.packetWriter.isaacCipher); // L: 9404 - var9.packetBuffer.writeShort(Client.selectedSpellItemId); // L: 9405 - var9.packetBuffer.writeIntME(Timer.selectedSpellWidget); // L: 9406 - var9.packetBuffer.method7711(var16.itemId); // L: 9407 - var9.packetBuffer.method7712(Client.selectedSpellChildIndex); // L: 9408 - var9.packetBuffer.writeInt(var1); // L: 9409 - var9.packetBuffer.method7711(var0); // L: 9410 - Client.packetWriter.addNode(var9); // L: 9411 - } - } else if (var2 == 1001) { - Client.mouseCrossX = var6; // L: 9244 - Client.mouseCrossY = var7; // L: 9245 - Client.mouseCrossColor = 2; // L: 9246 - Client.mouseCrossState = 0; // L: 9247 - Client.destinationX = var0; // L: 9248 - Client.destinationY = var1; // L: 9249 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2993, Client.packetWriter.isaacCipher); // L: 9251 - var8.packetBuffer.method7710(var3); // L: 9252 - var8.packetBuffer.method7711(var0 + GrandExchangeOfferOwnWorldComparator.baseX); // L: 9253 - var8.packetBuffer.method7804(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9254 - var8.packetBuffer.writeShort(VarcInt.baseY + var1); // L: 9255 - Client.packetWriter.addNode(var8); // L: 9256 - } else if (var2 == 1002) { - Client.mouseCrossX = var6; // L: 9102 - Client.mouseCrossY = var7; // L: 9103 - Client.mouseCrossColor = 2; // L: 9104 - Client.mouseCrossState = 0; // L: 9105 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2949, Client.packetWriter.isaacCipher); // L: 9107 - var8.packetBuffer.method7712(var3); // L: 9108 - Client.packetWriter.addNode(var8); // L: 9109 - } else if (var2 == 1003) { - Client.mouseCrossX = var6; // L: 8902 - Client.mouseCrossY = var7; // L: 8903 - Client.mouseCrossColor = 2; // L: 8904 - Client.mouseCrossState = 0; // L: 8905 - var13 = Client.npcs[var3]; // L: 8906 - if (var13 != null) { // L: 8907 - NPCComposition var17 = var13.definition; // L: 8908 - if (var17.transforms != null) { // L: 8909 - var17 = var17.transform(); - } - - if (var17 != null) { // L: 8910 - var10 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2936, Client.packetWriter.isaacCipher); // L: 8912 - var10.packetBuffer.method7710(var17.id); // L: 8913 - Client.packetWriter.addNode(var10); // L: 8914 - } - } - } else if (var2 == 1004) { - Client.mouseCrossX = var6; // L: 9219 - Client.mouseCrossY = var7; // L: 9220 - Client.mouseCrossColor = 2; // L: 9221 - Client.mouseCrossState = 0; // L: 9222 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2988, Client.packetWriter.isaacCipher); // L: 9224 - var8.packetBuffer.method7711(var3); // L: 9225 - Client.packetWriter.addNode(var8); // L: 9226 - } else if (var2 == 1005) { - var16 = class127.getWidget(var1); // L: 9007 - if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 9008 - Actor.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + class19.ItemDefinition_get(var3).name); - } else { - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2988, Client.packetWriter.isaacCipher); // L: 9011 - var9.packetBuffer.method7711(var3); // L: 9012 - Client.packetWriter.addNode(var9); // L: 9013 - } - - Client.field610 = 0; // L: 9015 - GrandExchangeOfferAgeComparator.field4011 = class127.getWidget(var1); // L: 9016 - Client.field611 = var0; // L: 9017 - } else if (var2 == 1011 || var2 == 1010 || var2 == 1009 || var2 == 1008 || var2 == 1012) { - ScriptFrame.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 9216 - } - } else { - var16 = ItemComposition.getWidgetChild(var1, var0); // L: 9183 - if (var16 != null) { // L: 9184 - WorldMapLabelSize.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 9185 - } - } - } - } - } - } - } - } - - if (Client.isItemSelected != 0) { // L: 9598 - Client.isItemSelected = 0; // L: 9599 - class346.invalidateWidget(class127.getWidget(TaskHandler.selectedItemWidget)); // L: 9600 - } - - if (Client.isSpellSelected) { // L: 9602 - FriendSystem.Widget_runOnTargetLeave(); - } - - if (GrandExchangeOfferAgeComparator.field4011 != null && Client.field610 == 0) { // L: 9603 - class346.invalidateWidget(GrandExchangeOfferAgeComparator.field4011); - } - - } // L: 9604 - - @ObfuscatedName("jd") - @ObfuscatedSignature( - descriptor = "(IIIIIIB)V", - garbageValue = "-53" - ) - static final void method74(int var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var2 - var0; // L: 10698 - int var7 = var3 - var1; // L: 10699 - int var8 = var6 >= 0 ? var6 : -var6; // L: 10700 - int var9 = var7 >= 0 ? var7 : -var7; // L: 10701 - int var10 = var8; // L: 10702 - if (var8 < var9) { // L: 10703 - var10 = var9; - } - - if (var10 != 0) { // L: 10704 - int var11 = (var6 << 16) / var10; // L: 10705 - int var12 = (var7 << 16) / var10; // L: 10706 - if (var12 <= var11) { // L: 10707 - var11 = -var11; - } else { - var12 = -var12; // L: 10708 - } - - int var13 = var5 * var12 >> 17; // L: 10709 - int var14 = var5 * var12 + 1 >> 17; // L: 10710 - int var15 = var5 * var11 >> 17; // L: 10711 - int var16 = var5 * var11 + 1 >> 17; // L: 10712 - var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 10713 - var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 10714 - int var17 = var0 + var13; // L: 10715 - int var18 = var0 - var14; // L: 10716 - int var19 = var0 + var6 - var14; // L: 10717 - int var20 = var0 + var13 + var6; // L: 10718 - int var21 = var15 + var1; // L: 10719 - int var22 = var1 - var16; // L: 10720 - int var23 = var7 + var1 - var16; // L: 10721 - int var24 = var7 + var15 + var1; // L: 10722 - Rasterizer3D.method4673(var17, var18, var19); // L: 10723 - Rasterizer3D.method4617(var21, var22, var23, var17, var18, var19, var4); // L: 10724 - Rasterizer3D.method4673(var17, var19, var20); // L: 10725 - Rasterizer3D.method4617(var21, var23, var24, var17, var19, var20, var4); // L: 10726 - } - } // L: 10727 + boolean method68() { + return this.field35; // L: 32 + } } diff --git a/runescape-client/src/main/java/class92.java b/runescape-client/src/main/java/class92.java index 78f0e7a6e3..c539950e9c 100644 --- a/runescape-client/src/main/java/class92.java +++ b/runescape-client/src/main/java/class92.java @@ -1,31 +1,148 @@ +import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import netscape.javascript.JSObject; -@ObfuscatedName("cr") +@ObfuscatedName("cw") public class class92 { - @ObfuscatedName("p") + @ObfuscatedName("by") + @Export("otp") + static String otp; + @ObfuscatedName("cb") + static boolean field1273; + @ObfuscatedName("ei") @ObfuscatedSignature( - descriptor = "[Lqq;" + descriptor = "Lle;" ) - @Export("title_muteSprite") - static IndexedSprite[] title_muteSprite; + @Export("archive18") + static Archive archive18; - @ObfuscatedName("gw") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "367687944" + descriptor = "(IB)Lki;", + garbageValue = "-94" ) - static final void method2362() { - int var0 = Players.Players_count; // L: 3908 - int[] var1 = Players.Players_indices; // L: 3909 - - for (int var2 = 0; var2 < var0; ++var2) { // L: 3910 - Player var3 = Client.players[var1[var2]]; // L: 3911 - if (var3 != null) { // L: 3912 - class149.updateActorSequence(var3, 1); // L: 3913 + @Export("getWidget") + public static Widget getWidget(int var0) { + int var1 = var0 >> 16; // L: 229 + int var2 = var0 & 65535; // L: 230 + if (NetSocket.Widget_interfaceComponents[var1] == null || NetSocket.Widget_interfaceComponents[var1][var2] == null) { // L: 231 + boolean var3 = WorldMapDecoration.loadInterface(var1); // L: 232 + if (!var3) { // L: 233 + return null; } } - } // L: 3916 + return NetSocket.Widget_interfaceComponents[var1][var2]; // L: 235 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1946484556" + ) + public static void method2372(int var0, int var1) { + VarbitComposition var2 = class1.method9(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 = "(Ljava/lang/CharSequence;I)I", + garbageValue = "379207215" + ) + public static int method2373(CharSequence var0) { + return class202.method4016(var0, 10, true); + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1906975961" + ) + @Export("Messages_getHistorySize") + 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("m") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "-127" + ) + public static int method2376(int var0, int var1, int var2) { + int var3 = class147.method3000(var2 - var1 + 1); // L: 68 + var3 <<= var1; // L: 69 + var0 |= var3; // L: 70 + return var0; // L: 71 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1780450470" + ) + public static void method2370() { + ItemComposition.ItemDefinition_cached.clear(); // L: 541 + ItemComposition.ItemDefinition_cachedModels.clear(); // L: 542 + ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 543 + } // L: 544 + + @ObfuscatedName("fb") + @ObfuscatedSignature( + descriptor = "(I)J", + garbageValue = "-1003322759" + ) + static long method2374() { + return Client.field611; // L: 3049 + } + + @ObfuscatedName("lg") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-34" + ) + static void method2377(String var0) { + Client.field662 = var0; // L: 12542 + + try { + String var1 = class82.client.getParameter(Integer.toString(18)); // L: 12544 + String var2 = class82.client.getParameter(Integer.toString(13)); // L: 12545 + String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 12546 + String var5; + if (var0.length() == 0) { // L: 12547 + var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; + } else { + String var4 = var3 + "; Expires="; // L: 12549 + long var6 = class113.method2624() + 94608000000L; // L: 12551 + Calendar.Calendar_calendar.setTime(new Date(var6)); // L: 12553 + int var8 = Calendar.Calendar_calendar.get(7); // L: 12554 + int var9 = Calendar.Calendar_calendar.get(5); // L: 12555 + int var10 = Calendar.Calendar_calendar.get(2); // L: 12556 + int var11 = Calendar.Calendar_calendar.get(1); // L: 12557 + int var12 = Calendar.Calendar_calendar.get(11); // L: 12558 + int var13 = Calendar.Calendar_calendar.get(12); // L: 12559 + int var14 = Calendar.Calendar_calendar.get(13); // L: 12560 + 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: 12561 + var3 = var4 + var5 + "; Max-Age=" + 94608000L; // L: 12563 + } + + Client var16 = class82.client; // L: 12565 + var5 = "document.cookie=\"" + var3 + "\""; // L: 12566 + JSObject.getWindow(var16).eval(var5); // L: 12569 + } catch (Throwable var15) { // L: 12572 + } + + } // L: 12573 } diff --git a/runescape-client/src/main/java/class93.java b/runescape-client/src/main/java/class93.java index 365c7d1b80..a5f3790b7c 100644 --- a/runescape-client/src/main/java/class93.java +++ b/runescape-client/src/main/java/class93.java @@ -1,161 +1,113 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cq") +@ObfuscatedName("cf") public class class93 { - @ObfuscatedName("ti") - @ObfuscatedGetter( - intValue = -1393536385 - ) - static int field1253; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lqq;" - ) - static IndexedSprite field1254; - @ObfuscatedName("or") - @ObfuscatedGetter( - intValue = 1900010659 - ) - static int field1252; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 479487429 - ) - int field1251; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 1483191049 - ) - int field1248; @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1476000165 + @ObfuscatedSignature( + descriptor = "Llp;" ) - int field1247; - @ObfuscatedName("f") + @Export("Widget_fontsArchive") + static AbstractArchive Widget_fontsArchive; + @ObfuscatedName("bd") + static String field1280; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -602846795 + intValue = -504702499 ) - int field1250; + int field1281; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 517872849 + ) + int field1276; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1558357321 + ) + int field1278; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1244522073 + ) + int field1279; class93(int var1, int var2, int var3, int var4) { - this.field1251 = var1; - this.field1248 = var2; - this.field1247 = var3; // L: 12 - this.field1250 = var4; // L: 13 - } + this.field1281 = var1; // L: 10 + this.field1276 = var2; // L: 11 + this.field1278 = var3; // L: 12 + this.field1279 = var4; // L: 13 + } // L: 14 - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "70" - ) - int method2370() { - return this.field1251; // L: 17 - } - - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "194991061" + garbageValue = "279766476" + ) + int method2379() { + return this.field1281; // L: 17 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1644349592" ) int method2380() { - return this.field1248; // L: 21 + return this.field1276; // L: 21 } - @ObfuscatedName("i") + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "0" + ) + int method2389() { + return this.field1278; // L: 25 + } + + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1753372833" + garbageValue = "1608300695" ) - int method2372() { - return this.field1247; // L: 25 + int method2382() { + return this.field1279; // L: 29 } - @ObfuscatedName("f") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1314673051" + descriptor = "(Llp;Llp;ZI)V", + garbageValue = "-14189171" ) - int method2373() { - return this.field1250; - } + public static void method2392(AbstractArchive var0, AbstractArchive var1, boolean var2) { + ObjectComposition.ObjectDefinition_archive = var0; // L: 73 + ObjectComposition.ObjectDefinition_modelsArchive = var1; // L: 74 + ObjectComposition.ObjectDefinition_isLowDetail = var2; // L: 75 + } // L: 76 - @ObfuscatedName("v") - public static final void method2384(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); // L: 20 - } catch (InterruptedException var7) { // L: 22 - } - } else { - try { - Thread.sleep(var0); // L: 27 - } catch (InterruptedException var6) { // L: 29 - } - } - - } - } // L: 31 - - @ObfuscatedName("f") + @ObfuscatedName("it") @ObfuscatedSignature( - descriptor = "(Lln;Ljava/lang/String;Ljava/lang/String;I)[Lqq;", - garbageValue = "18034657" + descriptor = "(IIIII)V", + garbageValue = "-536546120" ) - public static IndexedSprite[] method2386(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); // L: 84 - int var4 = var0.getFileId(var3, var2); // L: 85 - byte[] var7 = var0.takeFile(var3, var4); // L: 90 - boolean var6; - if (var7 == null) { // L: 91 - var6 = false; // L: 92 - } else { - WorldMapArea.SpriteBuffer_decode(var7); // L: 95 - var6 = true; // L: 96 + @Export("selectSpell") + static void selectSpell(int var0, int var1, int var2, int var3) { + Widget var4 = ApproximateRouteStrategy.getWidgetChild(var0, var1); // L: 9770 + if (var4 != null && var4.onTargetEnter != null) { // L: 9771 + ScriptEvent var5 = new ScriptEvent(); // L: 9772 + var5.widget = var4; // L: 9773 + var5.args = var4.onTargetEnter; // L: 9774 + class144.runScriptEvent(var5); // L: 9775 } - IndexedSprite[] var5; - if (!var6) { // L: 98 - var5 = null; // L: 99 - } else { - IndexedSprite[] var8 = new IndexedSprite[class451.SpriteBuffer_spriteCount]; // L: 104 - - for (int var9 = 0; var9 < class451.SpriteBuffer_spriteCount; ++var9) { // L: 105 - IndexedSprite var10 = var8[var9] = new IndexedSprite(); // L: 106 - var10.width = class451.SpriteBuffer_spriteWidth; // L: 107 - var10.height = class451.SpriteBuffer_spriteHeight; // L: 108 - var10.xOffset = class451.SpriteBuffer_xOffsets[var9]; // L: 109 - var10.yOffset = class271.SpriteBuffer_yOffsets[var9]; // L: 110 - var10.subWidth = class451.SpriteBuffer_spriteWidths[var9]; // L: 111 - var10.subHeight = class451.SpriteBuffer_spriteHeights[var9]; // L: 112 - var10.palette = NetFileRequest.SpriteBuffer_spritePalette; // L: 113 - var10.pixels = FriendLoginUpdate.SpriteBuffer_pixels[var9]; // L: 114 - } - - ArchiveDiskActionHandler.method5813(); // L: 116 - var5 = var8; // L: 119 - } - - return var5; // L: 121 - } - - @ObfuscatedName("hd") - @ObfuscatedSignature( - descriptor = "(Lcb;II)V", - garbageValue = "-314734464" - ) - static final void method2376(Actor var0, int var1) { - VarbitComposition.worldToScreen(var0.x, var0.y, var1); // L: 5398 - } // L: 5399 + Client.selectedSpellItemId = var3; // L: 9777 + Client.isSpellSelected = true; // L: 9778 + ArchiveDiskActionHandler.selectedSpellWidget = var0; // L: 9779 + Client.selectedSpellChildIndex = var1; // L: 9780 + class113.selectedSpellFlags = var2; // L: 9781 + GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var4); // L: 9782 + } // L: 9783 }